Platform: push default method impls to iface

Author: ctrueden

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;
 	}
-
 }

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;
+	}
 }