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-2988 if selected file is null (On Java 10/OSX - happens if user has entered text...
[jalview.git]
/
src
/
jalview
/
gui
/
PaintRefresher.java
diff --git
a/src/jalview/gui/PaintRefresher.java
b/src/jalview/gui/PaintRefresher.java
index
1b90d82
..
ced5544
100755
(executable)
--- a/
src/jalview/gui/PaintRefresher.java
+++ b/
src/jalview/gui/PaintRefresher.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-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)
@@
-188,8
+183,8
@@
public class PaintRefresher
{
// raise an implementation warning here - not sure if this situation
// will ever occur
{
// raise an implementation warning here - not sure if this situation
// will ever occur
- System.err
- .println("IMPLEMENTATION PROBLEM: DATASET out of sync due to an insert whilst calling PaintRefresher.validateSequences(AlignmentI, ALignmentI)");
+ System.err.println(
+ "IMPLEMENTATION PROBLEM: DATASET out of sync due to an insert whilst calling PaintRefresher.validateSequences(AlignmentI, ALignmentI)");
}
List<SequenceI> alsq;
synchronized (alsq = comp.getSequences())
}
List<SequenceI> alsq;
synchronized (alsq = comp.getSequences())