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

warnings :)

21 files changed, 63 insertions, 60 deletions

diff --git a/source/com/c2kernel/gui/EntityDetails.java b/source/com/c2kernel/gui/EntityDetails.java
index b6c5245..5eb812f 100755..100644
--- a/source/com/c2kernel/gui/EntityDetails.java
+++ b/source/com/c2kernel/gui/EntityDetails.java
@@ -30,7 +30,7 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable {
     protected JPanel itemTitlePanel;

     private EntityTabManager desktopManager;

     protected NodeEntity myEntity;

-    protected HashMap childPanes = new HashMap();

+    protected HashMap<EntityTabPane, Boolean> childPanes = new HashMap<EntityTabPane, Boolean>();

     protected String startTab;

     protected String startCommand = null;

     protected boolean initialized = false;

diff --git a/source/com/c2kernel/gui/EntityTabManager.java b/source/com/c2kernel/gui/EntityTabManager.java
index 208ae89..1e01ad0 100755..100644
--- a/source/com/c2kernel/gui/EntityTabManager.java
+++ b/source/com/c2kernel/gui/EntityTabManager.java
@@ -22,7 +22,7 @@ public class EntityTabManager extends JPanel
 {

     private MainFrame mMainframe;

     

-    protected HashMap openItems = new HashMap();

+    protected HashMap<Integer, EntityDetails> openItems = new HashMap<Integer, EntityDetails>();

     protected JTabbedPaneWithCloseIcons tabbedPane = new JTabbedPaneWithCloseIcons();

 	//JTabbedPane tabbedPane = new JTabbedPane();

     MenuBuilder myMenuBuilder;

@@ -74,7 +74,7 @@ public class EntityTabManager extends JPanel
     }

     

     public void closeAll(boolean keepOpen) {

-    	ArrayList toRemove = new ArrayList();

+    	ArrayList<Integer> toRemove = new ArrayList<Integer>();

     	for (Iterator iter = openItems.keySet().iterator(); iter.hasNext();) {

 			Integer element = (Integer) iter.next();

 			if (keepOpen && openItems.get(element).equals(tabbedPane.getSelectedComponent())) continue;

diff --git a/source/com/c2kernel/gui/MainFrame.java b/source/com/c2kernel/gui/MainFrame.java
index 99a1fab..e561f1f 100755..100644
--- a/source/com/c2kernel/gui/MainFrame.java
+++ b/source/com/c2kernel/gui/MainFrame.java
@@ -267,7 +267,7 @@ public class MainFrame extends javax.swing.JFrame {
     }

 

     public static JComboBox getExecutionPlugins() {

-        JComboBox plugins = new JComboBox();

+        JComboBox<Executor> plugins = new JComboBox<Executor>();

         // create execution selector

         Executor defaultExecutor = new DefaultExecutor();

         plugins.addItem(defaultExecutor);

diff --git a/source/com/c2kernel/gui/MenuBuilder.java b/source/com/c2kernel/gui/MenuBuilder.java
index c385dbe..bf27287 100755..100644
--- a/source/com/c2kernel/gui/MenuBuilder.java
+++ b/source/com/c2kernel/gui/MenuBuilder.java
@@ -33,7 +33,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene
 	protected JMenu styleMenu;

 	protected JMenu prefMenu;

 	protected JMenu helpMenu;

-	protected HashMap availableMenus = new HashMap();

+	protected HashMap<String, JMenu> availableMenus = new HashMap<String, JMenu>();

 	

     public MenuBuilder()

     {}

diff --git a/source/com/c2kernel/gui/data/Node.java b/source/com/c2kernel/gui/data/Node.java
index b82ee92..79eb3ad 100755..100644
--- a/source/com/c2kernel/gui/data/Node.java
+++ b/source/com/c2kernel/gui/data/Node.java
@@ -31,8 +31,8 @@ public abstract class Node implements Runnable {
     protected String type = "";

     protected Icon icon;

     protected boolean isExpandable = false;

-    protected HashMap childNodes = new HashMap();

-    protected ArrayList subscribers = new ArrayList();

+    protected HashMap<Path, Node> childNodes = new HashMap<Path, Node>();

+    protected ArrayList<NodeSubscriber> subscribers = new ArrayList<NodeSubscriber>();

     protected DynamicTreeBuilder loader = null;

     private boolean loaded = false;

     private String iconName;

diff --git a/source/com/c2kernel/gui/data/NodeAgent.java b/source/com/c2kernel/gui/data/NodeAgent.java
index 9ef738a..138b576 100755..100644
--- a/source/com/c2kernel/gui/data/NodeAgent.java
+++ b/source/com/c2kernel/gui/data/NodeAgent.java
@@ -21,9 +21,9 @@ public class NodeAgent extends NodeEntity {
     public void loadChildren() {

     }

     

-    public ArrayList getTabs() {

+    public ArrayList<String> getTabs() {

 

-        ArrayList requiredTabs = super.getTabs();

+        ArrayList<String> requiredTabs = super.getTabs();

         requiredTabs.add("AgentProperties");

         requiredTabs.add("JobList");

         return requiredTabs;   

diff --git a/source/com/c2kernel/gui/data/NodeEntity.java b/source/com/c2kernel/gui/data/NodeEntity.java
index adff241..8c05afd 100755..100644
--- a/source/com/c2kernel/gui/data/NodeEntity.java
+++ b/source/com/c2kernel/gui/data/NodeEntity.java
@@ -73,8 +73,8 @@ public abstract class NodeEntity extends Node {
         desktop.add(this);

     }

     

-    public ArrayList getTabs() {

-        ArrayList requiredTabs = new ArrayList();

+    public ArrayList<String> getTabs() {

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

         return requiredTabs;

     }

 }

diff --git a/source/com/c2kernel/gui/data/NodeItem.java b/source/com/c2kernel/gui/data/NodeItem.java
index 410f13a..84cba97 100755..100644
--- a/source/com/c2kernel/gui/data/NodeItem.java
+++ b/source/com/c2kernel/gui/data/NodeItem.java
@@ -53,7 +53,7 @@ public class NodeItem extends NodeEntity {
 		popup.addSeparator();

 		try {

             ArrayList jobList = ((ItemProxy)myEntity).getJobList(MainFrame.userAgent);

-            ArrayList already = new ArrayList();

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

 			if (jobList.size() > 0) {

 	            for (Iterator e = jobList.iterator(); e.hasNext();) {

 	                Job thisJob = (Job)e.next();

@@ -91,9 +91,9 @@ public class NodeItem extends NodeEntity {
 		thisDetail.runCommand("Execution", stepName);

 	}

 

-    public ArrayList getTabs() {

+    public ArrayList<String> getTabs() {

 

-        ArrayList requiredTabs = super.getTabs();

+        ArrayList<String> requiredTabs = super.getTabs();

         requiredTabs.add("Properties");

         try {

             String collNames = myEntity.queryData(ClusterStorage.COLLECTION+"/all");

diff --git a/source/com/c2kernel/gui/tabs/DomainPathAdmin.java b/source/com/c2kernel/gui/tabs/DomainPathAdmin.java
index 35104d7..2e81121 100755..100644
--- a/source/com/c2kernel/gui/tabs/DomainPathAdmin.java
+++ b/source/com/c2kernel/gui/tabs/DomainPathAdmin.java
@@ -102,11 +102,11 @@ public class DomainPathAdmin extends Box implements ActionListener {
     }

     

     private class DomainPathTableModel extends AbstractTableModel {

-        ArrayList domPaths;

+        ArrayList<DomainPath> domPaths;

         DomainPathAdmin parent;

         public DomainPathTableModel(DomainPathAdmin parent) {

             this.parent = parent;

-            domPaths = new ArrayList();

+            domPaths = new ArrayList<DomainPath>();

         }

         

         public void loadPaths() {

@@ -134,7 +134,7 @@ public class DomainPathAdmin extends Box implements ActionListener {
             }

         }

         

-        public Class getColumnClass(int columnIndex) {

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

             return String.class;

         }

 

diff --git a/source/com/c2kernel/gui/tabs/HistoryPane.java b/source/com/c2kernel/gui/tabs/HistoryPane.java
index 091ef5e..be7f8b2 100755..100644
--- a/source/com/c2kernel/gui/tabs/HistoryPane.java
+++ b/source/com/c2kernel/gui/tabs/HistoryPane.java
@@ -182,7 +182,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity
 		/**

 		 * @see javax.swing.table.TableModel#getColumnClass(int)

 		 */

-		public Class getColumnClass(int columnIndex) {

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

 			switch(columnIndex) {

 				case 0:

 					return Integer.class;

diff --git a/source/com/c2kernel/gui/tabs/JobListPane.java b/source/com/c2kernel/gui/tabs/JobListPane.java
index ea14222..b9ff0e5 100755..100644
--- a/source/com/c2kernel/gui/tabs/JobListPane.java
+++ b/source/com/c2kernel/gui/tabs/JobListPane.java
@@ -209,7 +209,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity
 		/**

 		 * @see javax.swing.table.TableModel#getColumnClass(int)

 		 */

-		public Class getColumnClass(int columnIndex) {

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

 			switch(columnIndex) {

 				case 0:

 					return Integer.class;

diff --git a/source/com/c2kernel/gui/tabs/PropertiesPane.java b/source/com/c2kernel/gui/tabs/PropertiesPane.java
index 5666ae9..6b21804 100755..100644
--- a/source/com/c2kernel/gui/tabs/PropertiesPane.java
+++ b/source/com/c2kernel/gui/tabs/PropertiesPane.java
@@ -40,7 +40,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver
 

     Box propertyBox;

     boolean subbed = false;

-    HashMap loadedProps = new HashMap();

+    HashMap<String, JLabel> loadedProps = new HashMap<String, JLabel>();

     JLabel domTitle;

     DomainPathAdmin domAdmin;

 

@@ -89,7 +89,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver
 

     public void reload() {

     	Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.PROPERTY);

-        loadedProps = new HashMap();

+        loadedProps = new HashMap<String, JLabel>();

         initForEntity(sourceEntity);

     }

 

diff --git a/source/com/c2kernel/gui/tabs/ViewpointPane.java b/source/com/c2kernel/gui/tabs/ViewpointPane.java
index 7bb6176..31e18c3 100755..100644
--- a/source/com/c2kernel/gui/tabs/ViewpointPane.java
+++ b/source/com/c2kernel/gui/tabs/ViewpointPane.java
@@ -10,6 +10,7 @@ import java.awt.event.ItemListener;
 import java.io.File;

 import java.util.ArrayList;

 import java.util.Collections;

+import java.util.Comparator;

 import java.util.Iterator;

 import java.util.StringTokenizer;

 

@@ -40,16 +41,16 @@ import com.c2kernel.utils.Logger;
 

 public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver {

     

-    JComboBox schemas;

-    JComboBox views;

-    JComboBox events;

+    JComboBox<String> schemas;

+    JComboBox<Viewpoint> views;

+    JComboBox<EventItem> events;

     JLabel eventDetails;

     JButton exportButton;

     JButton viewButton;

     

-    ArrayList schemaList;

-    ArrayList viewpointList;

-    ArrayList eventList;

+    ArrayList<String> schemaList;

+    ArrayList<Viewpoint> viewpointList;

+    ArrayList<EventItem> eventList;

     String currentSchema = null;

     Outcome currentOutcome = null;

     OutcomeHandler thisOutcome;

@@ -82,7 +83,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         viewBox.add(label);

         viewBox.add(Box.createHorizontalStrut(7));

 

-        schemas = new JComboBox();

+        schemas = new JComboBox<String>();

         viewBox.add(schemas);

         viewBox.add(Box.createHorizontalGlue());

         schemas.addItemListener(this);

@@ -91,7 +92,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         viewBox.add(label);

         viewBox.add(Box.createHorizontalStrut(7));

 

-        views = new JComboBox();

+        views = new JComboBox<Viewpoint>();

         viewBox.add(views);

         viewBox.add(Box.createHorizontalGlue());

         views.addItemListener(this);

@@ -107,7 +108,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         eventBox.add(label);

         eventBox.add(Box.createHorizontalStrut(7));

 

-        events = new JComboBox();

+        events = new JComboBox<EventItem>();

         eventBox.add(events);

         eventBox.add(Box.createHorizontalStrut(7));

         events.addItemListener(this);

@@ -163,7 +164,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         clearView();

         schemas.addItem("--");

         currentSchema = null;

-        schemaList = new ArrayList();

+        schemaList = new ArrayList<String>();

         try {

             String outcomeTypes = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/all");

             StringTokenizer tok = new StringTokenizer(outcomeTypes, ",");

@@ -197,8 +198,8 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         suspendSelection = true;

         views.removeAllItems(); 

         events.removeAllItems();

-        viewpointList = new ArrayList();

-        eventList = new ArrayList();

+        viewpointList = new ArrayList<Viewpoint>();

+        eventList = new ArrayList<EventItem>();

 

         currentSchema = schemaName;

         

@@ -233,8 +234,12 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
                         }

                         eventList.add(newEvent);

                     }

-                    Collections.sort(eventList);

-                    for (Iterator iter = eventList.iterator(); iter.hasNext();)

+                    Collections.sort(eventList, new Comparator<EventItem>() {

+                        public int compare(EventItem o1, EventItem o2) {

+                            return o1.compareTo(o2);

+                        }

+                    });

+                    for (Iterator<EventItem> iter = eventList.iterator(); iter.hasNext();)

                         events.addItem(iter.next());

             }

             

@@ -435,7 +440,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
     class EventItem implements Comparable {

         public int eventId;

         public int schemaVersion;

-        public ArrayList viewNames = new ArrayList();

+        public ArrayList<String> viewNames = new ArrayList<String>();

         public String viewList = "";

         

         public EventItem(int eventId, int schemaVersion) {

diff --git a/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java b/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
index ef20a1a..bb71cd8 100755..100644
--- a/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
+++ b/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
@@ -48,17 +48,16 @@ public class CollectionHistoryWindow extends JFrame  {
 	private class HistoryTableModel extends AbstractTableModel implements EntityProxyObserver {

 

 		ItemProxy item;

-		ArrayList collEvents, collEventData;

+		ArrayList<Object> collEvents, collEventData;

 		Collection coll;

 		public HistoryTableModel(ItemProxy item, Collection coll) {

 			this.item = item;

 			this.coll = coll;

-			collEvents = new ArrayList();

-			collEventData = new ArrayList();

+			collEvents = new ArrayList<Object>();

+			collEventData = new ArrayList<Object>();

 			item.subscribe(this, ClusterStorage.HISTORY, true);

 		}

 		public int getColumnCount() {

-			// TODO Auto-generated method stub

 			return 4;

 		}

 		

@@ -72,7 +71,6 @@ public class CollectionHistoryWindow extends JFrame  {
 			}

 		}		

 		public int getRowCount() {

-			// TODO Auto-generated method stub

 			return collEvents.size();

 		}

 		public Object getValueAt(int rowIndex, int columnIndex) {

diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
index 051f1dc..ba5e76b 100644
--- a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
+++ b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
@@ -8,7 +8,7 @@ public class ActivityItem {
     public String stepPath;

     public int state;

     public String name;

-    ArrayList<Job> jobs = new ArrayList<>();

+    ArrayList<Job> jobs = new ArrayList<Job>();

     

     public ActivityItem() {

     	stepPath = "";

diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
index 4250a37..b0417f4 100755..100644
--- a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
+++ b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
@@ -40,7 +40,7 @@ public class ActivityViewer extends JPanel implements Runnable {
     OutcomeHandler outcomePanel;

     JPanel outcomeView = new JPanel(new GridLayout(1,1));

     ActivityItem thisAct;

-    ArrayList requestButtons = new ArrayList();

+    ArrayList<RequestButton> requestButtons = new ArrayList<RequestButton>();

     JLabel noOutcome = new JLabel(Language.translate("No outcome data is required for this activity"));

     ExecutionPane parent;

     JLabel status;    

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;

     }