Tables: extract common ColumnAccessor code

Author: ctrueden

src/main/java/org/scijava/table/Tables.java

@@ -82,44 +82,19 @@ public int size() {
 			public Column<T> get(final int col) {
 				if (col != 0) //
 					throw new IllegalArgumentException("Column out of range: " + col);
-				class ColumnAccessor implements ReadOnlyColumn<T> {
 
-					private final Object tableData = data;
-
-					@Override
-					public String getHeader() {
-						return colHeader;
-					}
+				return new ColumnAccessor<T>(data, colHeader) {
 
 					@Override
 					public int size() {
 						return data.size();
 					}
 
-					@Override
-					public Class<T> getType() {
-						// TODO: Consider whether this is terrible.
-						throw new UnsupportedOperationException();
-					}
-
 					@Override
 					public T get(final int index) {
 						return data.get(index);
 					}
-
-					@Override
-					public int hashCode() {
-						return getHeader().hashCode();
-					}
-
-					@Override
-					public boolean equals(final Object obj) {
-						if (!(obj instanceof ColumnAccessor)) return false;
-						final ColumnAccessor other = ((ColumnAccessor) obj);
-						return data == other.tableData;
-					}
-				}
-				return new ColumnAccessor();
+				};
 			}
 		};
 	}
@@ -163,9 +138,8 @@ public int size() {
 
 			@Override
 			public Column<T> get(final int col) {
-				class ColumnAccessor implements ReadOnlyColumn<T> {
+				return new ColumnAccessor<T>(data, null) {
 
-					private final Object tableData = data;
 					private boolean initialized;
 					private String colHeader;
 
@@ -189,31 +163,11 @@ public int size() {
 						return data.size();
 					}
 
-					@Override
-					public Class<T> getType() {
-						// TODO: Consider whether this is terrible.
-						throw new UnsupportedOperationException();
-					}
-
 					@Override
 					public T get(final int index) {
 						return data.get(index).get(getHeader());
 					}
-
-					@Override
-					public int hashCode() {
-						return getHeader().hashCode();
-					}
-
-					@Override
-					public boolean equals(final Object obj) {
-						if (!(obj instanceof ColumnAccessor)) return false;
-						final ColumnAccessor other = ((ColumnAccessor) obj);
-						if (data != other.tableData) return false;
-						return Objects.equals(getHeader(), other.getHeader());
-					}
-				}
-				return new ColumnAccessor();
+				};
 			}
 		};
 	}
@@ -429,4 +383,39 @@ default void setSize(int size) {
 			throw readOnlyException();
 		}
 	}
+
+	private static abstract class ColumnAccessor<T> implements ReadOnlyColumn<T> {
+
+		private final Object data;
+		private final String colHeader;
+
+		private ColumnAccessor(final Object data, final String colHeader) {
+			this.data = data;
+			this.colHeader = colHeader;
+		}
+
+		@Override
+		public String getHeader() {
+			return colHeader;
+		}
+
+		@Override
+		public Class<T> getType() {
+			// TODO: Consider whether this is terrible.
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public int hashCode() {
+			return getHeader().hashCode();
+		}
+
+		@Override
+		public boolean equals(final Object obj) {
+			if (!(obj instanceof ColumnAccessor)) return false;
+			final ColumnAccessor<?> other = ((ColumnAccessor<?>) obj);
+			if (data != other.data) return false;
+			return Objects.equals(getHeader(), other.getHeader());
+		}
+	}
 }