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

warnings :)

9 files changed, 46 insertions, 46 deletions

diff --git a/source/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java b/source/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
index e243817..4b429fa 100755..100644
--- a/source/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
+++ b/source/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
@@ -19,7 +19,7 @@ public class DefaultGraphLayoutGenerator {
 

     public static void layoutGraph(GraphModel graphModel) {

         Vertex start = graphModel.getStartVertex();

-        Vector rowVector = new Vector(10, 10);

+        Vector<Vector<Vertex>> rowVector = new Vector<Vector<Vertex>>(10, 10);

         int[] midPoints = null;

         IntegerWrapper valueOfLargestMidPoint = new IntegerWrapper(0);

         if (start == null) {

@@ -35,7 +35,7 @@ public class DefaultGraphLayoutGenerator {
         graphModel.forceNotify();

     }

 

-    private static void visitVertex(GraphModel graphModel, Vertex vertex, int rowIndex, Vector rowVector, Object tag) {

+    private static void visitVertex(GraphModel graphModel, Vertex vertex, int rowIndex, Vector<Vector<Vertex>> rowVector, Object tag) {

         int i = 0;

         Vertex[] children = graphModel.getOutVertices(vertex);

         vertex.setTag(tag);

@@ -47,24 +47,24 @@ public class DefaultGraphLayoutGenerator {
         }

     }

 

-    private static void addVertexToRow(Vertex vertex, int rowIndex, Vector rowVector) {

-        Vector rowsVertices = null;

+    private static void addVertexToRow(Vertex vertex, int rowIndex, Vector<Vector<Vertex>> rowVector) {

+        Vector<Vertex> rowsVertices = null;

         // If there is no vector of vertices already created for this row,

         // then create one

         if (rowVector.size() == rowIndex) {

-            rowVector.add(new Vector(10, 10));

+            rowVector.add(new Vector<Vertex>(10, 10));

         }

         // Add the vertex to the row's vector of vertices

-        rowsVertices = (Vector)rowVector.elementAt(rowIndex);

+        rowsVertices = rowVector.elementAt(rowIndex);

         rowsVertices.add(vertex);

     }

 

-    private static void calculateRowMidPoints(Vector rowVector, int[] midPoints, IntegerWrapper valueOfLargestMidPoint) {

+    private static void calculateRowMidPoints(Vector<Vector<Vertex>> rowVector, int[] midPoints, IntegerWrapper valueOfLargestMidPoint) {

         Vector rowsVertices = null;

         int rowsWidth = 0;

         int i = 0;

         for (i = 0; i < midPoints.length; i++) {

-            rowsVertices = (Vector)rowVector.elementAt(i);

+            rowsVertices = rowVector.elementAt(i);

             rowsWidth = mHorzGap * (rowsVertices.size() - 1);

             midPoints[i] = rowsWidth / 2;

             if (midPoints[i] > valueOfLargestMidPoint.mValue) {

@@ -73,7 +73,7 @@ public class DefaultGraphLayoutGenerator {
         }

     }

 

-    private static void fillInVertexLocations(GraphModel graphModel, Vector rowVector,

+    private static void fillInVertexLocations(GraphModel graphModel, Vector<Vector<Vertex>> rowVector,

         IntegerWrapper valueOfLargestMidPoint, int[] midPoints) {

             Vector rowsVertices = null;

             Vertex vertex = null;

@@ -82,7 +82,7 @@ public class DefaultGraphLayoutGenerator {
             int rowsLeftMargin = 0;

             GraphPoint point = new GraphPoint(0, 0);

             for (rowIndex = 0; rowIndex < rowVector.size(); rowIndex++) {

-                rowsVertices = (Vector)rowVector.elementAt(rowIndex);

+                rowsVertices = rowVector.elementAt(rowIndex);

                 rowsLeftMargin = mLeftMargin + valueOfLargestMidPoint.mValue - midPoints[rowIndex];

                 for (column = 0; column < rowsVertices.size(); column++) {

                     vertex = (Vertex)rowsVertices.elementAt(column);

diff --git a/source/com/c2kernel/graph/model/GraphModel.java b/source/com/c2kernel/graph/model/GraphModel.java
index 7a546eb..e9ae02f 100755..100644
--- a/source/com/c2kernel/graph/model/GraphModel.java
+++ b/source/com/c2kernel/graph/model/GraphModel.java
@@ -16,8 +16,8 @@ public class GraphModel implements Serializable{
     private int mHeight = 0;

     private int mNextId = 0;

     protected int mStartVertexId = -1;

-    protected Hashtable mVertexHashtable = new Hashtable();

-    protected Hashtable mEdgeHashtable = new Hashtable();

+    protected Hashtable<String, Vertex> mVertexHashtable = new Hashtable<String, Vertex>();

+    protected Hashtable<String, DirectedEdge> mEdgeHashtable = new Hashtable<String, DirectedEdge>();

     private GraphableVertex mContainingVertex;

 

     /* Transient data */

@@ -168,7 +168,7 @@ public class GraphModel implements Serializable{
     }    

 

     public void setVertices(Vertex[] vertices) {

-        mVertexHashtable = new Hashtable();

+        mVertexHashtable = new Hashtable<String, Vertex>();

         for (int i = 0; i < vertices.length; i++) {

             mVertexHashtable.put(String.valueOf(vertices[i].getID()), vertices[i]);

             checkSize(vertices[i]);

@@ -189,7 +189,7 @@ public class GraphModel implements Serializable{
     }

 

     public void setEdges(DirectedEdge[] edges) {

-        mEdgeHashtable = new Hashtable();

+        mEdgeHashtable = new Hashtable<String, DirectedEdge>();

         for (int i = 0; i < edges.length; i++) {

             mEdgeHashtable.put(String.valueOf(edges[i].getID()), edges[i]);

         }

@@ -212,7 +212,7 @@ public class GraphModel implements Serializable{
     public Vertex getVertex(GraphPoint p) {

         Object[] vertexObjs = mVertexHashtable.values().toArray();

         Vertex vertex = null;

-        Vector vertexVector = new Vector(10, 10);

+        Vector<Vertex> vertexVector = new Vector<Vertex>(10, 10);

         int numVerticesFound = 0;

         Vertex smallestVertex = null;

         int sizeOfSmallestVertex = 0;

@@ -514,8 +514,8 @@ public class GraphModel implements Serializable{
     }

 

     public void clear() {

-        mVertexHashtable = new Hashtable();

-        mEdgeHashtable = new Hashtable();

+        mVertexHashtable = new Hashtable<String, Vertex>();

+        mEdgeHashtable = new Hashtable<String, DirectedEdge>();

         mStartVertexId = -1;

         setChanged();

         notifyObservers(mClearedEvent);

@@ -627,7 +627,7 @@ public class GraphModel implements Serializable{
         Polygon bandPolygon = new Polygon();

         Vertex[] allVertices = getVertices();

         GraphPoint centrePoint = null;

-        Vector verticesInside = new Vector(10, 10);

+        Vector<Vertex> verticesInside = new Vector<Vertex>(10, 10);

         int i = 0;

         // Create a polygon representing the elastic band

         bandPolygon.addPoint(mElasticBand.mFixedCorner.x, mElasticBand.mFixedCorner.y);

@@ -842,13 +842,13 @@ public class GraphModel implements Serializable{
             }

         }

         // Create and populate the vertex hashtable

-        mVertexHashtable = new Hashtable();

+        mVertexHashtable = new Hashtable<String, Vertex>();

         for (i = 0; i < data.mVertexImpls.length; i++) {

             mVertexHashtable.put(String.valueOf(data.mVertexImpls[i].getID()), data.mVertexImpls[i]);

             checkSize(data.mVertexImpls[i]);

         }

         // Create and populate the edge hastable

-        mEdgeHashtable = new Hashtable();

+        mEdgeHashtable = new Hashtable<String, DirectedEdge>();

         for (i = 0; i < data.mEdgeImpls.length; i++) {

             mEdgeHashtable.put(String.valueOf(data.mEdgeImpls[i].getID()), data.mEdgeImpls[i]);

         }

diff --git a/source/com/c2kernel/graph/model/GraphModelManager.java b/source/com/c2kernel/graph/model/GraphModelManager.java
index 19f2dc3..3146c24 100755..100644
--- a/source/com/c2kernel/graph/model/GraphModelManager.java
+++ b/source/com/c2kernel/graph/model/GraphModelManager.java
@@ -20,8 +20,8 @@ public class GraphModelManager extends Observable
     private VertexOutlineCreator mVertexOutlineCreator;

     private EntireModelChangedEvent     mEntireModelChangedEvent     = new EntireModelChangedEvent();

     private ForcedNotifyEvent           mForcedNotifyEvent           = new ForcedNotifyEvent();

-    private Stack                       mParentModels                 = new Stack();

-    private ArrayList                   mParentIds                    = new ArrayList();

+    private Stack<GraphModel>                       mParentModels                 = new Stack<GraphModel>();

+    private ArrayList<Integer>                   mParentIds                    = new ArrayList<Integer>();

     private boolean                    mEditable                     = true;

     

     // Calling this constructor does not create a vertex outline creator

diff --git a/source/com/c2kernel/graph/model/GraphableVertex.java b/source/com/c2kernel/graph/model/GraphableVertex.java
index 6efd298..6efd298 100755..100644
--- a/source/com/c2kernel/graph/model/GraphableVertex.java
+++ b/source/com/c2kernel/graph/model/GraphableVertex.java
diff --git a/source/com/c2kernel/graph/model/Vertex.java b/source/com/c2kernel/graph/model/Vertex.java
index 1e8399b..a9a5238 100755..100644
--- a/source/com/c2kernel/graph/model/Vertex.java
+++ b/source/com/c2kernel/graph/model/Vertex.java
@@ -12,9 +12,9 @@ public class Vertex implements Serializable
     private GraphPoint   mCentrePoint     = new GraphPoint(0, 0);

     private int          mHeight          = 0;

     private int          mWidth           = 0;

-    private Vector       mInEdgeIdVector  = new Vector();

-    private Vector       mOutEdgeIdVector = new Vector();

-    private Vector       mTags             = new Vector();

+    private Vector<Integer>       mInEdgeIdVector  = new Vector<Integer>();

+    private Vector<Integer>       mOutEdgeIdVector = new Vector<Integer>();

+    private Vector<Object>       mTags             = new Vector<Object>();

 

     // The Java Polygon class is used to determine if a point

     // lies within the outline of a vertex.  Unfortunately

@@ -170,7 +170,7 @@ public class Vertex implements Serializable
     {

         int i = 0;

 

-        mInEdgeIdVector = new Vector(10, 10);

+        mInEdgeIdVector = new Vector<Integer>(10, 10);

        	for(i=0; i<ids.length; i++)

        		mInEdgeIdVector.add(new Integer(ids[i]));

     }

@@ -186,7 +186,7 @@ public class Vertex implements Serializable
     {

         int i = 0;

 

-        mOutEdgeIdVector = new Vector(10, 10);

+        mOutEdgeIdVector = new Vector<Integer>(10, 10);

        	for(i=0; i<ids.length; i++)

        		mOutEdgeIdVector.add(new Integer(ids[i]));

     }

diff --git a/source/com/c2kernel/graph/traversal/GraphTraversal.java b/source/com/c2kernel/graph/traversal/GraphTraversal.java
index abf30f7..b50030d 100755..100644
--- a/source/com/c2kernel/graph/traversal/GraphTraversal.java
+++ b/source/com/c2kernel/graph/traversal/GraphTraversal.java
@@ -20,7 +20,7 @@ public class GraphTraversal
 

     public static Vertex[] getTraversal(GraphModel graphModel, Vertex startVertex, int direction, boolean ignoreBackLinks)

     {

-        Vector path = new Vector(10, 10);

+        Vector<Vertex> path = new Vector<Vertex>(10, 10);

 

         graphModel.clearTags(startVertex);

         visitVertex(startVertex, graphModel, path, direction, startVertex, ignoreBackLinks);

@@ -29,7 +29,7 @@ public class GraphTraversal
     }

 

 

-    private static void visitVertex(Vertex vertex, GraphModel graphModel, Vector path, int direction, Object tag, boolean ignoreBackLinks)

+    private static void visitVertex(Vertex vertex, GraphModel graphModel, Vector<Vertex> path, int direction, Object tag, boolean ignoreBackLinks)

     {

         Vertex[] children = null;

         int i = 0;

diff --git a/source/com/c2kernel/graph/view/EditorToolBar.java b/source/com/c2kernel/graph/view/EditorToolBar.java
index 2730ab7..e01056f 100755..100644
--- a/source/com/c2kernel/graph/view/EditorToolBar.java
+++ b/source/com/c2kernel/graph/view/EditorToolBar.java
@@ -56,9 +56,9 @@ public class EditorToolBar extends Box implements Printable
 		}

 	}

 	// Vertex types and ids

-	protected JComboBox mVertexTypeBox = new JComboBox();

+	protected JComboBox<TypeNameAndConstructionInfo> mVertexTypeBox = new JComboBox<TypeNameAndConstructionInfo>();

 	// Edge types and ids

-	protected JComboBox mEdgeTypeBox = new JComboBox();

+	protected JComboBox<TypeNameAndConstructionInfo> mEdgeTypeBox = new JComboBox<TypeNameAndConstructionInfo>();

 	// Mode buttons

 	protected ButtonGroup mModeButtonGroup = new ButtonGroup();

 	protected JToggleButton mVertexModeButton = new JToggleButton(Resource.getImageResource("graph/newvertex.png"));

@@ -74,7 +74,7 @@ public class EditorToolBar extends Box implements Printable
 	protected StartVertexController mStartVertexController = new StartVertexController();

 	protected DeletionController mDeletionController = new DeletionController();

 	// Editor mode listeners

-	protected Vector mListenerVector = new Vector(10, 10);

+	protected Vector<EditorModeListener> mListenerVector = new Vector<EditorModeListener>(10, 10);

 	public EditorToolBar(boolean edgeCreationMode, // True if edges can be created

 	JButton[] otherButtons, GraphPanel graphP)

 	{

diff --git a/source/com/c2kernel/graph/view/PropertyTableModel.java b/source/com/c2kernel/graph/view/PropertyTableModel.java
index 9755cf6..22ba4f3 100755..100644
--- a/source/com/c2kernel/graph/view/PropertyTableModel.java
+++ b/source/com/c2kernel/graph/view/PropertyTableModel.java
@@ -20,8 +20,8 @@ import com.c2kernel.utils.Language;
 public class PropertyTableModel extends AbstractTableModel {

 

     private String[] mColumnNames = { Language.translate("Name"), Language.translate("Value") };

-    HashMap sourceMap = new HashMap();

-    ArrayList sortedNameList = new ArrayList();

+    HashMap<String, Object> sourceMap = new HashMap<String, Object>();

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

     boolean isEditable = false;

     

     public PropertyTableModel() {

@@ -45,7 +45,7 @@ public class PropertyTableModel extends AbstractTableModel {
     public Object getValueAt(int rowIndex, int colIndex)    

     {

         synchronized (sourceMap) {

-            String rowName = (String)sortedNameList.get(rowIndex);

+            String rowName = sortedNameList.get(rowIndex);

             if (colIndex == 0)

                 return rowName;

             else

@@ -57,7 +57,7 @@ public class PropertyTableModel extends AbstractTableModel {
     {

         synchronized (sourceMap) {

             if (colIndex == 0) return;

-            String rowName = (String)sortedNameList.get(rowIndex);

+            String rowName = sortedNameList.get(rowIndex);

             Class oldElement = sourceMap.get(rowName).getClass();

             if (oldElement == Float.class && value.getClass() == String.class)

         		try {

@@ -72,16 +72,16 @@ public class PropertyTableModel extends AbstractTableModel {
         }

     }

     

-    public void setMap(HashMap props) {

+    public void setMap(HashMap<String, Object> props) {

         synchronized (sourceMap) {

             sourceMap = props;

-            sortedNameList = new ArrayList(props.size());

-            for (Iterator keys = props.keySet().iterator(); keys.hasNext();)

+            sortedNameList = new ArrayList<String>(props.size());

+            for (Iterator<String> keys = props.keySet().iterator(); keys.hasNext();)

                 sortedNameList.add(keys.next());

     

-            Collections.sort(sortedNameList, new Comparator() {

-                public int compare(Object o1, Object o2) {

-                    return ((String)o1).compareToIgnoreCase((String)o2);

+            Collections.sort(sortedNameList, new Comparator<String>() {

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

+                    return (o1.compareToIgnoreCase(o2));

                 }

             });

         }

diff --git a/source/com/c2kernel/graph/view/VertexPropertyPanel.java b/source/com/c2kernel/graph/view/VertexPropertyPanel.java
index be08b53..dd5fbd2 100755..100644
--- a/source/com/c2kernel/graph/view/VertexPropertyPanel.java
+++ b/source/com/c2kernel/graph/view/VertexPropertyPanel.java
@@ -43,7 +43,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
     JButton delPropButton;

     Box newPropBox;

     private JTextField newPropName;

-    private JComboBox newPropType;

+    private JComboBox<String> newPropType;

     String[] typeOptions = { "String", "Boolean", "Integer", "Float" };

     String[] typeInitVal = { "", "false", "0", "0.0"};

     SelectedVertexPanel mSelPanel;

@@ -125,7 +125,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
     public void clear() {

         selObjName.setText("");

         selObjClass.setText("Nothing Selected");

-        mPropertyModel.setMap(new HashMap());

+        mPropertyModel.setMap(new HashMap<String, Object>());

         if (mSelPanel != null) mSelPanel.clear();

         addPropButton.setEnabled(false);

         delPropButton.setEnabled(false);

@@ -184,7 +184,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
         newPropBox.add(Box.createHorizontalGlue());

         newPropName = new JTextField(15);

         newPropBox.add(newPropName);

-        newPropType = new JComboBox(typeOptions);

+        newPropType = new JComboBox<String>(typeOptions);

         newPropBox.add(newPropType);

         newPropBox.add(Box.createHorizontalStrut(1));

         addPropButton = new JButton("Add");

@@ -224,7 +224,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
             	mPropertyTable.getCellEditor().stopCellEditing();

 

             try {

-                Class newPropClass = Class.forName("java.lang."+typeOptions[newPropType.getSelectedIndex()]);

+                Class<?> newPropClass = Class.forName("java.lang."+typeOptions[newPropType.getSelectedIndex()]);

                 Class[] params = {String.class};

                 Constructor init = newPropClass.getConstructor(params);

                 Object[] initParams = { typeInitVal[newPropType.getSelectedIndex()] };