Automated merge with http://hg.netbeans.org/main release65_beta_base
authorKirill Sorokin <ksorokin@netbeans.org>
Mon, 04 Aug 2008 16:10:55 +0400
changeset 3650c8b0581eb1c8
parent 3648 8ea55dcdda88
parent 3649 7bd590348223
child 3652 b036919c042d
child 3653 4e5d300524ac
child 4148 a2ba50c8fbc0
Automated merge with http://hg.netbeans.org/main
     1.1 --- a/bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/action/Breakpoint.java	Mon Aug 04 13:26:22 2008 +0400
     1.2 +++ b/bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/action/Breakpoint.java	Mon Aug 04 16:10:55 2008 +0400
     1.3 @@ -24,6 +24,7 @@
     1.4  import java.util.Collections;
     1.5  import java.util.Set;
     1.6  import java.util.concurrent.atomic.AtomicBoolean;
     1.7 +import javax.swing.SwingUtilities;
     1.8  import javax.swing.text.StyledDocument;
     1.9  import org.netbeans.api.debugger.ActionsManager;
    1.10  import org.netbeans.api.debugger.DebuggerManager;
    1.11 @@ -89,6 +90,17 @@
    1.12      public void propertyChange(
    1.13              final PropertyChangeEvent event) {
    1.14          
    1.15 +        // IZ 135771. Ensure we're in EDT.
    1.16 +        if (!SwingUtilities.isEventDispatchThread()) {
    1.17 +            SwingUtilities.invokeLater(new Runnable() {
    1.18 +                public void run() {
    1.19 +                    Breakpoint.this.propertyChange(event);
    1.20 +                }
    1.21 +            });
    1.22 +            
    1.23 +            return;
    1.24 +        }
    1.25 +        
    1.26          final TopComponent activeTc = 
    1.27                  WindowManager.getDefault().getRegistry().getActivated();
    1.28          final MultiViewHandler mvh =