src/com/sun/javatest/exec/TP_PropertySubpanel.java

rev 145 : 7902237: Fixing raw use of parameterized class
Reviewed-by: jjg

@@ -88,15 +88,14 @@
         //System.err.println("TP_PS: updateSubpanel");
         super.updateSubpanel(currTest);
         table.reset();
     }
 
-    protected void updateEntries(Map map) {
-        for (Iterator i = map.entrySet().iterator(); i.hasNext(); ) {
-            Map.Entry e = (Map.Entry) (i.next());
-            String key = (String) (e.getKey());
-            String val = (String) (e.getValue());
+    protected void updateEntries(Map<String, String> map) {
+        for (Map.Entry<String, String> e : map.entrySet()) {
+            String key = (e.getKey());
+            String val = (e.getValue());
             if (val != null && !val.trim().isEmpty()) {
                 table.updateEntry(key, val);
             }
         }
     }

@@ -239,12 +238,12 @@
                 nameLabel.setBounds(0, 0, nameWidth, h);
                 valueLabel.setBounds(nameWidth, 0, valueWidth, h);
 
                 int y = (inScrollPane ? 0 : h);
 
-                for (Iterator iter = entries.values().iterator(); iter.hasNext(); ) {
-                    Entry e = (Entry) (iter.next());
+                for (Iterator<Entry> iter = entries.values().iterator(); iter.hasNext(); ) {
+                    Entry e = (iter.next());
                     // need to take insets into account for value, since we are dealing
                     // with the elemental view inside the valueField
                     Insets vi = e.valueText.getInsets();
                     View v = e.valueText.getUI().getRootView(e.valueText);
                     v.setSize(valueWidth, Integer.MAX_VALUE);

@@ -257,22 +256,22 @@
         }
 
         public Dimension getMinimumSize() {
             //System.err.println("TP_PS.Table: minimumLayoutSize");
             int h = (inScrollPane ? 0 : nameLabel.getPreferredSize().height);
-            for (Iterator iter = entries.values().iterator(); iter.hasNext(); ) {
-                Entry e = (Entry) (iter.next());
+            for (Iterator<Entry> iter = entries.values().iterator(); iter.hasNext(); ) {
+                Entry e = (iter.next());
                 h += e.valueText.getMinimumSize().height;
             }
             return new Dimension(maxNameStringWidth + 400, h);
         }
 
         public Dimension getPreferredSize() {
             //System.err.println("TP_PS.Table: preferredLayoutSize");
             int h = (inScrollPane ? 0 : nameLabel.getPreferredSize().height);
-            for (Iterator iter = entries.values().iterator(); iter.hasNext(); ) {
-                Entry e = (Entry) (iter.next());
+            for (Iterator<Entry> iter = entries.values().iterator(); iter.hasNext(); ) {
+                Entry e = (iter.next());
                 h += e.valueText.getPreferredSize().height;
             }
             return new Dimension(maxNameStringWidth + 400, h);
         }