Finished move to generics. Enforced 1.6 compliance for now. No errors or

warnings :)

5 files changed, 17 insertions, 17 deletions

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java b/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java
index 08c5ea1..015bd9a 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java
@@ -22,7 +22,7 @@ import com.c2kernel.utils.Logger;
 

 public class AttributeList extends JPanel {

 

-    ArrayList attrSet = new ArrayList();

+    ArrayList<StringEditField> attrSet = new ArrayList<StringEditField>();

     ElementDecl model;

     Element myElement;

     boolean readOnly;

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java b/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java
index 8dfa7f5..8de306b 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java
@@ -36,8 +36,8 @@ public class Dimension extends OutcomeStructure implements ActionListener {
     JLabel msg;

     DomKeyPushTable table;

     Box tableBox;

-    ArrayList instances = new ArrayList(); // stores DimensionInstances if tabs

-    ArrayList elements = new ArrayList(); // stores current children

+    ArrayList<DimensionInstance> instances = new ArrayList<DimensionInstance>(); // stores DimensionInstances if tabs

+    ArrayList<Element> elements = new ArrayList<Element>(); // stores current children

     

     JButton addButton;

     JButton delButton;

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) {

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java b/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java
index 9333bf8..a535da6 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java
@@ -36,8 +36,8 @@ public abstract class OutcomeStructure extends JPanel {
     ElementDecl model;

     Element myElement = null;

     boolean readOnly;

-    HashMap subStructure = new HashMap();

-    ArrayList order = new ArrayList();

+    HashMap<String, OutcomeStructure> subStructure = new HashMap<String, OutcomeStructure>();

+    ArrayList<String> order = new ArrayList<String>();

     String help = "<i>"+Language.translate("No help is available for this element")+"</i>";

     HelpPane helpPane;

     boolean deferChild = false;

@@ -46,7 +46,7 @@ public abstract class OutcomeStructure extends JPanel {
         this.model = model;

         this.readOnly = readOnly;

         this.helpPane = helpPane;

-        subStructure = new HashMap();

+        subStructure = new HashMap<String, OutcomeStructure>();

         Logger.msg(8, "Creating " + model.getName() + " structure as " +

             this.getClass().getName().substring(this.getClass().getName().lastIndexOf('.') + 1));

         

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java
index 0807f78..c7934c0 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java
@@ -22,7 +22,7 @@ import com.c2kernel.utils.Language;
 

 public class ArrayTableModel extends AbstractTableModel {

 

-    ArrayList contents = new ArrayList();

+    ArrayList<Object> contents = new ArrayList<Object>();

     Class type;

     int numCols = 1;

     boolean readOnly = false;

@@ -63,7 +63,7 @@ public class ArrayTableModel extends AbstractTableModel {
     	fireTableStructureChanged();

     }

     

-    public Class getColumnClass(int columnIndex) {

+    public Class<?> getColumnClass(int columnIndex) {

         return type;

     }