Bug 84870 - Hang in PasteBreakpointsAction.updateSelection

2 files changed, 6 insertions, 17 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java
index 0d1fa2ef0..8b6f3fb88 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,13 +11,10 @@
 package org.eclipse.debug.internal.ui.actions.breakpointGroups;
 
 import java.util.List;
-
 import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointContainer;
 import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView;
 import org.eclipse.debug.internal.ui.views.breakpoints.OtherBreakpointCategory;
-import org.eclipse.jface.util.Assert;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
 
 /**
@@ -29,21 +26,14 @@ import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
  * @since 2.0
  */
 public class PasteBreakpointsAction extends BreakpointSelectionAction {
-
-    /**
-     * System clipboard
-     */
-    private Clipboard clipboard;
     
     /**
      * Creates a new action.
      *
-     * @param shell the shell for any dialogs
+     * @param view the view of this action
      */
-    public PasteBreakpointsAction(BreakpointsView view, Clipboard clipboard) {
+    public PasteBreakpointsAction(BreakpointsView view) {
         super(BreakpointGroupMessages.getString("PasteBreakpointsAction.0"), view); //$NON-NLS-1$
-        Assert.isNotNull(clipboard);
-        this.clipboard = clipboard;
         setToolTipText(BreakpointGroupMessages.getString("PasteBreakpointsAction.1")); //$NON-NLS-1$
     }
 
@@ -90,5 +80,4 @@ public class PasteBreakpointsAction extends BreakpointSelectionAction {
 		// don't access clipboard - causes Hang -see bug 84870
 		return false;
     }
-}
-
+}
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
index d73074604..3f9690641 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -426,7 +426,7 @@ public class BreakpointsView extends AbstractDebugView implements ISelectionList
         
         fClipboard= new Clipboard(getSite().getShell().getDisplay());
         
-        PasteBreakpointsAction paste = new PasteBreakpointsAction(this, fClipboard);
+        PasteBreakpointsAction paste = new PasteBreakpointsAction(this);
         configure(paste, IWorkbenchActionDefinitionIds.PASTE, ActionFactory.PASTE.getId(),ISharedImages.IMG_TOOL_PASTE);
         SelectionListenerAction copy = new CopyBreakpointsAction(this, fClipboard, paste);
         configure(copy, IWorkbenchActionDefinitionIds.COPY, ActionFactory.COPY.getId(), ISharedImages.IMG_TOOL_COPY);