Merge branch 'develop' into trial_merge/JAL-1950

[jalview.git] / src / jalview / appletgui / PaintRefresher.java

diff --git a/src/jalview/appletgui/PaintRefresher.java b/src/jalview/appletgui/PaintRefresher.java
index 7c6fad0..32507fe 100755 (executable)
--- a/src/jalview/appletgui/PaintRefresher.java
+++ b/src/jalview/appletgui/PaintRefresher.java
@@ -27,6 +27,7 @@ import java.awt.Component;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 import java.util.Vector;
 
 /**
@@ -37,7 +38,7 @@ import java.util.Vector;
  */
 public class PaintRefresher
 {
-  static Hashtable components;
+  static Map<String, Vector<Component>> components;
 
   /**
    * DOCUMENT ME!
@@ -51,12 +52,12 @@ public class PaintRefresher
   {
     if (components == null)
     {
-      components = new Hashtable();
+      components = new Hashtable<String, Vector<Component>>();
     }
 
     if (components.containsKey(seqSetId))
     {
-      Vector comps = (Vector) components.get(seqSetId);
+      Vector<Component> comps = components.get(seqSetId);
       if (!comps.contains(comp))
       {
         comps.addElement(comp);
@@ -64,7 +65,7 @@ public class PaintRefresher
     }
     else
     {
-      Vector vcoms = new Vector();
+      Vector<Component> vcoms = new Vector<>();
       vcoms.addElement(comp);
       components.put(seqSetId, vcoms);
     }
@@ -77,11 +78,9 @@ public class PaintRefresher
       return;
     }
 
-    Enumeration en = components.keys();
-    while (en.hasMoreElements())
+    for (String id : components.keySet())
     {
-      String id = en.nextElement().toString();
-      Vector comps = (Vector) components.get(id);
+      Vector<Component> comps = components.get(id);
       comps.removeElement(comp);
       if (comps.size() == 0)
       {
@@ -104,17 +103,17 @@ public class PaintRefresher
     }
 
     Component comp;
-    Vector comps = (Vector) components.get(id);
+    Vector<Component> comps = components.get(id);
 
     if (comps == null)
     {
       return;
     }
 
-    Enumeration e = comps.elements();
+    Enumeration<Component> e = comps.elements();
     while (e.hasMoreElements())
     {
-      comp = (Component) e.nextElement();
+      comp = e.nextElement();
 
       if (comp == source)
       {
@@ -240,8 +239,8 @@ public class PaintRefresher
 
   public static AlignmentPanel[] getAssociatedPanels(String id)
   {
-    Vector comps = (Vector) components.get(id);
-    Vector tmp = new Vector();
+    Vector<Component> comps = components.get(id);
+    Vector<Component> tmp = new Vector<>();
     int i, iSize = comps.size();
     for (i = 0; i < iSize; i++)
     {