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

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

@@ -61,11 +61,11 @@
 /**
  * This class handles all the special filter juggling that exec tool needs to do.
  */
 public class ET_FilterHandler implements ET_FilterControl, Session.Observer {
     ET_FilterHandler(JComponent parent, ExecModel model, Harness h, UIFactory uif,
-                     Map map) {
+                     Map<String, String> map) {
         this(parent, model, uif);
         setHarness(h);
         restore(map);
     }
 

@@ -158,13 +158,13 @@
     FilterSelectionHandler getFilterSelectionHandler() {
         loadFilters();
         return fHandler;
     }
 
-    private TestFilter getDefaultFilter(Map map) {
+    private TestFilter getDefaultFilter(Map<String, String> map) {
         if (map != null) {
-            String pref = (String)(map.get(ExecTool.ACTIVE_FILTER));
+            String pref = (map.get(ExecTool.ACTIVE_FILTER));
 
             // try to use filter indicated in preference
             for (int i = 0; i < allFilters.size(); i++) {
                 if (allFilters.elementAt(i).getClass().getName().equals(pref))
                     return allFilters.elementAt(i);

@@ -279,11 +279,11 @@
         pm.put(META_CLASS, bctf.getClass().getName());
         bctf.save(pm);
 
         prefs.save();
     }
-    public void restore(Map m) {
+    public void restore(Map<String, String> m) {
         this.map = m;
         fHandler.setFilter(getDefaultFilter(m));
     }
     public void updateGUI() {
         // do nothing

@@ -439,11 +439,11 @@
     private FilterConfig fConfig;
     private FilterSelectionHandler fHandler;
     private ExecModel model;
     private UIFactory uif;
     private JComponent parentComponent;
-    private Map map;        // saved desktop map to restore from
+    private Map<String, String> map;        // saved desktop map to restore from
 
     // filters
     private LastRunFilter ltrFilter;        // last test run
     private ParameterFilter paramFilter;    // current param filter
     private BasicCustomTestFilter bctf;     // "custom" filter

@@ -511,11 +511,11 @@
         public String put(String key, String value) {
             prefs.setPreference(key, value);
             return null;
         }
 
-        public void putAll(Map t) {
+        public void putAll(Map<? extends String, ? extends String> t) {
             throw new UnsupportedOperationException();
         }
 
         public String remove(Object key) {
             throw new UnsupportedOperationException();