git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3247 JAL-3254 Automatically creating correct file association inserts for Info...
[jalview.git]
/
src
/
jalview
/
gui
/
PaintRefresher.java
diff --git
a/src/jalview/gui/PaintRefresher.java
b/src/jalview/gui/PaintRefresher.java
index
d731e70
..
ced5544
100755
(executable)
--- a/
src/jalview/gui/PaintRefresher.java
+++ b/
src/jalview/gui/PaintRefresher.java
@@
-26,9
+26,9
@@
import jalview.datamodel.SequenceI;
import java.awt.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.awt.Component;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
/**
* Route datamodel/view update events for a sequence set to any display
/**
* Route datamodel/view update events for a sequence set to any display
@@
-74,26
+74,21
@@
public class PaintRefresher
*/
public static void RemoveComponent(Component comp)
{
*/
public static void RemoveComponent(Component comp)
{
- List<String> emptied = new ArrayList<String>();
- for (Entry<String, List<Component>> registered : components.entrySet())
+ if (components == null)
{
{
- String id = registered.getKey();
- List<Component> comps = components.get(id);
+ return;
+ }
+
+ Iterator<String> it = components.keySet().iterator();
+ while (it.hasNext())
+ {
+ List<Component> comps = components.get(it.next());
comps.remove(comp);
if (comps.isEmpty())
{
comps.remove(comp);
if (comps.isEmpty())
{
- emptied.add(id);
+ it.remove();
}
}
}
}
-
- /*
- * Remove now empty ids after the above (to avoid
- * ConcurrentModificationException).
- */
- for (String id : emptied)
- {
- components.remove(id);
- }
}
public static void Refresh(Component source, String id)
}
public static void Refresh(Component source, String id)