git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac1d516
)
patch for bizarre ConcurrentModificationException that I've never seen before !
author
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Thu, 14 Feb 2013 18:07:05 +0000
(18:07 +0000)
committer
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Thu, 14 Feb 2013 18:07:05 +0000
(18:07 +0000)
src/jalview/gui/Desktop.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
db7c32c
..
b135417
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-1509,6
+1509,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
if (progressPanel != null)
{
{
if (progressPanel != null)
{
+ synchronized(progressPanel) {
progressPanel.remove(progbar);
GridLayout gl = (GridLayout) progressPanel.getLayout();
gl.setRows(gl.getRows() - 1);
progressPanel.remove(progbar);
GridLayout gl = (GridLayout) progressPanel.getLayout();
gl.setRows(gl.getRows() - 1);
@@
-1517,6
+1518,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
this.getContentPane().remove(progressPanel);
progressPanel = null;
}
this.getContentPane().remove(progressPanel);
progressPanel = null;
}
+ }
}
validate();
}
}
validate();
}
@@
-1526,9
+1528,9
@@
public class Desktop extends jalview.jbgui.GDesktop implements
fileLoadingCount--;
if (fileLoadingCount < 1)
{
fileLoadingCount--;
if (fileLoadingCount < 1)
{
- for (JPanel flp : fileLoadingPanels)
+ while (fileLoadingPanels.size()>0)
{
{
- removeProgressPanel(flp);
+ removeProgressPanel(fileLoadingPanels.remove(0));
}
fileLoadingPanels.clear();
fileLoadingCount = 0;
}
fileLoadingPanels.clear();
fileLoadingCount = 0;