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

warnings :)

3 files changed, 17 insertions, 17 deletions

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()] };