removing Java2 mapping

1 files changed, 54 insertions, 71 deletions

diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java
index 73e0bf387f6..aa4a2f88889 100644
--- a/java/src/IceGridGUI/Application/PropertiesField.java
+++ b/java/src/IceGridGUI/Application/PropertiesField.java
@@ -6,6 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
+
 package IceGridGUI.Application;
 
 import IceGrid.*;
@@ -24,7 +25,6 @@ import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
 
-
 //
 // A special field used to show/edit properties
 //
@@ -33,7 +33,7 @@ public class PropertiesField extends JTable
 {
     public PropertiesField(Editor editor)
     {
-        _columnNames = new java.util.Vector(2);
+        _columnNames = new java.util.Vector<String>(2);
         _columnNames.add("Name");
         _columnNames.add("Value");
 
@@ -41,15 +41,15 @@ public class PropertiesField extends JTable
 
         Action deleteRow = new AbstractAction("Delete selected row(s)")
             {
-                public void actionPerformed(ActionEvent e) 
+                public void actionPerformed(ActionEvent e)
                 {
                     if(_editable)
                     {
-                        if(isEditing()) 
+                        if(isEditing())
                         {
                             getCellEditor().stopCellEditing();
                         }
-                        
+
                         for(;;)
                         {
                             int selectedRow = getSelectedRow();
@@ -66,32 +66,25 @@ public class PropertiesField extends JTable
                 }
             };
         getActionMap().put("delete", deleteRow);
-        getInputMap().put(
-            KeyStroke.getKeyStroke("DELETE"), "delete");
-
-
-        
-
+        getInputMap().put(KeyStroke.getKeyStroke("DELETE"), "delete");
     }
 
-
-    public void setProperties(java.util.List properties,
-                              java.util.List adapters,
-                              String[] logs,
-                              Utils.Resolver resolver, boolean editable)
+    public void setProperties(java.util.List<PropertyDescriptor> properties,
+                              java.util.List<AdapterDescriptor> adapters, String[] logs, Utils.Resolver resolver,
+                              boolean editable)
     {
         _editable = editable;
 
         //
         // We don't show the .Endpoint and .PublishedEndpoints of adapters,
-        // since they already appear in the Adapter pages 
+        // since they already appear in the Adapter pages
         //
-        java.util.Set hiddenPropertyNames = new java.util.HashSet();
+        java.util.Set<String> hiddenPropertyNames = new java.util.HashSet<String>();
 
         //
         // We also hide properties whose value match an object or allocatable
         //
-        java.util.Set hiddenPropertyValues = new java.util.HashSet();
+        java.util.Set<String> hiddenPropertyValues = new java.util.HashSet<String>();
 
         _hiddenProperties.clear();
 
@@ -101,86 +94,79 @@ public class PropertiesField extends JTable
             // Note that we don't substitute *on purpose*, i.e. the names or values
             // must match before substitution.
             //
-            java.util.Iterator p = adapters.iterator();
-            while(p.hasNext())
+            for(AdapterDescriptor p : adapters)
             {
-                AdapterDescriptor ad = (AdapterDescriptor)p.next();
-                hiddenPropertyNames.add(ad.name + ".Endpoints");
-                hiddenPropertyNames.add(ad.name + ".PublishedEndpoints");
+                hiddenPropertyNames.add(p.name + ".Endpoints");
+                hiddenPropertyNames.add(p.name + ".PublishedEndpoints");
 
-                java.util.Iterator q = ad.objects.iterator();
-                while(q.hasNext())
+                for(ObjectDescriptor q : p.objects)
                 {
-                    ObjectDescriptor od = (ObjectDescriptor)q.next();
-                    hiddenPropertyValues.add(Ice.Util.identityToString(od.id));
+                    hiddenPropertyValues.add(Ice.Util.identityToString(q.id));
                 }
-                q = ad.allocatables.iterator();
-                while(q.hasNext())
+                for(ObjectDescriptor q : p.allocatables)
                 {
-                    ObjectDescriptor od = (ObjectDescriptor)q.next();
-                    hiddenPropertyValues.add(Ice.Util.identityToString(od.id));
+                    hiddenPropertyValues.add(Ice.Util.identityToString(q.id));
                 }
             }
         }
 
         if(logs != null)
         {
-            for(int i = 0; i < logs.length; ++i)
+            for(String log : logs)
             {
-                hiddenPropertyValues.add(logs[i]);
+                hiddenPropertyValues.add(log);
             }
         }
-        
+
         //
         // Transform list into vector of vectors
         //
-        java.util.Vector vector = new java.util.Vector(properties.size());
-        java.util.Iterator p = properties.iterator();
-        while(p.hasNext())
+        java.util.Vector<java.util.Vector<String>> vector =
+            new java.util.Vector<java.util.Vector<String>>(properties.size());
+        for(PropertyDescriptor p : properties)
         {
-            PropertyDescriptor pd = (PropertyDescriptor)p.next();
-            if(hiddenPropertyNames.contains(pd.name))
+            if(hiddenPropertyNames.contains(p.name))
             {
                 //
                 // We keep them at the top of the list
                 //
                 if(_editable)
                 {
-                    _hiddenProperties.add(pd);
+                    _hiddenProperties.add(p);
                 }
 
                 //
                 // We hide only the first occurence
                 //
-                hiddenPropertyNames.remove(pd.name);
+                hiddenPropertyNames.remove(p.name);
             }
-            else if(hiddenPropertyValues.contains(pd.value))
+            else if(hiddenPropertyValues.contains(p.value))
             {
                 //
                 // We keep them at the top of the list
                 //
                 if(_editable)
                 {
-                    _hiddenProperties.add(pd);
+                    _hiddenProperties.add(p);
                 }
 
                 //
                 // We hide only the first occurence
                 //
-                hiddenPropertyValues.remove(pd.value);
+                hiddenPropertyValues.remove(p.value);
             }
             else
             {
-                java.util.Vector row = new java.util.Vector(2);
-                row.add(Utils.substitute(pd.name, resolver));
-                row.add(Utils.substitute(pd.value, resolver));
+                java.util.Vector<String> row = new java.util.Vector<String>(2);
+                row.add(Utils.substitute(p.name, resolver));
+                row.add(Utils.substitute(p.value, resolver));
                 vector.add(row);
             }
         }
 
         if(_editable)
         {
-            java.util.Vector newRow = new java.util.Vector(2);
+            java.util.Vector<String> newRow = new java.util.Vector<String>(2);
             newRow.add("");
             newRow.add("");
             vector.add(newRow);
@@ -193,15 +179,14 @@ public class PropertiesField extends JTable
                     return _editable;
                 }
             };
-        
+
         _model.addTableModelListener(new TableModelListener()
             {
                 public void tableChanged(TableModelEvent e)
                 {
                     if(_editable)
                     {
-                        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[]{"", ""});
@@ -216,38 +201,37 @@ public class PropertiesField extends JTable
         setOpaque(_editable);
         setPreferredScrollableViewportSize(getPreferredSize());
 
-        DefaultTableCellRenderer cr = (DefaultTableCellRenderer)
-            getDefaultRenderer(String.class);
-        cr.setOpaque(_editable);        
+        DefaultTableCellRenderer cr = (DefaultTableCellRenderer)getDefaultRenderer(String.class);
+        cr.setOpaque(_editable);
     }
 
-    public java.util.LinkedList getProperties()
+    public java.util.LinkedList<PropertyDescriptor> getProperties()
     {
         assert _editable;
 
-        if(isEditing()) 
+        if(isEditing())
         {
             getCellEditor().stopCellEditing();
         }
-        java.util.Vector vector = _model.getDataVector();
-        
-        java.util.LinkedList result = new java.util.LinkedList(_hiddenProperties);
+        @SuppressWarnings("unchecked")
+        java.util.Vector<java.util.Vector<String>> vector =
+            (java.util.Vector<java.util.Vector<String>>)_model.getDataVector();
 
-        java.util.Iterator p = vector.iterator();
-        while(p.hasNext())
-        {
-             java.util.Vector row = (java.util.Vector)p.next();
+        java.util.LinkedList<PropertyDescriptor> result =
+            new java.util.LinkedList<PropertyDescriptor>(_hiddenProperties);
 
+        for(java.util.Vector<String> row : vector)
+        {
              //
              // Eliminate rows with null or empty keys
              //
-             String key = (String)row.elementAt(0);
+             String key = row.elementAt(0);
              if(key != null)
              {
-                 key = key.trim(); 
+                 key = key.trim();
                  if(!key.equals(""))
                  {
-                     String val = (String) row.elementAt(1);
+                     String val = row.elementAt(1);
                      if(val == null)
                      {
                          val = "";
@@ -261,12 +245,11 @@ public class PropertiesField extends JTable
     }
 
     private DefaultTableModel _model;
-    private java.util.Vector _columnNames;
+    private java.util.Vector<String> _columnNames;
     private boolean _editable = false;
 
-    private java.util.LinkedList _hiddenProperties = new java.util.LinkedList();
+    private java.util.LinkedList<PropertyDescriptor> _hiddenProperties =
+        new java.util.LinkedList<PropertyDescriptor>();
 
     private Editor _editor;
 }
-
-