Skip to content

Commit 1301ddd

Browse files
awalter17imagejan
authored andcommitted
Add getType method to different columns
1 parent ef82fbf commit 1301ddd

11 files changed

Lines changed: 54 additions & 3 deletions

src/main/java/net/imagej/table/BoolColumn.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,9 @@ public void setHeader(final String header) {
6161
this.header = header;
6262
}
6363

64+
@Override
65+
public Class<Boolean> getType() {
66+
return Boolean.class;
67+
}
68+
6469
}

src/main/java/net/imagej/table/ByteColumn.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,9 @@ public void setHeader(final String header) {
6161
this.header = header;
6262
}
6363

64+
@Override
65+
public Class<Byte> getType() {
66+
return Byte.class;
67+
}
68+
6469
}

src/main/java/net/imagej/table/CharColumn.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,9 @@ public void setHeader(final String header) {
6161
this.header = header;
6262
}
6363

64+
@Override
65+
public Class<Character> getType() {
66+
return Character.class;
67+
}
68+
6469
}

src/main/java/net/imagej/table/Column.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,7 @@ public interface Column<T> extends List<T>, Sizable {
5656
/** Sets the column's size (i.e., number of rows). */
5757
@Override
5858
void setSize(int size);
59-
59+
60+
/** Returns the actual type of data stored in the column. */
61+
Class<T> getType();
6062
}

src/main/java/net/imagej/table/DefaultColumn.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,16 @@
4141
*/
4242
public class DefaultColumn<T> extends SizableArrayList<T> implements Column<T> {
4343

44+
/** The type of this column. */
45+
private Class<T> type;
46+
4447
/** The column header. */
4548
private String header;
4649

4750
public DefaultColumn() {}
4851

49-
public DefaultColumn(final String header) {
52+
public DefaultColumn(final Class<T> type, final String header) {
53+
this.type = type;
5054
this.header = header;
5155
}
5256

@@ -62,4 +66,9 @@ public void setHeader(final String header) {
6266
this.header = header;
6367
}
6468

69+
@Override
70+
public Class<T> getType() {
71+
return type;
72+
}
73+
6574
}

src/main/java/net/imagej/table/DoubleColumn.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,9 @@ public void setHeader(final String header) {
6161
this.header = header;
6262
}
6363

64+
@Override
65+
public Class<Double> getType() {
66+
return Double.class;
67+
}
68+
6469
}

src/main/java/net/imagej/table/FloatColumn.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,9 @@ public void setHeader(final String header) {
6161
this.header = header;
6262
}
6363

64+
@Override
65+
public Class<Float> getType() {
66+
return Float.class;
67+
}
68+
6469
}

src/main/java/net/imagej/table/GenericColumn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public GenericColumn() {
4343
}
4444

4545
public GenericColumn(final String header) {
46-
super(header);
46+
super(Object.class, header);
4747
}
4848

4949
}

src/main/java/net/imagej/table/IntColumn.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,9 @@ public void setHeader(final String header) {
6161
this.header = header;
6262
}
6363

64+
@Override
65+
public Class<Integer> getType() {
66+
return Integer.class;
67+
}
68+
6469
}

src/main/java/net/imagej/table/LongColumn.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,9 @@ public void setHeader(final String header) {
6161
this.header = header;
6262
}
6363

64+
@Override
65+
public Class<Long> getType() {
66+
return Long.class;
67+
}
68+
6469
}

0 commit comments

Comments
 (0)