Modify table API to allow GenericTable to store multiple column types

awalter17 · imagejan · commit fc34d4f1b024 · 2018-07-17T12:29:55.000+02:00
diff --git a/src/main/java/net/imagej/table/DefaultColumn.java b/src/main/java/net/imagej/table/DefaultColumn.java
@@ -31,25 +31,29 @@
 
 package net.imagej.table;
 
-import org.scijava.util.SizableArrayList;
+import org.scijava.util.ObjectArray;
 
 /**
  * Default implementation of {@link Column}.
  * 
  * @author Curtis Rueden
  * @param <T> The type of data stored in the table.
  */
-public class DefaultColumn<T> extends SizableArrayList<T> implements Column<T> {
+public class DefaultColumn<T> extends ObjectArray<T> implements Column<T> {
 
 	/** The type of this column. */
-	private Class<T> type;
+	private final Class<T> type;
 
 	/** The column header. */
 	private String header;
 
-	public DefaultColumn() {}
+	public DefaultColumn(final Class<T> type) {
+		super(type);
+		this.type = type;
+	}
 
 	public DefaultColumn(final Class<T> type, final String header) {
+		super(type);
 		this.type = type;
 		this.header = header;
 	}
diff --git a/src/main/java/net/imagej/table/DefaultGenericTable.java b/src/main/java/net/imagej/table/DefaultGenericTable.java
@@ -36,8 +36,8 @@
  * 
  * @author Curtis Rueden
  */
-public class DefaultGenericTable extends AbstractTable<GenericColumn, Object>
-	implements GenericTable
+public class DefaultGenericTable extends
+	AbstractTable<Column<? extends Object>, Object> implements GenericTable
 {
 
 	/** Creates an empty table. */
diff --git a/src/main/java/net/imagej/table/GenericColumn.java b/src/main/java/net/imagej/table/GenericColumn.java
@@ -39,7 +39,7 @@
 public class GenericColumn extends DefaultColumn<Object> {
 
 	public GenericColumn() {
-		super();
+		super(Object.class);
 	}
 
 	public GenericColumn(final String header) {
diff --git a/src/main/java/net/imagej/table/GenericTable.java b/src/main/java/net/imagej/table/GenericTable.java
@@ -36,6 +36,6 @@
  * 
  * @author Curtis Rueden
  */
-public interface GenericTable extends Table<GenericColumn, Object> {
+public interface GenericTable extends Table<Column<? extends Object>, Object> {
 	// NB: No implementation needed.
 }

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`	`*`
`37`	`37`	`* @author Curtis Rueden`
`38`	`38`	`*/`
`39`		`-public class DefaultGenericTable extends AbstractTable<GenericColumn, Object>`
`40`		`- implements GenericTable`
	`39`	`+public class DefaultGenericTable extends`
	`40`	`+ AbstractTable<Column<? extends Object>, Object> implements GenericTable`
`41`	`41`	`{`
`42`	`42`
`43`	`43`	`/** Creates an empty table. */`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`public class GenericColumn extends DefaultColumn<Object> {`
`40`	`40`
`41`	`41`	`public GenericColumn() {`
`42`		`- super();`
	`42`	`+ super(Object.class);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public GenericColumn(final String header) {`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@`
`36`	`36`	`*`
`37`	`37`	`* @author Curtis Rueden`
`38`	`38`	`*/`
`39`		`-public interface GenericTable extends Table<GenericColumn, Object> {`
	`39`	`+public interface GenericTable extends Table<Column<? extends Object>, Object> {`
`40`	`40`	`// NB: No implementation needed.`
`41`	`41`	`}`