removing Java2 mapping

1 files changed, 35 insertions, 50 deletions

diff --git a/java/src/IceGridGUI/Application/ParametersField.java b/java/src/IceGridGUI/Application/ParametersField.java
index 732d46a20e2..0b53744b88c 100644
--- a/java/src/IceGridGUI/Application/ParametersField.java
+++ b/java/src/IceGridGUI/Application/ParametersField.java
@@ -6,6 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
+
 package IceGridGUI.Application;
 
 import IceGrid.*;
@@ -37,24 +38,23 @@ public class ParametersField extends JTable
     {
         _editor = editor;
 
-        _columnNames = new java.util.Vector(2);
+        _columnNames = new java.util.Vector<String>(2);
         _columnNames.add("Name");
         _columnNames.add("Default value");
 
-        JComboBox comboBox = new JComboBox(
-            new Object[]{_noDefault});
+        JComboBox comboBox = new JComboBox(new Object[]{_noDefault});
         comboBox.setEditable(true);
         _cellEditor = new DefaultCellEditor(comboBox);
 
         Action deleteRow = new AbstractAction("Delete selected row(s)")
             {
-                public void actionPerformed(ActionEvent e) 
+                public void actionPerformed(ActionEvent e)
                 {
-                    if(isEditing()) 
+                    if(isEditing())
                     {
                         getCellEditor().stopCellEditing();
                     }
-                    
+
                     for(;;)
                     {
                         int selectedRow = getSelectedRow();
@@ -70,26 +70,23 @@ public class ParametersField extends JTable
                 }
             };
         getActionMap().put("delete", deleteRow);
-        getInputMap().put(
-            KeyStroke.getKeyStroke("DELETE"), "delete");
-
+        getInputMap().put(KeyStroke.getKeyStroke("DELETE"), "delete");
     }
 
-    public void set(java.util.List names, java.util.Map values)
+    public void set(java.util.List<String> names, java.util.Map<String, String> values)
     {
         //
         // Transform map into vector of vectors
         //
-        java.util.Vector vector = new java.util.Vector(names.size());
-        java.util.Iterator p = names.iterator();
-        while(p.hasNext())
+        java.util.Vector<java.util.Vector<String>> vector =
+            new java.util.Vector<java.util.Vector<String>>(names.size());
+        for(String name : names)
         {
-            java.util.Vector row = new java.util.Vector(2);
-            String name = (String)p.next();
-            
+            java.util.Vector<String> row = new java.util.Vector<String>(2);
+
             row.add(name);
-            
-            Object val = values.get(name);
+
+            String val = values.get(name);
             if(val == null)
             {
                 row.add(_noDefault);
@@ -101,25 +98,23 @@ public class ParametersField extends JTable
             vector.add(row);
         }
 
-
-        java.util.Vector newRow = new java.util.Vector(2);
+        java.util.Vector<String> newRow = new java.util.Vector<String>(2);
         newRow.add("");
         newRow.add(_noDefault);
         vector.add(newRow);
 
         _model = new DefaultTableModel(vector, _columnNames);
-        
+
         _model.addTableModelListener(new TableModelListener()
             {
                 public void tableChanged(TableModelEvent e)
                 {
-                    Object lastKey = _model.getValueAt(
-                        _model.getRowCount() - 1 , 0);
+                    Object lastKey = _model.getValueAt(_model.getRowCount() - 1 , 0);
                     if(lastKey != null && !lastKey.equals(""))
                     {
                         _model.addRow(new Object[]{"", _noDefault});
                     }
-                    
+
                     _editor.updated();
                 }
             });
@@ -128,41 +123,39 @@ public class ParametersField extends JTable
         TableColumn valColumn = getColumnModel().getColumn(1);
         valColumn.setCellEditor(_cellEditor);
 
-        setPreferredScrollableViewportSize(getPreferredSize()); 
+        setPreferredScrollableViewportSize(getPreferredSize());
     }
 
-
-    public java.util.Map get(java.util.List names)
+    public java.util.Map<String, String> get(java.util.List<String> names)
     {
         assert names != null;
 
-        java.util.Map values = new java.util.HashMap();
+        java.util.Map<String, String> values = new java.util.HashMap<String, String>();
 
-        if(isEditing()) 
+        if(isEditing())
         {
             getCellEditor().stopCellEditing();
         }
-        java.util.Vector vector = _model.getDataVector();
-        
-        java.util.Iterator p = vector.iterator();
-        while(p.hasNext())
+        @SuppressWarnings("unchecked")
+        java.util.Vector<java.util.Vector<String>> vector =
+            (java.util.Vector<java.util.Vector<String>>)_model.getDataVector();
+
+        for(java.util.Vector<String> row : vector)
         {
-            java.util.Vector row = (java.util.Vector)p.next();
-            
             //
             // Eliminate rows with null or empty names
             //
-            String name = (String)row.elementAt(0);
+            String name = row.elementAt(0);
             if(name != null)
             {
                 name = name.trim();
-                
+
                 if(!name.equals(""))
                 {
                     names.add(name);
-                     
-                    Object val = row.elementAt(1);
-                    
+
+                    String val = row.elementAt(1);
+
                     //
                     // Eliminate entries with "default" value
                     //
@@ -177,18 +170,10 @@ public class ParametersField extends JTable
         return values;
     }
 
-    private final Object _noDefault = new Object()
-        {
-            public String toString()
-            {
-                return "No default";
-            }
-        };
+    private final String _noDefault = "No default";
 
     private DefaultTableModel _model;
-    private java.util.Vector _columnNames;
+    private java.util.Vector<String> _columnNames;
     private Editor _editor;
     private TableCellEditor _cellEditor;
 }
-
-