Bug 247990 [breakpoints] Breakpoint working set not updated properly after import

3 files changed, 16 insertions, 32 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/IImportExportConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/IImportExportConstants.java
index d5bccfd7d..991dc9791 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/IImportExportConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/IImportExportConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -46,16 +46,6 @@ public interface IImportExportConstants {
 	public static final String IE_NODE_BREAKPOINT = "breakpoint"; //$NON-NLS-1$
 	
 	/**
-	 * The ID for the classname node for exporting breakpoints from the wizards.
-	 * This ID is searchable from the listing of XMLMementos gathered from the BreakPointManager.
-	 * 
-	 * @see WizardExportBreakpointsPage
-	 * @see WizardImportBreakpointsPage
-	 * @see XMLMemento->getChild(String)
-	 */
-	public static final String IE_NODE_CLASSNAME = "classname"; //$NON-NLS-1$
-	
-	/**
 	 * <p>
 	 * The generalized ID for each of the values stored in a markers' attribute map.
 	 * Since a marker can have any number of attributes and or values, we use a 
@@ -139,7 +129,7 @@ public interface IImportExportConstants {
 	public static final String IE_BP_REGISTERED = "registered"; //$NON-NLS-1$
 	
 	/**
-	 * The name of the persistant attribute for breakpoint information
+	 * The name of the persistent attribute for breakpoint information
 	 */
 	public static final String IE_BP_PERSISTANT = "persistant"; //$NON-NLS-1$
 	
@@ -154,22 +144,7 @@ public interface IImportExportConstants {
 	public static final String CHARSTART = "charStart"; //$NON-NLS-1$
 	
 	/**
-	 * the name of the workingsets node
-	 */
-	public static final String IE_NODE_WORKINGSETS = "workingsets";  //$NON-NLS-1$
-	
-	/**
-	 * The name of the workingset node
-	 */
-	public static final String IE_NODE_WORKINGSET = "workingset"; //$NON-NLS-1$
-	
-	/**
-	 * The name of the id attribute, reusable for a general attribute called id
-	 */
-	public static final String IE_NODE_ID = "id"; //$NON-NLS-1$
-	
-	/**
 	 * The delimiter for the listing of working sets that a marker belongs to
 	 */
 	public static final String DELIMITER = "<;#>"; //$NON-NLS-1$
-}//end interface
+}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
index 9f192a651..d7eb36188 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -321,7 +321,11 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 					breakpoints.add(object);
 				}
 			}
-			getContainer().run(true, true, new ExportBreakpointsOperation((IBreakpoint[]) breakpoints.toArray(new IBreakpoint[breakpoints.size()]), fPath.toOSString()));
+			getContainer().run(false, 
+					true, 
+					new ExportBreakpointsOperation(
+							(IBreakpoint[]) breakpoints.toArray(new IBreakpoint[breakpoints.size()]), 
+							fPath.toOSString()));
 		}
 		catch (InterruptedException e) {
 			DebugPlugin.log(e);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
index 395506f25..3b67b0836 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -199,7 +199,12 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 	public boolean finish() {	
 		try {
 			saveWidgetState();
-			getContainer().run(true, true, new ImportBreakpointsOperation(fFileNameField.getText().trim(), fAutoRemoveDuplicates.getSelection(), fAutoCreateWorkingSets.getSelection()));
+			getContainer().run(false, 
+					true, 
+					new ImportBreakpointsOperation(
+							fFileNameField.getText().trim(), 
+							fAutoRemoveDuplicates.getSelection(), 
+							fAutoCreateWorkingSets.getSelection()));
 		}
 		catch (InterruptedException e) {
 			DebugPlugin.log(e);