X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FPaintRefresher.java;h=fe99187ba71937b6a8df7a147289c71c83c18762;hb=06de78be50c3934158fa1d35ec92ad86b54e959f;hp=4e1bfaf2c86649ade08baeeefc98fac3194c6635;hpb=f52f7b378972cc884b5d3e5cc250f89667f558f7;p=jalview.git
diff --git a/src/jalview/appletgui/PaintRefresher.java b/src/jalview/appletgui/PaintRefresher.java
index 4e1bfaf..fe99187 100755
--- a/src/jalview/appletgui/PaintRefresher.java
+++ b/src/jalview/appletgui/PaintRefresher.java
@@ -1,42 +1,48 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
* This file is part of Jalview.
- *
+ *
* Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * Jalview is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.util.*;
-import java.util.List;
-
-import java.awt.*;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SequenceI;
-import jalview.datamodel.*;
+import java.awt.Component;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
/**
* DOCUMENT ME!
- *
+ *
* @author $author$
* @version $Revision$
*/
public class PaintRefresher
{
- static Hashtable components;
+ static Map> components;
/**
* DOCUMENT ME!
- *
+ *
* @param comp
* DOCUMENT ME!
* @param al
@@ -46,12 +52,12 @@ public class PaintRefresher
{
if (components == null)
{
- components = new Hashtable();
+ components = new Hashtable>();
}
if (components.containsKey(seqSetId))
{
- Vector comps = (Vector) components.get(seqSetId);
+ Vector comps = components.get(seqSetId);
if (!comps.contains(comp))
{
comps.addElement(comp);
@@ -59,7 +65,7 @@ public class PaintRefresher
}
else
{
- Vector vcoms = new Vector();
+ Vector vcoms = new Vector<>();
vcoms.addElement(comp);
components.put(seqSetId, vcoms);
}
@@ -72,15 +78,14 @@ public class PaintRefresher
return;
}
- Enumeration en = components.keys();
- while (en.hasMoreElements())
+ Iterator it = components.keySet().iterator();
+ while (it.hasNext())
{
- String id = en.nextElement().toString();
- Vector comps = (Vector) components.get(id);
+ Vector comps = components.get(it.next());
comps.removeElement(comp);
- if (comps.size() == 0)
+ if (comps.isEmpty())
{
- components.remove(id);
+ it.remove();
}
}
}
@@ -99,17 +104,17 @@ public class PaintRefresher
}
Component comp;
- Vector comps = (Vector) components.get(id);
+ Vector comps = components.get(id);
if (comps == null)
{
return;
}
- Enumeration e = comps.elements();
- while (e.hasMoreElements())
+ Iterator it = comps.iterator();
+ while (it.hasNext())
{
- comp = (Component) e.nextElement();
+ comp = it.next();
if (comp == source)
{
@@ -118,7 +123,7 @@ public class PaintRefresher
if (!comp.isValid())
{
- comps.removeElement(comp);
+ it.remove();
}
else if (validateSequences && comp instanceof AlignmentPanel
&& source instanceof AlignmentPanel)
@@ -184,9 +189,11 @@ public class PaintRefresher
{
if (i < comp.getHeight())
{
- // TODO: the following does not trigger any recalculation of height/etc, or maintain the dataset
+ // TODO: the following does not trigger any recalculation of
+ // height/etc, or maintain the dataset
List alsq;
- synchronized (alsq=comp.getSequences()) {
+ synchronized (alsq = comp.getSequences())
+ {
alsq.add(i, a1[i]);
}
}
@@ -233,8 +240,8 @@ public class PaintRefresher
public static AlignmentPanel[] getAssociatedPanels(String id)
{
- Vector comps = (Vector) components.get(id);
- Vector tmp = new Vector();
+ Vector comps = components.get(id);
+ Vector tmp = new Vector<>();
int i, iSize = comps.size();
for (i = 0; i < iSize; i++)
{
@@ -244,7 +251,8 @@ public class PaintRefresher
}
}
AlignmentPanel[] result = new AlignmentPanel[tmp.size()];
- for (int ix=0;ix