Make table methods more generic

awalter17 · imagejan · commit 21ce0f7704d8 · 2018-07-17T12:29:55.000+02:00
diff --git a/src/main/java/net/imagej/table/AbstractTable.java b/src/main/java/net/imagej/table/AbstractTable.java
@@ -41,7 +41,7 @@
  * @author Curtis Rueden
  * @param <T> The type of data stored in the table.
  */
-public abstract class AbstractTable<C extends Column<T>, T> extends
+public abstract class AbstractTable<C extends Column<? extends T>, T> extends
 	SizableArrayList<C> implements Table<C, T>
 {
 
@@ -398,14 +398,14 @@ public int getRowIndex(final String header) {
 	@Override
 	public void set(final int col, final int row, final T value) {
 		check(col, row);
-		get(col).set(row, value);
+		assign((Column<?>) get(col), row, value);
 	}
 
 	@Override
 	public void set(final String colHeader, final int row, final T value) {
 		final int col = colIndex(colHeader);
 		checkRow(row, 1);
-		get(col).set(row, value);
+		assign((Column<?>) get(col), row, value);
 	}
 
 	@Override
@@ -495,6 +495,22 @@ private int colIndex(final String header) {
 		return col;
 	}
 
+	/**
+	 * Generics-friendly helper method for {@link #set(int, int, Object)} and
+	 * {@link #set(String, int, Object)}.
+	 */
+	private <U> void assign(final Column<U> column, final int row,
+		final Object value)
+	{
+		if (value != null && !column.getType().isInstance(value)) {
+			throw new IllegalArgumentException("value of type " + value.getClass() +
+				" is not a " + column.getType());
+		}
+		@SuppressWarnings("unchecked")
+		final U typedValue = (U) value;
+		column.set(row, typedValue);
+	}
+
 	/**
 	 * Returns true iff both objects are null, or the objects are equal via
 	 * {@link Object#equals}.
diff --git a/src/main/java/net/imagej/table/Table.java b/src/main/java/net/imagej/table/Table.java
@@ -43,7 +43,7 @@
  * @param <C> The type of column used by the table.
  * @param <T> The type of data stored in the table.
  */
-public interface Table<C extends Column<T>, T> extends List<C> {
+public interface Table<C extends Column<? extends T>, T> extends List<C> {
 
 	/** Gets the number of columns in the table. */
 	int getColumnCount();
