Implement Versioned interface where appropriate

Author: ctrueden

src/main/java/org/scijava/Gateway.java

@@ -116,7 +116,7 @@
  * @author Mark Hiner
  * @author Curtis Rueden
  */
-public interface Gateway extends RichPlugin {
+public interface Gateway extends RichPlugin, Versioned {
 
 	/**
 	 * Returns an implementation of the requested {@link Service}, if it exists in
@@ -199,10 +199,13 @@ public interface Gateway extends RichPlugin {
 	/** @see org.scijava.app.App#getTitle() */
 	String getTitle();
 
-	/** @see org.scijava.app.App#getVersion() */
-	String getVersion();
-
 	/** @see org.scijava.app.App#getInfo(boolean) */
 	String getInfo(boolean mem);
 
+	// -- Versioned methods --
+
+	/** @see org.scijava.app.App#getVersion() */
+	@Override
+	String getVersion();
+
 }

src/main/java/org/scijava/app/App.java

@@ -33,6 +33,7 @@
 
 import java.io.File;
 
+import org.scijava.Versioned;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
 import org.scijava.plugin.SingletonPlugin;
@@ -53,22 +54,11 @@
  * @see Plugin
  * @see AppService
  */
-public interface App extends RichPlugin, SingletonPlugin {
+public interface App extends RichPlugin, SingletonPlugin, Versioned {
 
 	/** Gets the title of the application. */
 	String getTitle();
 
-	/**
-	 * Gets the version of the application.
-	 * <p>
-	 * SciJava conforms to the <a href="http://semver.org/">Semantic
-	 * Versioning</a> specification.
-	 * </p>
-	 * 
-	 * @return The application version, in {@code major.minor.micro} format.
-	 */
-	String getVersion();
-
 	/** The Maven {@code groupId} of the application. */
 	String getGroupId();
 
@@ -106,4 +96,18 @@ public interface App extends RichPlugin, SingletonPlugin {
 	 */
 	File getBaseDirectory();
 
+	// -- Versioned methods --
+
+	/**
+	 * Gets the version of the application.
+	 * <p>
+	 * SciJava conforms to the <a href="http://semver.org/">Semantic
+	 * Versioning</a> specification.
+	 * </p>
+	 * 
+	 * @return The application version, in {@code major.minor.micro} format.
+	 */
+	@Override
+	String getVersion();
+
 }

src/main/java/org/scijava/util/POM.java

@@ -42,14 +42,15 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.scijava.Versioned;
 import org.xml.sax.SAXException;
 
 /**
  * Helper class for working with Maven POMs.
  * 
  * @author Curtis Rueden
  */
-public class POM extends XML implements Comparable<POM> {
+public class POM extends XML implements Comparable<POM>, Versioned {
 
 	/** Parses a POM from the given file. */
 	public POM(final File file) throws ParserConfigurationException,
@@ -93,13 +94,6 @@ public String getArtifactId() {
 		return cdata("//project/artifactId");
 	}
 
-	/** Gets the POM's version. */
-	public String getVersion() {
-		final String version = cdata("//project/version");
-		if (version != null) return version;
-		return cdata("//project/parent/version");
-	}
-
 	/** Gets the project name. */
 	public String getProjectName() {
 		return cdata("//project/name");
@@ -146,6 +140,16 @@ public int compareTo(final POM pom) {
 		return compareVersions(getVersion(), pom.getVersion());
 	}
 
+	// -- Versioned methods --
+
+	/** Gets the POM's version. */
+	@Override
+	public String getVersion() {
+		final String version = cdata("//project/version");
+		if (version != null) return version;
+		return cdata("//project/parent/version");
+	}
+
 	// -- Utility methods --
 
 	/**