ToolService: move default method impls to iface

Author: ctrueden

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

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