summaryrefslogtreecommitdiff
path: root/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java
diff options
context:
space:
mode:
authorabranson <andrew.branson@cern.ch>2011-08-02 22:10:28 +0200
committerabranson <andrew.branson@cern.ch>2011-08-02 22:10:28 +0200
commit5664fd4644c78f4571a1a72e6b9f0511fb10720a (patch)
tree7be1c346d1d001bf6b079089f995a60c52b955c1 /source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java
parent29bbf451a22916d39017ec1a3f53f4e0f0e65ee0 (diff)
Finished move to generics. Enforced 1.6 compliance for now. No errors or
warnings :)
Diffstat (limited to 'source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java')
-rw-r--r--[-rwxr-xr-x]source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java b/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java
index b19c1d2..1a606fb 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java
@@ -14,13 +14,13 @@ import com.c2kernel.utils.Logger;
public class DimensionTableModel extends AbstractTableModel {
ElementDecl model;
- ArrayList columnHeadings = new ArrayList();
- ArrayList columnClasses = new ArrayList();
- ArrayList columnDecls = new ArrayList();
- ArrayList colReadOnly = new ArrayList();
- ArrayList colHelp = new ArrayList();
- ArrayList rows = new ArrayList();
- ArrayList elements = new ArrayList();
+ ArrayList<String> columnHeadings = new ArrayList<String>();
+ ArrayList<Class<?>> columnClasses = new ArrayList<Class<?>>();
+ ArrayList<Annotated> columnDecls = new ArrayList<Annotated>();
+ ArrayList<Boolean> colReadOnly = new ArrayList<Boolean>();
+ ArrayList<String> colHelp = new ArrayList<String>();
+ ArrayList<Object[]> rows = new ArrayList<Object[]>();
+ ArrayList<Element> elements = new ArrayList<Element>();
boolean readOnly;
public DimensionTableModel(ElementDecl model, boolean readOnly) throws StructuralException {
@@ -176,8 +176,8 @@ public class DimensionTableModel extends AbstractTableModel {
rows.add(index, newRow);
fireTableRowsInserted(index, index);
}
- public Class getColumnClass(int columnIndex) {
- return (Class)columnClasses.get(columnIndex);
+ public Class<?> getColumnClass(int columnIndex) {
+ return columnClasses.get(columnIndex);
}
public String getColumnName(int columnIndex) {