Bug 150625

[build path] Cancel project creation ask to delete launch configurations

8 files changed, 20 insertions, 391 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java
index 8c3842479..a92cbc482 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java
@@ -133,6 +133,6 @@ public class DebugUIPreferenceInitializer extends AbstractPreferenceInitializer
 		prefs.setDefault(IInternalDebugUIConstants.PREF_FILTER_LAUNCH_DELETED, true);
 		prefs.setDefault(IInternalDebugUIConstants.PREF_FILTER_WORKING_SETS, true);
 		prefs.setDefault(IInternalDebugUIConstants.PREF_FILTER_LAUNCH_TYPES, false);
-		prefs.setDefault(IInternalDebugUIConstants.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, MessageDialogWithToggle.PROMPT);
+		prefs.setDefault(IInternalDebugUIConstants.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, MessageDialogWithToggle.ALWAYS);
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteAssociatedLaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteAssociatedLaunchConfigurationsDialog.java
deleted file mode 100644
index 007ae5c27..000000000
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteAssociatedLaunchConfigurationsDialog.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.internal.ui.launchConfigurations;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
-import org.eclipse.debug.internal.ui.SWTFactory;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.model.AdaptableList;
-
-/**
- * Provides a custom dialog for displaying launch configurations separated by project
- * in a tree view for the user to select
- * @since 3.2
- */
-public class DeleteAssociatedLaunchConfigurationsDialog extends SelectionDialog {
-	/**
-	 * Class to provide content for the DeleteAssociatedLaunchConfigsDialog
-	 */
-	class DeleteContentProvider implements ITreeContentProvider {
-
-		private HashMap fInputMap = new HashMap();
-		
-		public DeleteContentProvider(HashMap map) {
-			if(map != null) {
-				fInputMap = map;
-			}
-		}
-		
-		public Object[] getChildren(Object parentElement) {
-			if(parentElement instanceof IProject) {
-				return ((ArrayList)fInputMap.get(parentElement)).toArray();
-			}
-			if(parentElement instanceof AdaptableList) {
-				return fInputMap.keySet().toArray();
-			}
-			return new Object[0];
-		}
-
-		public Object getParent(Object element) {return null;}
-
-		public boolean hasChildren(Object element) {
-			if(element instanceof IProject) {
-				return true;
-			}
-			return false;
-		}
-
-		public Object[] getElements(Object inputElement) {
-			return getChildren(inputElement);
-		}
-
-		public void dispose() {
-			fInputMap.clear();
-			fInputMap = null;
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-		
-	}
-	
-	/**
-	 * Provides a custom viewer for the dialog which allows us to have custom checked state handling
-	 */
-	class LCViewer extends CheckboxTreeViewer {
-
-		/**
-		 * Constructor
-		 * @param parent the parent to add this viewer to
-		 * @param style the style of the viewer
-		 */
-		public LCViewer(Composite parent, int style) {
-			super(parent, style);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.CheckboxTreeViewer#getCheckedElements()
-		 */
-		public Object[] getCheckedElements() {
-			Object[] items = super.getCheckedElements();
-			//filter out the projects
-			ArrayList list = new ArrayList();
-			for (int i = 0; i < items.length; i++) {
-				if(items[i] instanceof ILaunchConfiguration) {
-					list.add(items[i]);
-				}
-			}
-			return list.toArray();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.CheckboxTreeViewer#handleSelect(org.eclipse.swt.events.SelectionEvent)
-		 */
-		protected void handleSelect(SelectionEvent event) {
-			if(event.detail == SWT.CHECK) {
-				updateCheckedState((TreeItem)event.item);
-			}
-		}
-		
-		 /**
-	     * Update the checked state up the given element and all of its children.
-	     * 
-	     * @param element
-	     */
-	    public void updateCheckedState(TreeItem item) {
-	        Object element = item.getData();
-	        if (element instanceof ILaunchConfiguration) {
-            	TreeItem parent = item.getParentItem();
-                TreeItem[] children = parent.getItems();
-                int checked = 0;
-                for (int i = 0; i < children.length; i++) {
-					if(children[i].getChecked()) {
-						checked++;
-					}
-				}
-                if(checked == 0) {
-	                setGrayChecked(parent.getData(), false);
-                }
-                else if(checked == children.length) {
-                	parent.setGrayed(false);
-	                parent.setChecked(true);
-                }
-                else {
-                	setGrayChecked(parent.getData(), true);
-                }
-	        } 
-	        else if (element instanceof IProject) {
-	        	item.setGrayed(false);
-	        	TreeItem[] children = item.getItems();
-	        	for (int i = 0; i < children.length; i++) {
-					setChecked(children[i].getData(), item.getChecked());
-	        	}
-	        }
-	    }
-	}
-	
-	private static final String SETTINGS_ID = IDebugUIConstants.PLUGIN_ID + ".DELETE_ASSOCIATED_CONFIGS_DIALOG"; //$NON-NLS-1$
-	private HashMap fMap = null;
-	private Object fInput = null;
-	private Button fPrefButton = null;
-	private LCViewer fViewer = null;
-	private Object[] fResult = null;
-	
-	/**
-	 * Constructor
-	 * @param parentShell the parent shell for this dialog
-	 * @param input the input for the viewer
-	 * @param message the message for the top of the dialog
-	 * @param map the map of project to listing of configs
-	 */
-	public DeleteAssociatedLaunchConfigurationsDialog(Shell parentShell, Object input, String message, HashMap map) {
-		super(parentShell);
-		super.setMessage(message);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		fMap = map;
-		fInput = input;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.SelectionDialog#getDialogBoundsSettings()
-	 */
-	protected IDialogSettings getDialogBoundsSettings() {
-		IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings();
-		IDialogSettings section = settings.getSection(SETTINGS_ID);
-		if (section == null) {
-			section = settings.addNewSection(SETTINGS_ID);
-		} 
-		return section;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#getInitialSize()
-	 */
-	protected Point getInitialSize() {
-		IDialogSettings settings = getDialogBoundsSettings();
-		if(settings != null) {
-			try {
-				int width = settings.getInt("DIALOG_WIDTH"); //$NON-NLS-1$
-				int height = settings.getInt("DIALOG_HEIGHT"); //$NON-NLS-1$
-				if(width > 0 & height > 0) {
-					return new Point(width, height);
-				}
-			}
-			catch (NumberFormatException nfe) {
-				return new Point(350, 400);
-			}
-		}
-		return new Point(350, 400);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.ListDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		initializeDialogUnits(parent);
-		Composite comp = (Composite) super.createDialogArea(parent);
-		SWTFactory.createLabel(comp, LaunchConfigurationsMessages.DeleteAssociatedLaunchConfigurationsDialog_0, 2);
-		fViewer = new LCViewer(comp, SWT.BORDER);
-		Tree tree = fViewer.getTree();
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = 2;
-		tree.setLayoutData(gd);
-		fViewer.setContentProvider(new DeleteContentProvider(fMap));
-		fViewer.setInput(fInput);
-		fViewer.setLabelProvider(DebugUITools.newDebugModelPresentation());
-		fViewer.expandAll();
-		Composite butcomp = new Composite(comp, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		butcomp.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		butcomp.setLayoutData(gd);
-		Button sall = SWTFactory.createPushButton(butcomp, LaunchConfigurationsMessages.DeleteAssociatedLaunchConfigurationsDialog_1, null);
-		sall.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {}
-			public void widgetSelected(SelectionEvent e) {
-				fViewer.setGrayedElements(new Object[0]);
-				fViewer.setAllChecked(true);
-			}			
-		});
-		Button dsall = SWTFactory.createPushButton(butcomp, LaunchConfigurationsMessages.DeleteAssociatedLaunchConfigurationsDialog_2, null);
-		dsall.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {}
-			public void widgetSelected(SelectionEvent e) {
-				fViewer.setAllChecked(false);
-			}			
-		});
-		fPrefButton = new Button(comp, SWT.CHECK);
-		fPrefButton.setText(LaunchConfigurationsMessages.DeleteAssociatedLaunchConfigurationsDialog_3);
-		Dialog.applyDialogFont(comp);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IDebugHelpContextIds.DELETE_ASSOCIATED_LAUNCH_CONFIGS_DIALOG);
-		return comp;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.SelectionDialog#getResult()
-	 */
-	public Object[] getResult() {
-		return fResult;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.ListDialog#okPressed()
-	 */
-	protected void okPressed() {
-		fResult = fViewer.getCheckedElements();
-		//set pref if selected
-		boolean pref = fPrefButton.getSelection();
-		if(pref) {
-			IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore(); 
-			store.setValue(IInternalDebugUIConstants.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, MessageDialogWithToggle.ALWAYS);
-		}
-		super.okPressed();
-	}
-}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationStatusHandler.java
index dab66c6f6..83e2d8e9a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationStatusHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationStatusHandler.java
@@ -12,6 +12,7 @@ package org.eclipse.debug.internal.ui.launchConfigurations;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -22,9 +23,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.IStatusHandler;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
-import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.ui.model.AdaptableList;
 
 /**
  * Provides a status handler to prompt the user to delete any launch configurations
@@ -41,32 +40,23 @@ public class DeleteLaunchConfigurationStatusHandler implements IStatusHandler {
 	 */
 	public Object handleStatus(IStatus status, Object source) throws CoreException {
 		String pref = DebugUIPlugin.getDefault().getPreferenceStore().getString(IInternalDebugUIConstants.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE);
-		if(source instanceof IProject[]) {
-			IProject[] projects = (IProject[])source;
-			ArrayList configs =  new ArrayList();
-			ArrayList elements = null;
-			HashMap map = new HashMap();
-			for (int i = 0; i < projects.length; i++) {
-				elements = collectAssociatedLaunches(projects[i]);
-				if(!elements.isEmpty()) {
-					map.put(projects[i], elements);
-					configs.addAll(elements);
-				}
-			}
-			if(configs.size() > 0) {
-				if(pref.equals(MessageDialogWithToggle.PROMPT)) {
-					DeleteAssociatedLaunchConfigurationsDialog lsd = new DeleteAssociatedLaunchConfigurationsDialog(DebugUIPlugin.getShell(),
-							new AdaptableList(configs),
-							LaunchConfigurationsMessages.DeleteLaunchConfigurations_0, 
-							map);
-					lsd.setInitialSelections(configs.toArray());
-					lsd.setTitle(LaunchConfigurationsMessages.DeleteLaunchConfigurations_1);
-					if(lsd.open() == IDialogConstants.OK_ID) {
-						doDelete(lsd.getResult());
+		if(pref.equals(MessageDialogWithToggle.ALWAYS)) {
+			if(source instanceof IProject[]) {
+				IProject[] projects = (IProject[])source;
+				ArrayList configs =  new ArrayList();
+				ArrayList elements = null;
+				HashMap map = new HashMap();
+				for (int i = 0; i < projects.length; i++) {
+					elements = collectAssociatedLaunches(projects[i]);
+					if(!elements.isEmpty()) {
+						map.put(projects[i], elements);
+						configs.addAll(elements);
 					}
 				}
-				else if(pref.equals(MessageDialogWithToggle.ALWAYS)){
-					doDelete(configs.toArray());
+				if(configs.size() > 0) {
+					for(Iterator iter = configs.iterator(); iter.hasNext();) {
+						((ILaunchConfiguration)iter.next()).delete();
+					}
 				}
 			}
 		}
@@ -104,20 +94,4 @@ public class DeleteLaunchConfigurationStatusHandler implements IStatusHandler {
         }
 		return list;
 	}
-	
-	/**
-	 * Actually performs the deletion of the launch configurations.
-	 * @param launches the launch configurations to delete
-	 */
-	private void doDelete(Object[] launches) {
-		try {
-			for(int i = 0; i < launches.length; i++) {
-				((ILaunchConfiguration)launches[i]).delete();
-			}
-		}
-		catch (CoreException e) {
-            DebugUIPlugin.log(e);
-		}
-	}
-	
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
index 0764c527c..218f50ed8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
@@ -44,15 +44,6 @@ public class LaunchConfigurationsMessages extends NLS {
 	public static String CompileErrorPromptStatusHandler_0;
 	public static String CompileErrorPromptStatusHandler_1;
 	public static String CompileErrorPromptStatusHandler_2;
-
-	public static String DeleteAssociatedLaunchConfigurationsDialog_0;
-
-	public static String DeleteAssociatedLaunchConfigurationsDialog_1;
-
-	public static String DeleteAssociatedLaunchConfigurationsDialog_2;
-
-	public static String DeleteAssociatedLaunchConfigurationsDialog_3;
-
 	public static String EnvironmentTab_22;
 
 	public static String LaunchConfigurationDialog__Apply_17;
@@ -192,8 +183,6 @@ public class LaunchConfigurationsMessages extends NLS {
 	public static String LaunchConfigurationsDialog_1;
 	public static String LaunchConfigurationsDialog_4;
 	public static String LaunchConfigurationsDialog_5;
-	public static String DeleteLaunchConfigurations_0;
-	public static String DeleteLaunchConfigurations_1;
 	public static String FilterLaunchConfigurationAction_0;
 	
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index 5abea6801..bf70120af 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -127,12 +127,6 @@ LaunchConfigurationTabGroupViewer_No_tabs_defined_for_launch_configuration_type_
 DuplicateLaunchConfigurationAction__Duplicate_1=&Duplicate
 
 DeleteLaunchConfigurationAction_Dele_te_1=Dele&te
-DeleteAssociatedLaunchConfigurationsDialog_0=Select &launch configurations to delete:
-DeleteAssociatedLaunchConfigurationsDialog_1=&Select All
-DeleteAssociatedLaunchConfigurationsDialog_2=&Deselect All
-DeleteAssociatedLaunchConfigurationsDialog_3=&Always delete associated launch configurations
-DeleteLaunchConfigurations_0=The projects associated with the following launch configurations\nhave been deleted. Select launch configurations to delete.
-DeleteLaunchConfigurations_1=Delete Launch Configurations
 
 CreateLaunchConfigurationAction_Ne_w_1=Ne&w
 CreateLaunchConfigurationAction_New_configuration_2=New_configuration
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java
index 9cd81bd69..c93a20eac 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java
@@ -58,27 +58,15 @@ public class DebugPreferencesMessages extends NLS {
 	public static String DefaultLaunchConfigurationsPropertiesPage_0;
 
 	public static String DefaultLaunchConfigurationsPropertiesPage_1;
-
-	public static String DefaultLaunchConfigurationsPropertiesPage_10;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_11;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_12;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_2;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_3;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_4;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_5;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_6;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_7;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_8;
-
 	public static String DefaultLaunchConfigurationsPropertiesPage_9;
 
 	public static String LaunchDelegatesPreferencePage_0;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties
index b0991a942..f7fd55a38 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties
@@ -145,6 +145,5 @@ DefaultLaunchConfigurationsPropertiesPage_6=&Edit...
 DefaultLaunchConfigurationsPropertiesPage_7=Edit selected launch configuration
 DefaultLaunchConfigurationsPropertiesPage_8=De&lete
 DefaultLaunchConfigurationsPropertiesPage_9=Delete selected launch configuration
-DefaultLaunchConfigurationsPropertiesPage_10=Configuration must be located in project {0}
 DefaultLaunchConfigurationsPropertiesPage_11=Select Configuration Type
 DefaultLaunchConfigurationsPropertiesPage_12=&Select the configuration type to create:
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java
index 0f1cbf94b..d24245454 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java
@@ -161,7 +161,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement
 		fFieldEditors = new ArrayList();
 		Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_HORIZONTAL);
 		//filtering options
-		Group group = createGroupComposite(comp, DebugPreferencesMessages.LaunchingPreferencePage_32);
+		Group group = SWTFactory.createGroup(comp, DebugPreferencesMessages.LaunchingPreferencePage_32, 1, 1, GridData.FILL_HORIZONTAL);
 		Composite spacer = SWTFactory.createComposite(group, group.getFont(), 1, 1, GridData.FILL_HORIZONTAL);
 		FieldEditor edit = new BooleanFieldEditor(IInternalDebugUIConstants.PREF_FILTER_LAUNCH_CLOSED, DebugPreferencesMessages.LaunchingPreferencePage_33, SWT.NONE, spacer);
 		fFieldEditors.add(edit);
@@ -171,8 +171,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement
 		fFieldEditors.add(edit);
 		edit = new RadioGroupFieldEditor(IInternalDebugUIConstants.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, DebugPreferencesMessages.LaunchConfigurationsPreferencePage_2, 3,  
 				 new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_3, MessageDialogWithToggle.ALWAYS}, 
-				 {DebugPreferencesMessages.LaunchingPreferencePage_4, MessageDialogWithToggle.NEVER},
-				 {DebugPreferencesMessages.LaunchingPreferencePage_5, MessageDialogWithToggle.PROMPT}}, 
+				 {DebugPreferencesMessages.LaunchingPreferencePage_4, MessageDialogWithToggle.NEVER}}, 
 				 comp,
 				 true);
 		fFieldEditors.add(edit);
@@ -181,7 +180,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement
 		createTypeFiltering(group);
 		
 		//migration
-		group = createGroupComposite(comp, DebugPreferencesMessages.LaunchingPreferencePage_35);
+		group = SWTFactory.createGroup(comp, DebugPreferencesMessages.LaunchingPreferencePage_35, 1, 1, GridData.FILL_HORIZONTAL);
 		Label label = new Label(group, SWT.LEFT | SWT.WRAP);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.widthHint = 350;
@@ -255,25 +254,6 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement
 	}
 	
 	/**
-	 * Creates a standard grouping for this pref page
-	 * @param parent the parent to add the group to
-	 * @param title text the test for the group
-	 * @return the new group
-	 * @since 3.2
-	 */
-	private Group createGroupComposite(Composite parent, String text) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setLayout(new GridLayout());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalIndent = 0;
-		gd.verticalIndent = 0;
-		group.setLayoutData(gd);
-		group.setText(text);
-		group.setFont(parent.getFont());
-		return group;
-	}
-	
-	/**
 	 * returns the launch configuration types
 	 * @return the launch configuration types
 	 */