From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Thu, 14 Feb 2013 18:07:05 +0000 (+0000)
Subject: patch for bizarre ConcurrentModificationException that I've never seen before !
X-Git-Tag: Jalview_2_9~221^2^2~8^2~14
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=46d6d8de867a35ce4082c3be437e5f5cdc31ba34;p=jalview.git

patch for bizarre ConcurrentModificationException that I've never seen before !
---

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index db7c32c..b135417 100644
--- 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)
     {
+      synchronized(progressPanel) {
       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;
       }
+      }
     }
     validate();
   }
@@ -1526,9 +1528,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     fileLoadingCount--;
     if (fileLoadingCount < 1)
     {
-      for (JPanel flp : fileLoadingPanels)
+      while (fileLoadingPanels.size()>0)
       {
-        removeProgressPanel(flp);
+        removeProgressPanel(fileLoadingPanels.remove(0));
       }
       fileLoadingPanels.clear();
       fileLoadingCount = 0;