removing Java2 mapping

1 files changed, 83 insertions, 100 deletions

diff --git a/java/src/IceGridGUI/Utils.java b/java/src/IceGridGUI/Utils.java
index 6b7582cb987..7a3a0659171 100644
--- a/java/src/IceGridGUI/Utils.java
+++ b/java/src/IceGridGUI/Utils.java
@@ -6,6 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
+
 package IceGridGUI;
 
 import javax.swing.ImageIcon;
@@ -41,7 +42,7 @@ public class Utils
             try
             {
                 int firstDotPos = version.indexOf('.');
-                
+
                 if(firstDotPos == -1)
                 {
                     result = -1;
@@ -54,7 +55,6 @@ public class Utils
                         return -1;
                     }
                     result *= 100;
-               
 
                     int secondDotPos = version.indexOf('.', firstDotPos + 1);
                     if(secondDotPos == -1)
@@ -78,7 +78,6 @@ public class Utils
         return result;
     }
 
-
     static public interface Stringifier
     {
         public String toString(Object obj);
@@ -87,7 +86,7 @@ public class Utils
     //
     // Stringify helpers
     //
-    static public String stringify(java.util.Collection col,
+    static public String stringify(java.util.Collection<?> col,
                                    Stringifier stringifier,
                                    String separator,
                                    Ice.StringHolder toolTipHolder)
@@ -97,9 +96,9 @@ public class Utils
         {
             toolTipHolder.value = null;
         }
-     
-        java.util.Iterator p = col.iterator();
-        
+
+        java.util.Iterator<?> p = col.iterator();
+
         boolean firstElement = true;
         while(p.hasNext())
         {
@@ -122,7 +121,7 @@ public class Utils
                         toolTipHolder.value += "<br>";
                     }
                 }
-                
+
                 if(elt.length() == 0)
                 {
                     result += "\"\"";
@@ -149,15 +148,13 @@ public class Utils
         {
             toolTipHolder.value += "</html>";
         }
-        
-        return result;  
+
+        return result;
     }
-    
-    static public String stringify(java.util.Collection col, 
-                                   String separator,
-                                   Ice.StringHolder toolTipHolder)
+
+    static public String stringify(java.util.Collection<?> col, String separator, Ice.StringHolder toolTipHolder)
     {
-        
+
         Stringifier stringifier = new Stringifier()
             {
                 public String toString(Object obj)
@@ -169,14 +166,13 @@ public class Utils
 
     }
 
-    static public String stringify(String[] stringSeq, String separator,
-                                   Ice.StringHolder toolTipHolder)
+    static public String stringify(String[] stringSeq, String separator, Ice.StringHolder toolTipHolder)
     {
 
         return stringify(java.util.Arrays.asList(stringSeq), separator, toolTipHolder);
     }
 
-    static public String stringify(java.util.Map stringMap, 
+    static public String stringify(java.util.Map<String, String> stringMap,
                                    final String pairSeparator,
                                    String separator,
                                    Ice.StringHolder toolTipHolder)
@@ -185,8 +181,9 @@ public class Utils
             {
                 public String toString(Object obj)
                 {
-                    java.util.Map.Entry entry = (java.util.Map.Entry)obj;
-                    return (String)entry.getKey() + pairSeparator + (String)entry.getValue();
+                    @SuppressWarnings("unchecked")
+                    java.util.Map.Entry<String, String> entry = (java.util.Map.Entry<String, String>)obj;
+                    return entry.getKey() + pairSeparator + entry.getValue();
                 }
             };
 
@@ -198,16 +195,18 @@ public class Utils
         //
         // Application-level resolver
         //
-        public Resolver(java.util.Map variables)
+        @SuppressWarnings("unchecked")
+        public Resolver(java.util.Map<String, String> variables)
         {
+            //@SuppressWarnings("unchecked") - unchecked conversion
             this(new java.util.Map[]{variables});
         }
-      
-        public Resolver(java.util.Map[] variables)
+
+        public Resolver(java.util.Map<String, String>[] variables)
         {
             _variables = variables;
-            _predefinedVariables = new java.util.HashMap();
-         
+            _predefinedVariables = new java.util.HashMap<String, String>();
+
             _parameters = null;
             _subResolver = this;
         }
@@ -215,8 +214,8 @@ public class Utils
         //
         // Resolver for instance; in-parameters are not yet substituted
         //
-        public Resolver(Resolver parent, java.util.Map parameters,
-                        java.util.Map defaults)
+        public Resolver(Resolver parent, java.util.Map<String, String> parameters,
+                        java.util.Map<String, String> defaults)
         {
             _variables = parent._variables;
 
@@ -226,14 +225,14 @@ public class Utils
             //
             reset(parent, parameters, defaults);
         }
-        
+
         //
         // Resolver for plain server or service
         //
         public Resolver(Resolver parent)
         {
             _variables = parent._variables;
-            _predefinedVariables = new java.util.HashMap(parent._predefinedVariables);
+            _predefinedVariables = new java.util.HashMap<String, String>(parent._predefinedVariables);
             _parameters = parent._parameters;
             if(_parameters == null)
             {
@@ -245,39 +244,38 @@ public class Utils
             }
         }
 
-        private Resolver(java.util.Map[] variables,
-                         java.util.Map predefinedVariables)
+        private Resolver(java.util.Map<String, String>[] variables, java.util.Map<String, String> predefinedVariables)
         {
             _variables = variables;
             _predefinedVariables = _predefinedVariables;
 
             _parameters = null;
             _subResolver = this;
-        }       
+        }
 
         public String find(String name)
         {
             if(_parameters != null)
             {
-                Object obj = _parameters.get(name);
-                if(obj != null)
+                String val = _parameters.get(name);
+                if(val != null)
                 {
-                    return (String)obj;
+                    return val;
                 }
             }
 
-            Object obj = _predefinedVariables.get(name);
-            if(obj != null)
+            String val = _predefinedVariables.get(name);
+            if(val != null)
             {
-                return (String)obj;
+                return val;
             }
-          
-            for(int i = 0; i < _variables.length; ++i)
+
+            for(java.util.Map<String, String> map : _variables)
             {
-                obj = _variables[i].get(name);
-                if(obj != null)
+                val = map.get(name);
+                if(val != null)
                 {
-                    return _subResolver.substitute((String)obj);
+                    return _subResolver.substitute(val);
                 }
             }
             return null;
@@ -288,7 +286,7 @@ public class Utils
         //
         public boolean put(String name, String value)
         {
-            String oldVal = (String)_predefinedVariables.get(name);
+            String oldVal = _predefinedVariables.get(name);
             if(oldVal == null || !oldVal.equals(value))
             {
                 _predefinedVariables.put(name, value);
@@ -303,12 +301,12 @@ public class Utils
         //
         // Reset parameters and pre-defined variables
         //
-        public void reset(Resolver parent, java.util.Map parameters,
-                          java.util.Map defaults)
+        public void reset(Resolver parent, java.util.Map<String, String> parameters,
+                          java.util.Map<String, String> defaults)
         {
             assert _variables == parent._variables;
-            _predefinedVariables = new java.util.HashMap(parent._predefinedVariables);
-           
+            _predefinedVariables = new java.util.HashMap<String, String>(parent._predefinedVariables);
+
             _parameters = parent.substituteParameterValues(parameters, defaults);
             _subResolver = new Resolver(_variables, _predefinedVariables);
         }
@@ -316,8 +314,8 @@ public class Utils
         public void reset(Resolver parent)
         {
             assert _variables == parent._variables;
-            _predefinedVariables = new java.util.HashMap(parent._predefinedVariables);
-           
+            _predefinedVariables = new java.util.HashMap<String, String>(parent._predefinedVariables);
+
             assert _parameters == parent._parameters;
             if(_parameters == null)
             {
@@ -332,7 +330,7 @@ public class Utils
         //
         // The sorted substituted parameters
         //
-        public java.util.Map getParameters()
+        public java.util.Map<String, String> getParameters()
         {
             return _parameters;
         }
@@ -346,7 +344,7 @@ public class Utils
 
             int beg = 0;
             int end = 0;
-            
+
             while((beg = input.indexOf("${", beg)) != -1)
             {
                 if(beg > 0 && input.charAt(beg - 1) == '$')
@@ -356,7 +354,7 @@ public class Utils
                     {
                         --escape;
                     }
-                    
+
                     input = input.substring(0, escape) + input.substring(beg - (beg - escape) / 2);
                     if((beg - escape) % 2 != 0)
                     {
@@ -368,7 +366,7 @@ public class Utils
                         beg -= (beg - escape) / 2;
                     }
                 }
-                
+
                 end = input.indexOf('}', beg);
                 if(end == -1)
                 {
@@ -377,13 +375,13 @@ public class Utils
                     //
                     return input;
                 }
-                
+
                 String name = input.substring(beg + 2, end);
-                
+
                 //
                 // Resolve name
                 //
-                String val = find(name);  
+                String val = find(name);
                 if(val != null)
                 {
                     input = input.substring(0, beg) + val + input.substring(end + 1);
@@ -391,7 +389,7 @@ public class Utils
                 }
                 else
                 {
-                    // 
+                    //
                     // No substitution, keep ${name} in the result
                     //
                     ++beg;
@@ -403,36 +401,31 @@ public class Utils
         //
         // Substitute all the values from the input map
         //
-        public java.util.Map substituteParameterValues(java.util.Map input,
-                                                       java.util.Map defaults)
+        public java.util.Map<String, String> substituteParameterValues(java.util.Map<String, String> input,
+                                                                       java.util.Map<String, String> defaults)
         {
-            java.util.Map result = new java.util.HashMap();
-            java.util.Iterator p = input.entrySet().iterator();
-            while(p.hasNext())
+            java.util.Map<String, String> result = new java.util.HashMap<String, String>();
+            for(java.util.Map.Entry<String, String> p : input.entrySet())
             {
-                java.util.Map.Entry entry = (java.util.Map.Entry)p.next();
-                result.put(entry.getKey(), substitute((String)entry.getValue()));
+                result.put(p.getKey(), substitute(p.getValue()));
             }
-            p = defaults.entrySet().iterator();
-            while(p.hasNext())
+            for(java.util.Map.Entry<String, String> p : defaults.entrySet())
             {
-                java.util.Map.Entry entry = (java.util.Map.Entry)p.next();
-                if(!result.containsKey(entry.getKey()))
+                if(!result.containsKey(p.getKey()))
                 {
-                    result.put(entry.getKey(), substitute((String)entry.getValue()));
+                    result.put(p.getKey(), substitute(p.getValue()));
                 }
             }
             return result;
         }
 
-        private java.util.Map[] _variables;
-        private java.util.Map _parameters;
-        private java.util.Map _predefinedVariables;
+        private java.util.Map<String, String>[] _variables;
+        private java.util.Map<String, String> _parameters;
+        private java.util.Map<String, String> _predefinedVariables;
 
         private Resolver _subResolver;
     }
 
-    
     static public String substitute(String input, Resolver resolver)
     {
         if(resolver != null)
@@ -451,50 +444,40 @@ public class Utils
     static public class ExpandedPropertySet
     {
         public ExpandedPropertySet[] references;
-        public java.util.List properties;       // list of PropertyDescriptor 
+        public java.util.List<PropertyDescriptor> properties;       // list of PropertyDescriptor
     }
 
-    static public java.util.SortedMap propertySetsToMap(
-        java.util.List propertySets,
+    static public java.util.SortedMap<String, String> propertySetsToMap(
+        java.util.List<ExpandedPropertySet> propertySets,
         Resolver resolver)
     {
-        java.util.SortedMap toMap = new java.util.TreeMap();
-        java.util.Iterator p = propertySets.iterator();
-        while(p.hasNext())
+        java.util.SortedMap<String, String> toMap = new java.util.TreeMap<String, String>();
+        for(ExpandedPropertySet p : propertySets)
         {
-            ExpandedPropertySet propertySet = (ExpandedPropertySet)p.next();
-            addSet(propertySet, resolver, toMap);
+            addSet(p, resolver, toMap);
         }
         return toMap;
     }
 
-    static public java.util.SortedMap propertySetToMap(
-        ExpandedPropertySet propertySet,
-        Resolver resolver)
+    static public java.util.SortedMap<String, String>
+    propertySetToMap(ExpandedPropertySet propertySet, Resolver resolver)
     {
-        java.util.List list = new java.util.LinkedList();
+        java.util.List<ExpandedPropertySet> list = new java.util.LinkedList<ExpandedPropertySet>();
         list.add(propertySet);
         return propertySetsToMap(list, resolver);
     }
 
-    static private void addSet(ExpandedPropertySet set, Resolver resolver,
-                               java.util.SortedMap toMap)
+    static private void addSet(ExpandedPropertySet set, Resolver resolver, java.util.SortedMap<String, String> toMap)
     {
-        for(int i = 0; i < set.references.length; ++i)
+        for(ExpandedPropertySet s : set.references)
         {
-            addSet(set.references[i], resolver, toMap);
+            addSet(s, resolver, toMap);
         }
-        
-        java.util.Iterator p = set.properties.iterator();
-        while(p.hasNext())
+
+        for(PropertyDescriptor p : set.properties)
         {
-            PropertyDescriptor pd = (PropertyDescriptor)p.next();
-            String name = (String)pd.name;
-            String val = (String)pd.value;
-           
-            name = substitute(pd.name, resolver);
-            val = substitute(pd.value, resolver);
-           
+            String name = substitute(p.name, resolver);
+            String val = substitute(p.value, resolver);
             toMap.put(name, val);
         }
     }