[power-architect] r3879 committed - Improved the performance and reduced risk of deadlock of the status ba...

[codesite-noreply]

Revision: 3879
Author: thomasobrie...@gmail.com
Date: Fri Aug 13 07:50:53 2010
Log: Improved the performance and reduced risk of deadlock of the status  
bar by only synchronizing the sections that use and modify the progress  
bars.
http://code.google.com/p/power-architect/source/detail?r=3879
Modified:
 /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectStatusBar.java

=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectStatusBar.java	 
Tue Jul 27 15:32:19 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectStatusBar.java	 
Fri Aug 13 07:50:53 2010
@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;

+import javax.annotation.concurrent.GuardedBy;
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;

@@ -197,6 +198,7 @@
     /**
      * The existing progress bars in this status bar.
      */
+    @GuardedBy("this")
     private final List<ArchitectStatusProgressBar> progressBars =
         new ArrayList<ArchitectStatusProgressBar>();

@@ -210,9 +212,11 @@
     }

     @Override
-    public synchronized MonitorableImpl createProgressMonitor() {
+    public MonitorableImpl createProgressMonitor() {
         ArchitectStatusProgressBar newBar = new  
ArchitectStatusProgressBar();
-        progressBars.add(newBar);
+        synchronized(this) {
+            progressBars.add(newBar);
+        }
         resizeProgressBars();
         return newBar;
     }
@@ -220,8 +224,10 @@
     /**
      * Call to clear a progress bar off of the status bar.
      */
-    private synchronized void removeProgressBar(ArchitectStatusProgressBar  
bar) {
-        progressBars.remove(bar);
+    private void removeProgressBar(ArchitectStatusProgressBar bar) {
+        synchronized(this) {
+            progressBars.remove(bar);
+        }
         resizeProgressBars();
     }

@@ -229,13 +235,15 @@
         Graphics g = progressBarPanel.getGraphics();
         g.setColor(progressBarPanel.getBackground());
         g.fillRect(0, 0, progressBarPanel.getWidth(),  
progressBarPanel.getHeight());
-        if (progressBars.isEmpty())  return;
-        int newWidth = progressBarPanel.getWidth() / progressBars.size();
-        int x = 0;
-        for (ArchitectStatusProgressBar bar : progressBars) {
-            bar.setX(x);
-            bar.setWidth(newWidth);
-            x += newWidth;
+        synchronized(this) {
+            if (progressBars.isEmpty())  return;
+            int newWidth = progressBarPanel.getWidth() /  
progressBars.size();
+            int x = 0;
+            for (ArchitectStatusProgressBar bar : progressBars) {
+                bar.setX(x);
+                bar.setWidth(newWidth);
+                x += newWidth;
+            }
         }
     }