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

warnings :)

1 files changed, 4 insertions, 4 deletions

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