Make TextDisplay handle all Objects

ctrueden · ctrueden · commit bf6c64f464d8 · 2014-08-04T13:56:08.000-05:00
Any Object can be converted to a String, so this is feasible.
Much better than a "no compatible displays found" error.

With this change, DefaultDisplay is no longer needed, because
DefaultTextDisplay will pick up everything instead, in the way
originally intended for DefaultDisplay.

This is a breaking API change.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.28.2-SNAPSHOT</version>
+	<version>3.0.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/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -39,15 +39,17 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = Display.class, priority = Priority.LOW_PRIORITY)
-public class DefaultTextDisplay extends AbstractDisplay<String> implements
+@Plugin(type = Display.class, priority = Priority.VERY_LOW_PRIORITY)
+public class DefaultTextDisplay extends AbstractDisplay<Object> implements
 	TextDisplay
 {
 
 	public DefaultTextDisplay() {
-		super(String.class);
+		super(Object.class);
 	}
 
+	// -- TextDisplay methods --
+
 	@Override
 	public void append(final String text) {
 		add(text);
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
@@ -36,7 +36,7 @@
  * 
  * @author Curtis Rueden
  */
-public interface TextDisplay extends Display<String> {
+public interface TextDisplay extends Display<Object> {
 
 	/**
 	 * Add a line to the display.
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -41,7 +41,7 @@
  * @author Lee Kamentsky
  */
 public abstract class AbstractTextDisplayViewer extends
-	AbstractDisplayViewer<String>
+	AbstractDisplayViewer<Object>
 {
 
 	@Override
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -35,11 +35,11 @@
 import org.scijava.ui.viewer.DisplayViewer;
 
 /**
- * A display viewer for {@link String}s.
+ * A display viewer for {@link TextDisplay}s.
  * 
  * @author Lee Kamentsky
  */
-public interface TextDisplayViewer extends DisplayViewer<String> {
+public interface TextDisplayViewer extends DisplayViewer<Object> {
 
 	@Override
 	TextDisplay getDisplay();
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
@@ -129,7 +129,7 @@ public void testText() {
 		final TextDisplay textDisplay = (TextDisplay) d;
 
 		// does the display contain the required text string?
-		final String result = textDisplay.get(0);
+		final Object result = textDisplay.get(0);
 		assertNotNull(result);
 		assertEquals(value, result);
 	}

Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,17 @@`
`39`	`39`	`*`
`40`	`40`	`* @author Curtis Rueden`
`41`	`41`	`*/`
`42`		`-@Plugin(type = Display.class, priority = Priority.LOW_PRIORITY)`
`43`		`-public class DefaultTextDisplay extends AbstractDisplay<String> implements`
	`42`	`+@Plugin(type = Display.class, priority = Priority.VERY_LOW_PRIORITY)`
	`43`	`+public class DefaultTextDisplay extends AbstractDisplay<Object> implements`
`44`	`44`	`TextDisplay`
`45`	`45`	`{`
`46`	`46`
`47`	`47`	`public DefaultTextDisplay() {`
`48`		`- super(String.class);`
	`48`	`+ super(Object.class);`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ // -- TextDisplay methods --`
	`52`	`+`
`51`	`53`	`@Override`
`52`	`54`	`public void append(final String text) {`
`53`	`55`	`add(text);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*`
`37`	`37`	`* @author Curtis Rueden`
`38`	`38`	`*/`
`39`		`-public interface TextDisplay extends Display<String> {`
	`39`	`+public interface TextDisplay extends Display<Object> {`
`40`	`40`
`41`	`41`	`/**`
`42`	`42`	`* Add a line to the display.`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`* @author Lee Kamentsky`
`42`	`42`	`*/`
`43`	`43`	`public abstract class AbstractTextDisplayViewer extends`
`44`		`- AbstractDisplayViewer<String>`
	`44`	`+ AbstractDisplayViewer<Object>`
`45`	`45`	`{`
`46`	`46`
`47`	`47`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public void testText() {`
`129`	`129`	`final TextDisplay textDisplay = (TextDisplay) d;`
`130`	`130`
`131`	`131`	`// does the display contain the required text string?`
`132`		`- final String result = textDisplay.get(0);`
	`132`	`+ final Object result = textDisplay.get(0);`
`133`	`133`	`assertNotNull(result);`
`134`	`134`	`assertEquals(value, result);`
`135`	`135`	`}`