From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 2 Aug 2011 22:10:28 +0200
Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors
 or warnings :)

---
 .../gui/tabs/outcome/form/DimensionTableModel.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java

(limited to 'source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java')

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java b/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java
old mode 100755
new mode 100644
index b19c1d2..1a606fb
--- 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) {
-- 
cgit v1.2.3