Attachment 56736 Details for Bug 74480 – work in progress 3

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] work in progress 3

74480_3.patch (text/plain), 97.38 KB, created by Michael Rennie

on 2007-01-10 17:54:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2007-01-10 17:54:16 EST

Size: 97.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ant.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ant.ui/plugin.xml,v
>retrieving revision 1.139
>diff -u -r1.139 plugin.xml
>--- plugin.xml	28 Mar 2006 23:46:41 -0000	1.139
>+++ plugin.xml	10 Jan 2007 22:37:59 -0000
>@@ -459,6 +459,9 @@
> 	 mode="debug"
> 	 label="%AntLaunchShortcut.label"/>
> 		 </contextualLaunch>
>+ <configurationType
>+ id="org.eclipse.ant.AntLaunchConfigurationType">
>+ </configurationType>
> </shortcut>
> <shortcut
> label="%AntLaunchShortcutWithDialog.label"
>@@ -487,6 +490,9 @@
> 	 mode="debug"
> 	 label="%AntLaunchShortcutWithDialog.label"/>
> 		 </contextualLaunch>
>+ <configurationType
>+ id="org.eclipse.ant.AntBuilderLaunchConfigurationType">
>+ </configurationType>
> </shortcut>
> </extension>
> 
>@@ -805,4 +811,4 @@
> </renameParticipant>
> </extension>
> 
>-</plugin>
>\ No newline at end of file
>+</plugin>
>#P org.eclipse.jdt.doc.user
>Index: contexts_Debugger.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.doc.user/contexts_Debugger.xml,v
>retrieving revision 1.94
>diff -u -r1.94 contexts_Debugger.xml
>--- contexts_Debugger.xml	7 Dec 2006 18:33:45 -0000	1.94
>+++ contexts_Debugger.xml	10 Jan 2007 22:38:02 -0000
>@@ -5,7 +5,7 @@
> 	Copyright (c) IBM Corporation and others 2000, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.
> 	
> 	All Platform Debug contexts, those for org.eclipse.debug.ui, are located in this file
>-	All contexts are gouped by their relation, with all relations grouped alphabetically.
>+	All contexts are grouped by their relation, with all relations grouped alphabetically.
> -->
> 
> 	<context id="find_element_context">
> 		<description>This command finds an element by name.</description>
>@@ -867,6 +867,11 @@
> 		<topic label="Debug Preferences" href="reference/preferences/ref-debug.htm"/>
> 		<topic label="Debugger Concepts" href="concepts/cdebugger.htm"/>
> 	</context>
>+	<context id="contextual_launch_preference_page">
>+		<description>This page allows you to change settings that apply to contextual launching</description>
>+		<topic label="Debug Preferences" href="reference/preferences/ref-debug.htm"/>
>+		<topic label="Debugger Concepts" href="concepts/cdebugger.htm"/>
>+	</context>
> 	
> 
>+ <objectContribution
>+ id="org.eclipse.debug.ui.contextlaunch.runas"
>+ objectClass="org.eclipse.core.runtime.IAdaptable">
>+ <action
>+ class="org.eclipse.debug.internal.ui.actions.RunContextLaunchingAction"
>+ enablesFor="1"
>+ icon="icons/full/etool16/run_exc.gif"
>+ id="org.eclipse.debug.ui.contextlaunch.runas"
>+ label="%ContextLaunchingRunMenu.name"
>+ menubarPath="additions"
>+ tooltip="%ContextLaunchingRunMenu.tooltip">
>+ </action>
>+ <enablement>
>+ <and>
>+ 	<test property="org.eclipse.debug.ui.contextlaunch" />
>+ 	<test property="org.eclipse.debug.ui.resource" />
>+ 	<test property="org.eclipse.debug.ui.launchable" value="run"/>
>+ </and>
>+ </enablement> 
>+ </objectContribution>
> <viewerContribution
> targetID="org.eclipse.debug.ui.ProcessConsoleType.#ContextMenu"
> id="org.eclipse.debug.ui.processConsoleContextMenu">
>@@ -1394,6 +1478,23 @@
> </or>
> </enabledWhen>
> </page>
>+ <page
>+ class="org.eclipse.debug.internal.ui.preferences.DefaultLaunchConfigurationsPropertiesPage"
>+ id="org.eclipse.debug.ui.properties.defaultLaunchConfigurations"
>+ name="%DefaultLaunchConfigurationsPropPage.name"
>+ >
>+ <enabledWhen>
>+ <and>
>+ <adapt
>+ type="org.eclipse.core.resources.IResource">
>+ </adapt>
>+ <test property="org.eclipse.debug.ui.contextlaunch" />
>+ <test
>+ property="org.eclipse.debug.ui.resource">
>+ </test>
>+ </and>
>+ </enabledWhen>
>+ </page>
> </extension>
> 
> <extension
>@@ -2235,6 +2343,10 @@
> id="org.eclipse.debug.ui.launchDelegatesKeywords"
> label="%preferenceKeywords.launchDelegates">
> </keyword>
>+ <keyword
>+ id="org.eclipse.debug.ui.contextLaunching"
>+ label="%preferenceKeywords.contextLaunching">
>+ </keyword>
> </extension>
> <extension
> point="org.eclipse.ui.importWizards">
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/plugin.properties,v
>retrieving revision 1.224
>diff -u -r1.224 plugin.properties
>--- plugin.properties	9 Jan 2007 18:18:11 -0000	1.224
>+++ plugin.properties	10 Jan 2007 22:38:03 -0000
>@@ -27,6 +27,19 @@
> BreakpointOrganizersName=Breakpoint Organizers
> VariableValueEditorsName=Variable Value Editors
> 
>+ContextLaunchingRunMenu.name=&Run
>+ContextLaunchingRunMenu.tooltip=Run the selected item
>+
>+ContextLaunchingDebugMenu.name=&Debug
>+ContextLaunchingDebugMenu.tooltip=Debug the selected item
>+
>+ContextLaunchingProfileMenu.name=&Profile
>+ContextLaunchingProfileMenu.tooltip=Profile the selected item
>+
>+ContextualLaunchingPrefPage.name=Contextual Launching
>+
>+DefaultLaunchConfigurationsPropPage.name=Default Launch Configurations
>+
> BreakpointActionSet.label=Breakpoints
> CollapseAll.label=Collapse All
> CollapseAll.tooltip= Collapse All
>@@ -328,6 +341,7 @@
> preferenceKeywords.viewManagement=views
> preferenceKeywords.perspective=perspectives switching assign automatic run debug
> preferenceKeywords.launchConfigurations=filters launch migration configurations run debug
>+preferenceKeywords.contextLaunching=run debug profile launch contextual delegate configuration execute
> preferenceKeywords.launchDelegates=launch delegate duplicate run debug profile mode configuration launchers launcher modes
> 
> exportBreakpoints.label=E&xport Breakpoints...
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java,v
>retrieving revision 1.20
>diff -u -r1.20 LaunchConfigurationTabGroupExtension.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java	4 Jan 2007 15:01:14 -0000	1.20
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java	10 Jan 2007 22:38:04 -0000
>@@ -57,7 +57,7 @@
> 	 * on the given configuration element
> 	 * 
> 	 * @param element the configuration element defining the
>-	 * attribtues of this launch configuration tab extension
>+	 * attributes of this launch configuration tab extension
> 	 * @return a new launch configuration tab extension
> 	 */
> 	public LaunchConfigurationTabGroupExtension(IConfigurationElement element) {
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java,v
>retrieving revision 1.3
>diff -u -r1.3 SelectLaunchersDialog.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java	4 Dec 2006 21:57:40 -0000	1.3
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java	10 Jan 2007 22:38:04 -0000
>@@ -41,8 +41,8 @@
> import org.eclipse.swt.widgets.Text;
> 
> /**
>- * Thsi dialog is used to select a preferred launcher, and alos provides access to the 
>- * worspace defaults for preferred launchers
>+ * This dialog is used to select a preferred launcher, and alos provides access to the 
>+ * workspace defaults for preferred launchers
> * 
> * @since 3.3
> * EXPERIMENTAL
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java,v
>retrieving revision 1.80
>diff -u -r1.80 LaunchConfigurationTabGroupViewer.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java	5 Jan 2007 22:36:12 -0000	1.80
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java	10 Jan 2007 22:38:04 -0000
>@@ -360,7 +360,7 @@
> 	
> 	/**
> 	 * Creates some help text for the tab group launch types
>-	 * @param parent thep arent composite
>+	 * @param parent the parent composite
> 	 * @since 3.2
> 	 */
> 	private void createGettingStarted(Composite parent) {
>@@ -492,7 +492,14 @@
> 		ILaunchConfigurationTab[] tabs = getTabs();
> 		if (tabs != null) {
> 			// update the working copy from the active tab
>+			boolean newwc = !getWorkingCopy().isDirty();
> 			getActiveTab().performApply(getWorkingCopy());
>+			if(getOriginal() instanceof ILaunchConfigurationWorkingCopy && newwc) {
>+				try {
>+					getWorkingCopy().doSave();
>+				} 
>+				catch (CoreException e) {DebugUIPlugin.log(e);}
>+			}
> 			updateButtons();
> 			// update error ticks
> 			CTabItem item = null;
>@@ -948,6 +955,9 @@
> 		if (workingCopy == null) {
> 			return false;
> 		}
>+		if(workingCopy.getParent() != null) {
>+			return !workingCopy.getParent().contentsEqual(workingCopy);
>+		}
> 		// Working copy hasn't been saved
> 		if (workingCopy.getOriginal() == null) {
> 			return true;
>@@ -1354,8 +1364,8 @@
> 		try {
> 			if(fTabGroup != null) {
> 				fTabGroup.initializeFrom(fOriginal);
>-				fWorkingCopy = fOriginal.getWorkingCopy();
> 				fNameWidget.setText(fOriginal.getName());
>+				fWorkingCopy = fOriginal.getWorkingCopy();
> 				refreshStatus();
> 			}
> 		} 
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java,v
>retrieving revision 1.193
>diff -u -r1.193 LaunchConfigurationsDialog.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java	5 Jan 2007 16:27:23 -0000	1.193
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java	10 Jan 2007 22:38:04 -0000
>@@ -851,7 +851,10 @@
> 	 * @return the shell title
> 	 */
> 	protected String getShellTitle() {
>-		String title = DebugUIPlugin.removeAccelerators(getLaunchGroup().getLabel());
>+		String title = null;
>+		if(getLaunchGroup() != null) {
>+			 title = DebugUIPlugin.removeAccelerators(getLaunchGroup().getLabel());
>+		}
> 		if (title == null) {
> 			title = LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Configurations_18; 
> 		}
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java,v
>retrieving revision 1.31
>diff -u -r1.31 LaunchShortcutExtension.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java	3 Jan 2007 20:04:29 -0000	1.31
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java	10 Jan 2007 22:38:04 -0000
>@@ -257,7 +257,7 @@
> 	 * expression tree is malformed.
> 	 */
> 	public Expression getContextualLaunchEnablementExpression() throws CoreException {
>-		// all of this stuff is optional, so...tedius testing is required
>+		// all of this stuff is optional, so...tedious testing is required
> 		if (fContextualLaunchExpr == null) {
> 			IConfigurationElement contextualLaunchElement = getContextualLaunchConfigurationElement();
> 			if (contextualLaunchElement == null) {
>@@ -284,7 +284,7 @@
> 	 * expression tree is malformed.
> 	 */
> 	public Expression getShortcutEnablementExpression() throws CoreException {
>-		// all of this stuff is optional, so...tedius testing is required
>+		// all of this stuff is optional, so...tedious testing is required
> 		if (fStandardLaunchExpr == null) {
> 			IConfigurationElement[] elements = getConfigurationElement().getChildren(ExpressionTagNames.ENABLEMENT);
> 			IConfigurationElement enablement = elements.length > 0 ? elements[0] : null; 
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java,v
>retrieving revision 1.76
>diff -u -r1.76 LaunchConfigurationManager.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java	3 Jan 2007 22:37:57 -0000	1.76
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java	10 Jan 2007 22:38:04 -0000
>@@ -32,6 +32,8 @@
> import javax.xml.parsers.ParserConfigurationException;
> import javax.xml.transform.TransformerException;
> 
>+import org.eclipse.core.expressions.EvaluationContext;
>+import org.eclipse.core.expressions.IEvaluationContext;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.ISaveContext;
>@@ -56,6 +58,7 @@
> import org.eclipse.debug.core.ILaunchManager;
> import org.eclipse.debug.core.ILaunchMode;
> import org.eclipse.debug.internal.core.IConfigurationElementConstants;
>+import org.eclipse.debug.internal.core.LaunchManager;
> import org.eclipse.debug.internal.ui.DebugPluginImages;
> import org.eclipse.debug.internal.ui.DebugUIPlugin;
> import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
>@@ -594,11 +597,48 @@
> 		}
> 		return fLaunchShortcuts;
> 	}
>+
>+	/**
>+	 * Returns a listing of all of the <code>ILaunchConfigurationType</code>s that apply to the currently
>+	 * specified <code>IResource</code>.
>+	 * 
>+	 * @param resource the resource context
>+	 * @return a listing of applicable <code>ILaunchConfigurationType</code>s, or an empty list, never <code>null</code>
>+	 * @since 3.3
>+	 */
>+	public List getApplicableConfigurationTypes(IResource resource) {
>+		List types = new ArrayList();
>+		try {
>+			List exts = getLaunchShortcuts();
>+			LaunchShortcutExtension ext = null;
>+			List list = new ArrayList();
>+			list.add(resource);
>+			IEvaluationContext context = new EvaluationContext(null, list);
>+			context.addVariable("selection", list); //$NON-NLS-1$
>+			HashSet set = new HashSet();
>+			for(Iterator iter = exts.iterator(); iter.hasNext();) {
>+				ext = (LaunchShortcutExtension) iter.next();
>+				if(ext.evalEnablementExpression(context, ext.getContextualLaunchEnablementExpression())) {
>+					set.addAll(ext.getAssociatedConfigurationTypes());
>+				}
>+			}
>+			LaunchManager lm = (LaunchManager) DebugPlugin.getDefault().getLaunchManager();
>+			ILaunchConfigurationType type = null;
>+			for(Iterator iter = set.iterator(); iter.hasNext();) {
>+				type = lm.getLaunchConfigurationType((String)iter.next());
>+				if(type != null && !"org.eclipse.ui.externaltools".equals(type.getCategory()) && !types.contains(type)) { //$NON-NLS-1$
>+					types.add(type);
>+				}
>+			}
>+		}
>+		catch(CoreException ce) {DebugUIPlugin.log(ce);}
>+		return types;
>+	}
> 	
> 	/**
> 	 * Returns a listing of all applicable <code>LaunchShortcutExtension</code>s for the given
> 	 * launch configuration type id.
>-	 * @param typeid the id of the launch configuraiton
>+	 * @param typeid the id of the launch configuration
> 	 * @return a listing of <code>LaunchShortcutExtension</code>s that are associated with the specified launch configuration
> 	 * type id or an empty list, never <code>null</code>
> 	 * 
>Index: ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties,v
>retrieving revision 1.97
>diff -u -r1.97 DebugPreferencesMessages.properties
>--- ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties	5 Jan 2007 15:34:10 -0000	1.97
>+++ ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties	10 Jan 2007 22:38:04 -0000
>@@ -16,6 +16,8 @@
> ConsolePreferencePage_Standard_In__4=Standard &In text color:
> ConsolePreferencePage_Standard_Out__2=Standard &Out text color:
> ConsolePreferencePage_Wrap_text_1=Fixed &width console
>+ContextualLaunchPreferencePage_0=This page is used to edit contextual launching options (EXPERIMENTAL).
>+ContextualLaunchPreferencePage_1=&Enable contextual launching.
> ConsolePreferencePage_Console_width=&Maximum character width:
> ConsolePreferencePage_Limit_console_output_1=&Limit console output
> ConsolePreferencePage_Console_buffer_size__characters___2=Console &buffer size (characters):
>@@ -127,3 +129,16 @@
> LaunchDelegatesPreferencePage_4=Launcher Description
> LaunchPerspectivePreferencePage_0=There is no perspective information available to change.
> LaunchPerspectivePreferencePage_1=The selected types/launchers do not have any common mode sets.
>+DefaultLaunchConfigurationsPropertiesPage_0=This page allows you to select a default way to launch the currently selected resource.
>+DefaultLaunchConfigurationsPropertiesPage_1=&Select default configuration for {0}:
>+DefaultLaunchConfigurationsPropertiesPage_2=&New...
>+DefaultLaunchConfigurationsPropertiesPage_3=Create new launch configuration
>+DefaultLaunchConfigurationsPropertiesPage_4=Du&plicate
>+DefaultLaunchConfigurationsPropertiesPage_5=Duplicate selected launch configuration
>+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:
>Index: ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java,v
>retrieving revision 1.25
>diff -u -r1.25 DebugPreferencesMessages.java
>--- ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java	20 Dec 2006 20:00:05 -0000	1.25
>+++ ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java	10 Jan 2007 22:38:04 -0000
>@@ -32,6 +32,10 @@
> 	public static String ConsolePreferencePage_12;
> 	public static String ConsolePreferencePage_13;
> 
>+	public static String ContextualLaunchPreferencePage_0;
>+
>+	public static String ContextualLaunchPreferencePage_1;
>+
> 	public static String DebugPreferencePage_1;
> 	public static String DebugPreferencePage_2;
> 
>@@ -51,6 +55,32 @@
> 	public static String DebugPreferencePage_26;
> 	public static String DebugPreferencePage_27;
> 
>+	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;
> 
> 	public static String LaunchDelegatesPreferencePage_1;
>Index: schema/launchShortcuts.exsd
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/schema/launchShortcuts.exsd,v
>retrieving revision 1.24
>diff -u -r1.24 launchShortcuts.exsd
>--- schema/launchShortcuts.exsd	3 Jan 2007 20:04:29 -0000	1.24
>+++ schema/launchShortcuts.exsd	10 Jan 2007 22:38:04 -0000
>@@ -246,7 +246,7 @@
> id=&quot;org.eclipse.jdt.launching.localJavaApplication&quot;&gt;
> &lt;/configurationType&gt;
> &lt;/shortcut&gt;
>-&lt;extension&gt;
>+&lt;/extension&gt;
> &lt;/pre&gt;
> &lt;/p&gt;
> &lt;p&gt;
>Index: ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java,v
>retrieving revision 1.13
>diff -u -r1.13 AbstractLaunchToolbarAction.java
>--- ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java	8 Apr 2005 16:08:20 -0000	1.13
>+++ ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java	10 Jan 2007 22:38:04 -0000
>@@ -13,6 +13,8 @@
> 
> import org.eclipse.debug.core.ILaunchConfiguration;
> import org.eclipse.debug.internal.ui.DebugUIPlugin;
>+import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
>+import org.eclipse.debug.internal.ui.launchConfigurations.ContextLaunchingAction;
> import org.eclipse.debug.internal.ui.launchConfigurations.OrganizeFavoritesAction;
> import org.eclipse.debug.ui.DebugUITools;
> import org.eclipse.jface.action.IAction;
>@@ -54,8 +56,12 @@
> 		if (menu.getItemCount() > 0) {
> 			addSeparator(menu);
> 		}
>-
>-		addToMenu(menu, new LaunchShortcutsAction(getLaunchGroupIdentifier()), -1);
>+		if(DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH)) {
>+			addToMenu(menu, new ContextLaunchingAction(getLaunchGroupIdentifier()), -1);
>+		}
>+		else {
>+			addToMenu(menu, new LaunchShortcutsAction(getLaunchGroupIdentifier()), -1);
>+		}
> 		addToMenu(menu, getOpenDialogAction(), -1);
> 		addToMenu(menu, new OrganizeFavoritesAction(getLaunchGroupIdentifier()), -1);
> 	}
>Index: ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java,v
>retrieving revision 1.20
>diff -u -r1.20 ContextualLaunchAction.java
>--- ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java	30 Aug 2006 15:46:13 -0000	1.20
>+++ ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java	10 Jan 2007 22:38:04 -0000
>@@ -53,7 +53,7 @@
> * An action delegate that builds a context menu with applicable launch shortcuts
> * for a specific launch mode.
> * 
>- * This class can be subclassed and contributed as an object contribution pop-up
>+ * This class can be sub-classed and contributed as an object contribution pop-up
> * menu extension action. When invoked, it becomes a sub-menu that dynamically
> * builds a list of applicable launch shortcuts for the current selection.
> * Each launch shortcut may have optional information to support a context menu action.
>@@ -171,7 +171,7 @@
> 	/**
> 	 * This method is used to determine if the selected object is in fact a shared launch
> 	 * configuration that can be launched
>-	 * @return true if the item is a shared ocnfig , false otherwise
>+	 * @return true if the item is a shared config , false otherwise
> 	 * @since 3.3
> 	 */
> 	private boolean isSharedConfig(Object receiver) {
>Index: ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java,v
>retrieving revision 1.13
>diff -u -r1.13 OpenLaunchDialogAction.java
>--- ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java	24 Feb 2005 06:43:48 -0000	1.13
>+++ ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java	10 Jan 2007 22:38:04 -0000
>@@ -16,6 +16,8 @@
> import org.eclipse.debug.core.ILaunchConfigurationType;
> 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.actions.ActionMessages;
> import org.eclipse.debug.internal.ui.launchConfigurations.LaunchGroupExtension;
> import org.eclipse.debug.internal.ui.launchConfigurations.LaunchHistory;
> import org.eclipse.debug.ui.DebugUITools;
>@@ -59,8 +61,13 @@
> 		fIdentifier = identifier;
> 		LaunchGroupExtension extension = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(identifier);
> 		if (extension != null) {
>-			setText(extension.getLabel() + "..."); //$NON-NLS-1$
>-			setImageDescriptor(extension.getImageDescriptor());
>+			if(DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH)) {
>+				setText(ActionMessages.OpenLaunchDialogAction_0);
>+			}
>+			else {
>+				setText(extension.getLabel() + "..."); //$NON-NLS-1$
>+				setImageDescriptor(extension.getImageDescriptor());
>+			}
> 		}
> 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.OPEN_LAUNCH_CONFIGURATION_ACTION);
> 	}
>Index: ui/org/eclipse/debug/internal/ui/preferences/ContextLaunchingPropertyTester.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/preferences/ContextLaunchingPropertyTester.java
>diff -N ui/org/eclipse/debug/internal/ui/preferences/ContextLaunchingPropertyTester.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/preferences/ContextLaunchingPropertyTester.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,34 @@
>+/*******************************************************************************
>+ * 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.preferences;
>+
>+import org.eclipse.core.expressions.PropertyTester;
>+import org.eclipse.debug.internal.ui.DebugUIPlugin;
>+import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
>+
>+/**
>+ * Tests properties for enabling/disabling popup menu object contributions
>+ * @since 3.3
>+ * 
>+ * EXPERIMENTAL
>+ */
>+public class ContextLaunchingPropertyTester extends PropertyTester {
>+
>+	/**
>+	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
>+	 */
>+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
>+		if("contextlaunch".equals(property)) { //$NON-NLS-1$
>+			return DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH);
>+		}
>+		return false;
>+	}
>+}
>Index: ui/org/eclipse/debug/internal/ui/preferences/ContextLaunchingPreferencePage.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/preferences/ContextLaunchingPreferencePage.java
>diff -N ui/org/eclipse/debug/internal/ui/preferences/ContextLaunchingPreferencePage.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/preferences/ContextLaunchingPreferencePage.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,104 @@
>+/*******************************************************************************
>+ * 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.preferences;
>+
>+import java.util.ArrayList;
>+import java.util.List;
>+
>+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.SWTUtil;
>+import org.eclipse.jface.preference.BooleanFieldEditor;
>+import org.eclipse.jface.preference.FieldEditor;
>+import org.eclipse.jface.preference.PreferencePage;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.ui.IWorkbench;
>+import org.eclipse.ui.IWorkbenchPreferencePage;
>+import org.eclipse.ui.PlatformUI;
>+
>+/**
>+ * A preference page for configuring launching preferences.
>+ * 
>+ * @since 3.3
>+ */
>+public class ContextLaunchingPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
>+	
>+	/**
>+	 * a list of the field editors
>+	 */
>+	private List fFieldEditors;
>+	
>+	/**
>+	 * The default constructor
>+	 */
>+	public ContextLaunchingPreferencePage() {
>+		super();
>+		setPreferenceStore(DebugUIPlugin.getDefault().getPreferenceStore());
>+	}
>+	
>+	/**
>+	 * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite)
>+	 */
>+	public void createControl(Composite parent) {
>+		super.createControl(parent);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.CONTEXTUAL_LAUNCHING_PREFERENCE_PAGE);
>+	}
>+	
>+	/**
>+	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
>+	 */
>+	protected Control createContents(Composite parent) {
>+		fFieldEditors = new ArrayList();
>+		Composite comp = SWTUtil.createComposite(parent, 1, 1, GridData.FILL_BOTH);
>+		
>+		SWTUtil.createWrapLabel(comp, DebugPreferencesMessages.ContextualLaunchPreferencePage_0, 1, 300);
>+		SWTUtil.createVerticalSpacer(comp, 2);
>+		//use contextual launch
>+		FieldEditor edit = new BooleanFieldEditor(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH, DebugPreferencesMessages.ContextualLaunchPreferencePage_1, comp);	
>+		fFieldEditors.add(edit);
>+			
>+		//init the field editors
>+		FieldEditor editor;
>+		for(int i = 0; i < fFieldEditors.size(); i++) {
>+			editor = (FieldEditor)fFieldEditors.get(i);
>+			editor.setPreferenceStore(getPreferenceStore());
>+			editor.load();
>+		}
>+		return comp;
>+	}
>+	
>+	/**
>+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
>+	 */
>+	public void init(IWorkbench workbench) {}
>+	
>+	/**
>+	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
>+	 */
>+	protected void performDefaults() {
>+		for(int i = 0; i < fFieldEditors.size(); i++) {
>+			((FieldEditor)fFieldEditors.get(i)).loadDefault();
>+		}
>+	}
>+	
>+	/**
>+	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
>+	 */
>+	public boolean performOk() {
>+		for(int i = 0; i < fFieldEditors.size(); i++) {
>+			((FieldEditor)fFieldEditors.get(i)).store();
>+		}
>+		return super.performOk();
>+	}
>+}
>Index: ui/org/eclipse/debug/internal/ui/actions/ContextLaunchingAction.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/actions/ContextLaunchingAction.java
>diff -N ui/org/eclipse/debug/internal/ui/actions/ContextLaunchingAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/actions/ContextLaunchingAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,142 @@
>+/*******************************************************************************
>+ * 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.actions;
>+
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IAdaptable;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Status;
>+import org.eclipse.debug.core.DebugPlugin;
>+import org.eclipse.debug.core.ILaunchConfiguration;
>+import org.eclipse.debug.internal.core.LaunchManager;
>+import org.eclipse.debug.internal.ui.DebugUIPlugin;
>+import org.eclipse.debug.ui.DebugUITools;
>+import org.eclipse.jface.action.IAction;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.swt.widgets.Event;
>+import org.eclipse.ui.IActionDelegate2;
>+
>+/**
>+ * A universal context launching action for popup menus. 
>+ * This action gets its immediate context from what was right-clicked
>+ * on to present the action.
>+ * 
>+ * @see {@link IActionDelegate2}
>+ * @see {@link org.eclipse.debug.core.ILaunchManager}
>+ * 
>+ * @since 3.3
>+ * EXPERIMENTAL
>+ */
>+public class ContextLaunchingAction implements IActionDelegate2 {
>+
>+	/**
>+	 * The currently selected context that was right clicked on
>+	 */
>+	private IStructuredSelection fCurrentSelection = null;
>+	/**
>+	 * the mode the action is created on
>+	 */
>+	private String fMode = null;
>+	
>+	/**
>+	 * Constructor
>+	 * @param mode
>+	 */
>+	public ContextLaunchingAction(String mode) {
>+		fMode = mode;
>+	}
>+
>+	/**
>+	 * @see org.eclipse.ui.IActionDelegate2#dispose()
>+	 */
>+	public void dispose() {
>+		fCurrentSelection = null;
>+	}
>+
>+	/**
>+	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
>+	 */
>+	public void init(IAction action) {}
>+
>+	/**
>+	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
>+	 */
>+	public void runWithEvent(IAction action, Event event) {
>+		if(fCurrentSelection != null && !fCurrentSelection.isEmpty()) {
>+			try {
>+				Object o = fCurrentSelection.getFirstElement();
>+				if(o instanceof IAdaptable) {
>+					IAdaptable adapt = (IAdaptable) o;
>+					IResource resource = (IResource) adapt.getAdapter(IResource.class);
>+					if(resource != null) {
>+						ILaunchConfiguration config = getLaunchManager().getDefaultConfiguration(resource);
>+						if(config != null) {
>+							if(config.exists()) {
>+								DebugUITools.launch(config, fMode);
>+							}
>+							else {
>+								//might have been moved or shared since last invocation
>+							}
>+						}
>+						else {
>+							DebugUITools.openLaunchConfigurationDialog(DebugUIPlugin.getShell(), null, fMode);
>+						}
>+					}
>+					else {
>+						report("The selected context is not launchable");
>+					}
>+				}
>+				else {
>+					report("The selected context is not launchable");
>+				}
>+			}
>+			catch (CoreException ce) {DebugUIPlugin.log(ce);}
>+		}
>+		else {
>+			report("There is no selected context to launch with");
>+		}
>+	}
>+
>+	/**
>+	 * Reports an error status to the log with the specified message
>+	 * @param message the message to put in the error status
>+	 */
>+	protected void report(String message) {
>+		DebugUIPlugin.log(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), message));
>+	}
>+	
>+	/**
>+	 * Returns the launch manager
>+	 * @return the launch manager
>+	 */
>+	protected LaunchManager getLaunchManager() {
>+		return (LaunchManager) DebugPlugin.getDefault().getLaunchManager();
>+	}
>+	
>+	/**
>+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
>+	 */
>+	public void run(IAction action) {
>+		//not called
>+	}
>+
>+	/**
>+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
>+	 */
>+	public void selectionChanged(IAction action, ISelection selection) {
>+		if(!selection.isEmpty()) {
>+			fCurrentSelection = (IStructuredSelection) selection;
>+		}
>+	}
>+
>+}
>Index: ui/org/eclipse/debug/internal/ui/actions/ProfileContextLaunchingAction.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/actions/ProfileContextLaunchingAction.java
>diff -N ui/org/eclipse/debug/internal/ui/actions/ProfileContextLaunchingAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/actions/ProfileContextLaunchingAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,33 @@
>+/*******************************************************************************
>+ * 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.actions;
>+
>+import org.eclipse.debug.core.ILaunchManager;
>+
>+/**
>+ * Specialization of <code>ContextLaunchingAction</code> for profile mode
>+ * 
>+ * @see {@link ContextLaunchingAction}
>+ * @see {@link ILaunchManager}
>+ * 
>+ * @since 3.3
>+ * EXPERIMENTAL
>+ */
>+public class ProfileContextLaunchingAction extends ContextLaunchingAction {
>+
>+	/**
>+	 * Constructor
>+	 */
>+	public ProfileContextLaunchingAction() {
>+		super(ILaunchManager.PROFILE_MODE);
>+	}
>+
>+}
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/ContextLaunchingAction.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/launchConfigurations/ContextLaunchingAction.java
>diff -N ui/org/eclipse/debug/internal/ui/launchConfigurations/ContextLaunchingAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/ContextLaunchingAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,64 @@
>+/*******************************************************************************
>+ * 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 org.eclipse.debug.internal.ui.DebugUIPlugin;
>+import org.eclipse.jface.action.Action;
>+import org.eclipse.jface.action.IAction;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.ui.IWorkbenchWindow;
>+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
>+
>+/**
>+ * A wrapper class for a context launching toolbar action
>+ * 
>+ * @since 3.3
>+ * EXPERIMENTAL
>+ */
>+public class ContextLaunchingAction extends Action implements IWorkbenchWindowActionDelegate {
>+
>+	private String fId = null;
>+	
>+	/**
>+	 * Constructor
>+	 * @param id
>+	 */
>+	public ContextLaunchingAction(String id) {
>+		fId = id;
>+		LaunchGroupExtension extension = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(id);
>+		if (extension != null) {
>+			setText(extension.getLabel());
>+			setImageDescriptor(extension.getImageDescriptor());
>+		}
>+	}
>+
>+	/**
>+	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
>+	 */
>+	public void dispose() {
>+		fId = null;
>+	}
>+
>+	/**
>+	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
>+	 */
>+	public void init(IWorkbenchWindow window) {}
>+
>+	/**
>+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
>+	 */
>+	public void run(IAction action) {}
>+
>+	/**
>+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
>+	 */
>+	public void selectionChanged(IAction action, ISelection selection) {}
>+}
>Index: ui/org/eclipse/debug/internal/ui/preferences/DefaultLaunchConfigurationsPropertiesPage.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/preferences/DefaultLaunchConfigurationsPropertiesPage.java
>diff -N ui/org/eclipse/debug/internal/ui/preferences/DefaultLaunchConfigurationsPropertiesPage.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/preferences/DefaultLaunchConfigurationsPropertiesPage.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,443 @@
>+/*******************************************************************************
>+ * 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.preferences;
>+
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.Comparator;
>+import java.util.HashSet;
>+import java.util.Iterator;
>+import java.util.List;
>+import java.util.Set;
>+
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IAdaptable;
>+import org.eclipse.debug.core.DebugPlugin;
>+import org.eclipse.debug.core.ILaunchConfiguration;
>+import org.eclipse.debug.core.ILaunchConfigurationType;
>+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
>+import org.eclipse.debug.internal.core.LaunchManager;
>+import org.eclipse.debug.internal.ui.DebugUIPlugin;
>+import org.eclipse.debug.internal.ui.DefaultLabelProvider;
>+import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
>+import org.eclipse.debug.internal.ui.SWTUtil;
>+import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationComparator;
>+import org.eclipse.debug.ui.DebugUITools;
>+import org.eclipse.debug.ui.IDebugUIConstants;
>+import org.eclipse.jface.viewers.ArrayContentProvider;
>+import org.eclipse.jface.viewers.CheckStateChangedEvent;
>+import org.eclipse.jface.viewers.CheckboxTableViewer;
>+import org.eclipse.jface.viewers.ICheckStateListener;
>+import org.eclipse.jface.viewers.ISelectionChangedListener;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.viewers.SelectionChangedEvent;
>+import org.eclipse.jface.viewers.StructuredSelection;
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+import org.eclipse.jface.window.Window;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.SelectionListener;
>+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.Table;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.dialogs.ListDialog;
>+import org.eclipse.ui.dialogs.PropertyPage;
>+
>+import com.ibm.icu.text.MessageFormat;
>+
>+/**
>+ * Displays default launch configuration settings for a selected resource - associated launch configurations.
>+ * 
>+ * @see {@link PropertyPage}
>+ * @see {@link ILaunchConfiguration}
>+ * @see {@link org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog}
>+ * @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}
>+ * 
>+ * @since 3.3
>+ */
>+public class DefaultLaunchConfigurationsPropertiesPage extends PropertyPage {
>+	
>+	/**
>+	 * Provides a viewer filter for the tree 
>+	 */
>+	class DefaultConfigFilter extends ViewerFilter {
>+
>+		/* (non-Javadoc)
>+		 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
>+		 */
>+		public boolean select(Viewer viewer, Object parentElement, Object element) {
>+			boolean select = true;
>+			if (element instanceof ILaunchConfiguration) {
>+				try {
>+					ILaunchConfiguration configuration = (ILaunchConfiguration) element;
>+					select &= configuration.getType().getCategory() == null;
>+					select &= !DebugUITools.isPrivate(configuration);
>+					if (!configuration.isLocal()) {
>+						select &= getResource().getProject().equals(configuration.getFile().getProject());
>+					}
>+				} 
>+				catch (CoreException e) {return false;}
>+			}
>+			return select;
>+		}
>+
>+	}
>+	
>+	/**
>+	 * Set of configurations to be deleted
>+	 */
>+	private Set fDeletedConfigurations = new HashSet();
>+	
>+	/**
>+	 * Set of original default candidates for the resource
>+	 */
>+	private Set fOriginalCandidates;
>+	
>+	//widgets
>+	private CheckboxTableViewer fViewer;
>+	private Button fNewButton = null;
>+	private Button fEditButton = null;
>+	private Button fDuplicateButton = null;
>+	private Button fDeleteButton = null;
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
>+	 */
>+	protected Control createContents(Composite parent) {
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugHelpContextIds.DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE);
>+		
>+		Composite topComposite = SWTUtil.createComposite(parent, 2, 1, GridData.FILL_BOTH);
>+		
>+		SWTUtil.createWrapLabel(topComposite, DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_0, 2, 300);
>+		SWTUtil.createVerticalSpacer(topComposite, 2);
>+		SWTUtil.createWrapLabel(topComposite, MessageFormat.format(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_1, new String[]{getResource().getName()}), 2, 300);
>+		
>+		fViewer = createViewer(topComposite);
>+		
>+		Composite buttonComp = SWTUtil.createComposite(topComposite, 1, 1, GridData.FILL_VERTICAL);
>+		GridLayout layout = (GridLayout) buttonComp.getLayout();
>+		layout.marginHeight = 0;
>+		fNewButton = SWTUtil.createPushButton(buttonComp, DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_2, null);
>+		fNewButton.setToolTipText(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_3);
>+		fNewButton.addSelectionListener(new SelectionListener() {
>+			public void widgetDefaultSelected(SelectionEvent e) {}
>+			public void widgetSelected(SelectionEvent e) {
>+				handleNew();
>+			}
>+		});
>+		
>+		fDuplicateButton = SWTUtil.createPushButton(buttonComp, DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_4, null);
>+		fDuplicateButton.setToolTipText(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_5);
>+		fDuplicateButton.setEnabled(false);
>+		fDuplicateButton.addSelectionListener(new SelectionListener() {
>+			public void widgetDefaultSelected(SelectionEvent e) {}
>+			public void widgetSelected(SelectionEvent e) {
>+				handleCopy();
>+			}
>+		});
>+		fEditButton = SWTUtil.createPushButton(buttonComp, DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_6, null);
>+		fEditButton.setToolTipText(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_7);
>+		fEditButton.setEnabled(false);
>+		fEditButton.addSelectionListener(new SelectionListener() {
>+			public void widgetDefaultSelected(SelectionEvent e) {}
>+			public void widgetSelected(SelectionEvent e) {
>+				handleEdit();
>+			}
>+		});
>+		fDeleteButton = SWTUtil.createPushButton(buttonComp, DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_8, null);
>+		fDeleteButton.setToolTipText(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_9);
>+		fDeleteButton.setEnabled(false);
>+		fDeleteButton.addSelectionListener(new SelectionListener() {
>+			public void widgetDefaultSelected(SelectionEvent e) {}
>+			public void widgetSelected(SelectionEvent e) {
>+				handleDelete();
>+			}
>+		});
>+		
>+		fViewer.setSelection(new StructuredSelection());
>+		applyDialogFont(topComposite);
>+		return topComposite;
>+	}
>+
>+	/**
>+	 * Creates and returns the viewer that will display the possible default configurations.
>+	 * 
>+	 * @param parent parent composite to create the viewer in
>+	 * @return viewer viewer that will display possible default configurations
>+	 */
>+	protected CheckboxTableViewer createViewer(Composite parent){
>+		CheckboxTableViewer viewer = CheckboxTableViewer.newCheckList(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER);
>+		viewer.setLabelProvider(new DefaultLabelProvider());
>+		viewer.setContentProvider(new ArrayContentProvider());
>+		viewer.setComparator(new LaunchConfigurationComparator());
>+		viewer.addCheckStateListener(new ICheckStateListener() {
>+			public void checkStateChanged(CheckStateChangedEvent event) {
>+				if (event.getChecked()) {
>+					fViewer.setCheckedElements(new Object[] {event.getElement()});
>+				}
>+				else{
>+					fViewer.setCheckedElements(new Object[] {});
>+				}
>+			}
>+		});
>+		// Only filter private configurations and external tools to avoid filtering a default
>+		viewer.addFilter(new DefaultConfigFilter());
>+		Table builderTable = viewer.getTable();
>+		GridData tableGridData = new GridData(GridData.FILL_BOTH);
>+		tableGridData.heightHint = 300;
>+		builderTable.setLayoutData(tableGridData);
>+		
>+		IResource resource = getResource();
>+		fOriginalCandidates = getLaunchManager().getDefaultCandidates(resource);
>+		viewer.setInput(fOriginalCandidates);
>+		try {
>+			ILaunchConfiguration configuration = getLaunchManager().getDefaultConfiguration(resource);
>+			if (configuration != null) {
>+				Iterator iterator = fOriginalCandidates.iterator();
>+				while (iterator.hasNext()) {
>+					ILaunchConfigurationWorkingCopy wc = (ILaunchConfigurationWorkingCopy) iterator.next();
>+					if (configuration.equals(wc.getOriginal())) {
>+						viewer.setChecked(wc, true);
>+						break;
>+					}
>+				}
>+			}
>+		} catch (CoreException e) {
>+			setErrorMessage(e.getMessage());
>+		}
>+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
>+			public void selectionChanged(SelectionChangedEvent event) {
>+				boolean empty = event.getSelection().isEmpty();
>+				fEditButton.setEnabled(!empty);
>+				fDuplicateButton.setEnabled(!empty);
>+				fDeleteButton.setEnabled(!empty);
>+			}
>+		});
>+		
>+		return viewer;
>+	}
>+
>+	/**
>+	 * Returns the viewer displaying possible default configurations.
>+	 * 
>+	 * @return viewer
>+	 */
>+	protected CheckboxTableViewer getViewer(){
>+		return fViewer;
>+	}
>+		
>+	/**
>+	 * Returns the launch manager
>+	 * @return the launch manager
>+	 */
>+	protected LaunchManager getLaunchManager() {
>+		return (LaunchManager) DebugPlugin.getDefault().getLaunchManager();
>+	}
>+	
>+	/**
>+	 * Returns the resource this property page is open on.
>+	 * 
>+	 * @return resource
>+	 */
>+	protected IResource getResource() {
>+		Object element = getElement();
>+		IResource resource = null;
>+		if (element instanceof IResource) {
>+			resource = (IResource) element;
>+		} else if (element instanceof IAdaptable) {
>+			resource = (IResource) ((IAdaptable)element).getAdapter(IResource.class);
>+		}
>+		return resource;
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
>+	 */
>+	public boolean performOk() {
>+		Object[] checked = fViewer.getCheckedElements();
>+		try {
>+			ILaunchConfiguration def = null;
>+			if (checked.length == 1) {
>+					def = (ILaunchConfiguration) checked[0];
>+					def = ((ILaunchConfigurationWorkingCopy)def).doSave();
>+			}
>+			DebugPlugin.getDefault().getLaunchManager().setDefaultConfiguration(getResource(), def);
>+		} catch (CoreException e) {
>+			setErrorMessage(e.getMessage());
>+			return false;
>+		}
>+	//delete 
>+		Iterator iter = fDeletedConfigurations.iterator();
>+		while (iter.hasNext()) {
>+			ILaunchConfigurationWorkingCopy currentConfig = (ILaunchConfigurationWorkingCopy) iter.next();
>+			try{			
>+				if (currentConfig.getOriginal() != null){
>+					currentConfig.getOriginal().delete();
>+				}
>+			} catch (CoreException e) {
>+				DebugPlugin.logMessage("Problem deleting configuration " + currentConfig.getName(), e); //$NON-NLS-1$
>+			}
>+		}
>+	//add
>+		iter = fOriginalCandidates.iterator();
>+		while (iter.hasNext()) {
>+			ILaunchConfigurationWorkingCopy currentConfig = (ILaunchConfigurationWorkingCopy) iter.next();
>+			if (currentConfig.isDirty()){
>+				try{
>+					currentConfig.doSave();
>+				} catch (CoreException e) {
>+					DebugPlugin.logMessage("Problem saving changes to configuration " + currentConfig.getName(), e); //$NON-NLS-1$
>+				}
>+			}
>+		}
>+		
>+		return super.performOk();
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
>+	 */
>+	protected void performDefaults() {
>+		fViewer.setAllChecked(false);
>+		setErrorMessage(null);
>+		setValid(true);
>+		super.performDefaults();
>+	}
>+	
>+	/**
>+	 * Returns the names of the launch configurations passed in as original input to the tree viewer
>+	 * @return the names of the original launch configurations
>+	 */
>+	private Set getConfigurationNames() {
>+		Set names = new HashSet();
>+		Iterator iter = fOriginalCandidates.iterator();
>+		Object o = null;
>+		while (iter.hasNext()) {
>+			o = iter.next();
>+			if(o instanceof ILaunchConfiguration) {
>+				names.add(((ILaunchConfiguration)o).getName());
>+			}
>+		}
>+		return names;
>+	}
>+	
>+	/**
>+	 * Returns selected configurations.
>+	 * 
>+	 * @return selected configurations
>+	 */
>+	private ILaunchConfigurationWorkingCopy[] getSelectedConfigurations() {
>+		IStructuredSelection ss = (IStructuredSelection) fViewer.getSelection();
>+		return (ILaunchConfigurationWorkingCopy[]) ss.toList().toArray(new ILaunchConfigurationWorkingCopy[ss.size()]);
>+	}
>+
>+	/**
>+	 * Copy the selection
>+	 */
>+	private void handleCopy() {
>+		ILaunchConfigurationWorkingCopy configuration = getSelectedConfigurations()[0];
>+		try {
>+			ILaunchConfigurationWorkingCopy copy = configuration.copy(
>+					((LaunchManager)DebugPlugin.getDefault().getLaunchManager()).generateUniqueLaunchConfigurationNameFrom(configuration.getName(), getConfigurationNames()));
>+			copy.setAttributes(configuration.getAttributes());
>+			fOriginalCandidates.add(copy);
>+			fViewer.refresh();
>+			fViewer.setSelection(new StructuredSelection(copy));
>+		} catch (CoreException e) {
>+			setErrorMessage(e.getMessage());
>+		}
>+	}
>+
>+	/**
>+	 * Delete the selection
>+	 */
>+	private void handleDelete() {
>+		Table table = fViewer.getTable();
>+		int[] indices = table.getSelectionIndices();
>+		Arrays.sort(indices);
>+		ILaunchConfiguration[] configurations = getSelectedConfigurations();
>+		for (int i = 0; i < configurations.length; i++) {
>+			fDeletedConfigurations.add(configurations[i]);
>+			fOriginalCandidates.remove(configurations[i]);
>+		}
>+		fViewer.refresh();
>+		if (indices[0] < table.getItemCount()) {
>+			fViewer.setSelection(new StructuredSelection(table.getItem(indices[0]).getData()));
>+		} else if (table.getItemCount() > 0) {
>+			fViewer.setSelection(new StructuredSelection(table.getItem(table.getItemCount() - 1).getData()));
>+		}
>+	}
>+
>+	/**
>+	 * Edit the selection
>+	 */
>+	private void handleEdit() {
>+		edit(getSelectedConfigurations()[0]);
>+		fViewer.refresh();
>+	}
>+
>+	/**
>+	 * Edits the given configuration as a nested working copy.
>+	 * Returns the code from the dialog used to edit the configuration.
>+	 * 
>+	 * @param configuration
>+	 * @return dialog return code - OK or CANCEL
>+	 */
>+	private int edit(ILaunchConfigurationWorkingCopy configuration) {
>+		return DebugUIPlugin.openLaunchConfigurationPropertiesDialog(getShell(), configuration, IDebugUIConstants.ID_RUN_LAUNCH_GROUP, getConfigurationNames(), null);
>+	}
>+
>+	/**
>+	 * Create a new configuration
>+	 */
>+	private void handleNew() {
>+		List avail = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getApplicableConfigurationTypes(getResource());
>+		Collections.sort(avail, new Comparator() {
>+				public int compare(Object o1, Object o2) {
>+					ILaunchConfigurationType t1 = (ILaunchConfigurationType) o1;
>+					ILaunchConfigurationType t2 = (ILaunchConfigurationType) o2;
>+					return t1.getName().compareTo(t2.getName());
>+				}
>+			
>+			});
>+		ListDialog dialog = new ListDialog(getShell());
>+		dialog.setTitle(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_11);
>+		dialog.setContentProvider(new ArrayContentProvider());
>+		dialog.setLabelProvider(new DefaultLabelProvider());
>+		dialog.setAddCancelButton(true);
>+		dialog.setMessage(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_12);
>+		dialog.setInput(avail);
>+		if (dialog.open() == Window.OK) {
>+			Object[] result = dialog.getResult();
>+			if (result.length == 1) {
>+				ILaunchConfigurationType type = (ILaunchConfigurationType) result[0];
>+				try {
>+					ILaunchConfigurationWorkingCopy wc = type.newInstance(null, 
>+							((LaunchManager)DebugPlugin.getDefault().getLaunchManager()).
>+							generateUniqueLaunchConfigurationNameFrom("New_configuration", getConfigurationNames())); //$NON-NLS-1$
>+					if (edit(wc) == Window.OK) {
>+						fOriginalCandidates.add(wc);
>+						fViewer.refresh();
>+						fViewer.setSelection(new StructuredSelection(wc));
>+					}
>+				} catch (CoreException e) {
>+					setErrorMessage(e.getMessage());
>+				}
>+			}
>+		}
>+	}	
>+}
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java
>diff -N ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,82 @@
>+/*******************************************************************************
>+ * 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.Arrays;
>+import java.util.Collections;
>+import java.util.Comparator;
>+import java.util.HashMap;
>+import java.util.Iterator;
>+import java.util.List;
>+import java.util.Map;
>+
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.debug.core.DebugPlugin;
>+import org.eclipse.debug.core.ILaunchConfiguration;
>+import org.eclipse.debug.core.ILaunchConfigurationType;
>+import org.eclipse.ui.model.WorkbenchViewerComparator;
>+
>+/**
>+ * Groups configurations by type.
>+ * 
>+ * @since 3.3
>+ */
>+public class LaunchConfigurationComparator extends WorkbenchViewerComparator {
>+
>+	/**
>+	 * the map of categories of <code>ILaunchConfigurationType</code>s to <code>Integer</code>s entries
>+	 */
>+	private static Map fgCategories;
>+	
>+	/**
>+	 * @see org.eclipse.jface.viewers.ViewerComparator#category(java.lang.Object)
>+	 */
>+	public int category(Object element) {
>+		Map map = getCategories();
>+		if (element instanceof ILaunchConfiguration) {
>+			ILaunchConfiguration configuration = (ILaunchConfiguration) element;
>+			try {
>+				Integer i = (Integer) map.get(configuration.getType());
>+				if (i != null) {
>+					return i.intValue();
>+				}
>+			} catch (CoreException e) {
>+			}
>+		}
>+		return map.size();
>+	}
>+	
>+	/**
>+	 * Returns the map of categories
>+	 * @return the map of categories
>+	 */
>+	private Map getCategories() {
>+		if (fgCategories == null) {
>+			fgCategories = new HashMap();
>+			List types = Arrays.asList(DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationTypes());
>+			Collections.sort(types, new Comparator() {
>+				public int compare(Object o1, Object o2) {
>+					ILaunchConfigurationType t1 = (ILaunchConfigurationType) o1;
>+					ILaunchConfigurationType t2 = (ILaunchConfigurationType) o2;
>+					return t1.getName().compareTo(t2.getName());
>+				}
>+			
>+			});
>+			Iterator iterator = types.iterator();
>+			int i = 0;
>+			while (iterator.hasNext()) {
>+				fgCategories.put(iterator.next(), new Integer(i));
>+				i++;
>+			}
>+		}
>+		return fgCategories;
>+	}
>+}
>Index: ui/org/eclipse/debug/internal/ui/actions/RunContextLaunchingAction.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/actions/RunContextLaunchingAction.java
>diff -N ui/org/eclipse/debug/internal/ui/actions/RunContextLaunchingAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/actions/RunContextLaunchingAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,33 @@
>+/*******************************************************************************
>+ * 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.actions;
>+
>+import org.eclipse.debug.core.ILaunchManager;
>+
>+/**
>+ * Specialization of <code>ContextLaunchingAction</code> for run mode
>+ * 
>+ * @see {@link ContextLaunchingAction}
>+ * @see {@link ILaunchManager}
>+ * 
>+ * @since 3.3
>+ * EXPERIMENTAL
>+ */
>+public class RunContextLaunchingAction extends ContextLaunchingAction {
>+
>+	/**
>+	 * Constructor
>+	 */
>+	public RunContextLaunchingAction() {
>+		super(ILaunchManager.RUN_MODE);
>+	}
>+
>+}
>Index: ui/org/eclipse/debug/internal/ui/actions/DebugContextLaunchingAction.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/actions/DebugContextLaunchingAction.java
>diff -N ui/org/eclipse/debug/internal/ui/actions/DebugContextLaunchingAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/actions/DebugContextLaunchingAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,32 @@
>+/*******************************************************************************
>+ * 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.actions;
>+
>+import org.eclipse.debug.core.ILaunchManager;
>+
>+/**
>+ * Specialization of <code>ContextLaunchingAction</code> for debug mode
>+ * 
>+ * @see {@link ContextLaunchingAction}
>+ * @see {@link ILaunchManager}
>+ * 
>+ * @since 3.3
>+ * EXPERIMENTAL
>+ */
>+public class DebugContextLaunchingAction extends ContextLaunchingAction {
>+	
>+	/**
>+	 * Constructor
>+	 */
>+	public DebugContextLaunchingAction() {
>+		super(ILaunchManager.DEBUG_MODE);
>+	}
>+}
>#P org.eclipse.jdt.debug.ui
>Index: ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java,v
>retrieving revision 1.44
>diff -u -r1.44 JavaMainTab.java
>--- ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java	2 Jan 2007 20:26:16 -0000	1.44
>+++ ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java	10 Jan 2007 22:38:07 -0000
>@@ -53,7 +53,7 @@
> * A launch configuration tab that displays and edits project and
> * main type name launch configuration attributes.
> * 
>- * This class may be instantiated. This class is not intended to be subclassed.
>+ * This class may be instantiated. This class is not intended to be sub-classed.
> * 
> * @since 3.2
> */
>#P org.eclipse.jdt.junit
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.junit/plugin.xml,v
>retrieving revision 1.116
>diff -u -r1.116 plugin.xml
>--- plugin.xml	8 Jan 2007 16:19:39 -0000	1.116
>+++ plugin.xml	10 Jan 2007 22:38:09 -0000
>@@ -266,6 +266,9 @@
> <perspective
> id="org.eclipse.debug.ui.DebugPerspective">
> </perspective>
>+ <configurationType
>+ id="org.eclipse.jdt.junit.launchconfig">
>+ </configurationType>
> </shortcut>
> </extension>
> <extension
>#P org.eclipse.pde.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/plugin.xml,v
>retrieving revision 1.388
>diff -u -r1.388 plugin.xml
>--- plugin.xml	3 Jan 2007 02:59:55 -0000	1.388
>+++ plugin.xml	10 Jan 2007 22:38:10 -0000
>@@ -1090,6 +1090,9 @@
> <perspective
> id="org.eclipse.pde.PDEPerspective">
> </perspective>
>+ <configurationType
>+ id="org.eclipse.pde.ui.JunitLaunchConfig">
>+ </configurationType>
> </shortcut>
> <shortcut
> label="%launcher.shortcut.label"
>@@ -1133,6 +1136,9 @@
> <perspective
> id="org.eclipse.pde.PDEPerspective">
> </perspective>
>+ <configurationType
>+ id="org.eclipse.pde.ui.RuntimeWorkbench">
>+ </configurationType>
> </shortcut>
> <shortcut
> label="%Equinox.shortcut.label"
>@@ -1176,6 +1182,9 @@
> <perspective
> id="org.eclipse.pde.PDEPerspective">
> </perspective>
>+ <configurationType
>+ id="org.eclipse.pde.ui.EquinoxLauncher">
>+ </configurationType>
> </shortcut>
> <!-- <shortcut
> label="%launcher.swt.name"
>#P org.eclipse.jdt.debug.tests
>Index: tests/org/eclipse/jdt/debug/tests/launching/LaunchConfigurationTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchConfigurationTests.java,v
>retrieving revision 1.4
>diff -u -r1.4 LaunchConfigurationTests.java
>--- tests/org/eclipse/jdt/debug/tests/launching/LaunchConfigurationTests.java	3 Jan 2007 22:37:42 -0000	1.4
>+++ tests/org/eclipse/jdt/debug/tests/launching/LaunchConfigurationTests.java	10 Jan 2007 22:38:11 -0000
>@@ -738,7 +738,7 @@
> 		 
> 		 // get a working copy
> 		 wc = handle.getWorkingCopy();
>-		 ILaunchConfigurationWorkingCopy nested = wc.getNestedWorkingCopy();
>+		 ILaunchConfigurationWorkingCopy nested = wc.getWorkingCopy();
> 		 
> 		 // verify nested is same as original
> 		 assertEquals("String1 should be String1", nested.getAttribute("String1", "Missing"), "String1");
>#P org.eclipse.debug.core
>Index: core/org/eclipse/debug/core/ILaunchConfiguration.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.core/core/org/eclipse/debug/core/ILaunchConfiguration.java,v
>retrieving revision 1.50
>diff -u -r1.50 ILaunchConfiguration.java
>--- core/org/eclipse/debug/core/ILaunchConfiguration.java	8 Dec 2006 20:09:32 -0000	1.50
>+++ core/org/eclipse/debug/core/ILaunchConfiguration.java	10 Jan 2007 22:38:12 -0000
>@@ -374,17 +374,22 @@
> 	
> 	/**
> 	 * Returns a working copy of this launch configuration.
>+	 * If the this method is called on a working copy, a nested working 
>+	 * copy is created (a working copy of a working copy).
> 	 * Changes to the working copy will be applied to this
>-	 * launch configuration when saved. The working copy will
>-	 * refer to this launch configuration as its original
>-	 * launch configuration.
>+	 * launch configuration when saved, or to the parent working copy. 
>+	 * The working copy will refer to this launch configuration as its original
>+	 * launch configuration, or the working copy it was created from.
> 	 * 
> 	 * When a working copy (B) is created from a working copy (A), the newly
> 	 * created working copy (B) is initialized with the attributes from
> 	 * the first working copy (A). Whenever a working copy is saved, it is written
>-	 * back to the original non-working copy configuration.
>+	 * back to the working copy from which it was created: in this example working 
>+	 * copy B will write back to working copy A, and A will write back to the 
>+	 * original launch configuration.
> 	 * 
>-	 * @return a working copy of this launch configuration
>+	 * @return a working copy of this launch configuration, or a nested working copy if called
>+	 * on an instance of <code>ILaunchConfigurationWorkingCopy</code>
> 	 * @exception CoreException if this method fails. Reasons include:
> 	 * <ul>
> 	 * <li>An exception occurs while initializing the contents of the
>@@ -396,7 +401,7 @@
> 	
> 	/**
> 	 * Returns whether this launch configuration is stored
>-	 * locally with the workspace. This is a handle-only method.
>+	 * locally within the workspace. This is a handle-only method.
> 	 * 
> 	 * @return whether this launch configuration is stored
> 	 * locally with the workspace
>Index: core/org/eclipse/debug/core/ILaunchConfigurationWorkingCopy.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.core/core/org/eclipse/debug/core/ILaunchConfigurationWorkingCopy.java,v
>retrieving revision 1.23
>diff -u -r1.23 ILaunchConfigurationWorkingCopy.java
>--- core/org/eclipse/debug/core/ILaunchConfigurationWorkingCopy.java	3 Jan 2007 17:52:52 -0000	1.23
>+++ core/org/eclipse/debug/core/ILaunchConfigurationWorkingCopy.java	10 Jan 2007 22:38:12 -0000
>@@ -111,10 +111,10 @@
> 	
> 	/**
> 	 * Returns the original launch configuration this working copy
>-	 * was created from, or <code>null</code> if this is a new
>+	 * was created from or <code>null</code> if this is a new
> 	 * working copy created from a launch configuration type.
> 	 * 
>-	 * @return the original launch configuration, or <code>null</code>
>+	 * @return the original launch configuration, working copy, or <code>null</code>
> 	 */
> 	public ILaunchConfiguration getOriginal();
> 	
>@@ -254,31 +254,6 @@
> 	public void removeModes(Set modes);
> 	
> 	/**
>-	 * Returns a working copy of this working copy. Changes to the working copy will
>-	 * be applied to this working copy when saved. The working copy will
>-	 * refer to this launch configuration as its parent. Changes are only
>-	 * saved to the underlying original configuration when the root working
>-	 * copy is saved.
>-	 * 
>-	 * @return a working copy of this working copy
>-	 * @exception CoreException if this method fails. Reasons include:
>-	 * <ul>
>-	 * <li>An exception occurs while initializing the contents of the
>-	 * working copy from this configuration's underlying storage.</li>
>-	 * </ul>
>-	 * @see ILaunchConfigurationWorkingCopy#getOriginal()
>-	 * @see ILaunchConfigurationWorkingCopy#getParent()
>-	 * @since 3.3
>-	 * 
>-	 * EXPERIMENTAL. This method has been added as
>-	 * part of a work in progress. There is no guarantee that this API will
>-	 * remain unchanged during the 3.3 release cycle. Please do not use this API
>-	 * without consulting with the Platform/Debug team.
>-	 * 
>-	 */
>-	public ILaunchConfigurationWorkingCopy getNestedWorkingCopy() throws CoreException;	
>-	
>-	/**
> 	 * Returns the parent of this working copy or <code>null</code> if this working
> 	 * copy is not a nested copy of another working copy.
> 	 * 
>Index: core/org/eclipse/debug/internal/core/LaunchManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java,v
>retrieving revision 1.183
>diff -u -r1.183 LaunchManager.java
>--- core/org/eclipse/debug/internal/core/LaunchManager.java	4 Jan 2007 17:55:06 -0000	1.183
>+++ core/org/eclipse/debug/internal/core/LaunchManager.java	10 Jan 2007 22:38:13 -0000
>@@ -2438,6 +2438,46 @@
> 		return null;
> 	}
> 
>+	/**
>+	 * Returns a list of potential default configurations candidates for the given
>+	 * resource. The configurations are working copies.
>+	 * 
>+	 * @param resource resource
>+	 * @return list of default candidates
>+	 */
>+	public Set getDefaultCandidates(IResource resource) {
>+		IPath resourcePath = resource.getFullPath();
>+		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
>+		Set set = new HashSet();
>+		try {
>+			ILaunchConfiguration[] configurations = manager.getLaunchConfigurations();
>+			ILaunchConfiguration configuration = null;
>+			IResource[] resources = null;
>+			for (int i = 0; i < configurations.length; i++) {
>+				configuration = configurations[i];
>+				resources = configuration.getMappedResources();
>+				if (resources != null) {
>+					for (int j = 0; j < resources.length; j++) {
>+						if (resource.equals(resources[j]) || resourcePath.isPrefixOf(resources[j].getFullPath()) ||
>+								resources[j].getFullPath().isPrefixOf(resourcePath)) {
>+							set.add(configuration.getWorkingCopy());
>+							break;
>+						}
>+					}
>+				} else {
>+					// 1. similar to launch dialog - if no resource mapping, display the config
>+					if (!"org.eclipse.ui.externaltools".equals(configuration.getType().getCategory())) { //$NON-NLS-1$
>+						set.add(configuration.getWorkingCopy());
>+					}
>+				}
>+			}
>+		} catch (CoreException e) {
>+			set.clear();
>+			DebugPlugin.log(e);
>+		}
>+		return set;
>+	}
>+	
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.debug.core.ILaunchManager#setDefaultConfiguration(org.eclipse.core.resources.IResource, org.eclipse.debug.core.ILaunchConfiguration)
> 	 */
>@@ -2454,32 +2494,30 @@
> 			}
> 		}
> 		
>-		// remove previous settings, if any
>+		// get preference nodes
> 		org.osgi.service.prefs.Preferences projectNode = getProjectNode(resource);
>-		projectNode.remove(DEFAULT_CONFIGURATION);
>-		flush(projectNode);
> 		org.osgi.service.prefs.Preferences instanceNode = getInstanceNode(resource);
>-		instanceNode.remove(DEFAULT_CONFIGURATION);
>-		flush(instanceNode);
>-		
> 		if (configuration != null) {
>-			org.osgi.service.prefs.Preferences node = null;
>-			String configurationValue = null;
> 			if (configuration.isLocal()) {
> 				// for local configurations, use workspace (instance) scope preferences
>-				node = instanceNode;
> 				if (!configuration.isWorkingCopy()) {
>-					configurationValue = configuration.getMemento();
>+					instanceNode.put(DEFAULT_CONFIGURATION, configuration.getMemento());
>+					projectNode.remove(DEFAULT_CONFIGURATION);
> 				}
>+				
> 			} else {
> 				// for shared configurations, use project scope preferences
>-				node = projectNode;
>-				configurationValue = configuration.getFile().getProjectRelativePath().toPortableString();
>+				projectNode.put(DEFAULT_CONFIGURATION, configuration.getFile().getProjectRelativePath().toPortableString());
>+				instanceNode.remove(DEFAULT_CONFIGURATION);
> 			}
>-			node.put(DEFAULT_CONFIGURATION, configurationValue);
>-			flush(node);
> 		}
>-		
>+		else {
>+			//remove nodes because the default has been un-set
>+			projectNode.remove(DEFAULT_CONFIGURATION);
>+			instanceNode.remove(DEFAULT_CONFIGURATION);
>+		}
>+		flush(projectNode);
>+		flush(instanceNode);
> 	}	
> 	
> 	/**
>Index: core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java,v
>retrieving revision 1.66
>diff -u -r1.66 LaunchConfigurationWorkingCopy.java
>--- core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java	3 Jan 2007 17:52:52 -0000	1.66
>+++ core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java	10 Jan 2007 22:38:12 -0000
>@@ -55,6 +55,12 @@
> 	private LaunchConfiguration fOriginal;
> 	
> 	/**
>+	 * Handle to a parent working copy
>+	 * @since 3.3
>+	 */
>+	private LaunchConfigurationWorkingCopy fParent = null;
>+	
>+	/**
> 	 * Working copy of attributes.
> 	 */
> 	private LaunchConfigurationInfo fInfo;
>@@ -87,12 +93,6 @@
> 	private IContainer fContainer;
> 	
> 	/**
>-	 * Parent working copy.
>-	 * @since 3.3
>-	 */
>-	private LaunchConfigurationWorkingCopy fParent = null;
>-	
>-	/**
> 	 * Constructs a working copy of the specified launch 
> 	 * configuration.
> 	 * 
>@@ -173,42 +173,39 @@
> 	 * @see ILaunchConfigurationWorkingCopy#doSave()
> 	 */
> 	public synchronized ILaunchConfiguration doSave() throws CoreException {
>-		if (fParent == null) {
>-			if (isDirty()) {
>-				boolean useRunnable= true;
>-				if (isLocal()) {
>-					if (isMoved()) {
>-						// If this config was moved from a shared location, saving
>-						// it will delete the original from the workspace. Use runnable.
>-						useRunnable= !isNew() && !getOriginal().isLocal();
>-					} else {
>-						useRunnable= false;
>-					}
>-				}
>-	
>-				if (useRunnable) {
>-					IWorkspaceRunnable wr = new IWorkspaceRunnable() {
>-						public void run(IProgressMonitor pm) throws CoreException {
>-							doSave0();
>-						}
>-					};
>-					
>-					ResourcesPlugin.getWorkspace().run(wr, null, 0, null);
>+		if (getParent() != null) {
>+			// save to parent working copy
>+			LaunchConfigurationWorkingCopy wc = (LaunchConfigurationWorkingCopy) getParent();
>+			wc.setName(getName());
>+			wc.copyFrom(this);
>+			return wc;
>+		}
>+		else {
>+			boolean useRunnable= true;
>+			if (isLocal()) {
>+				if (isMoved()) {
>+					// If this config was moved from a shared location, saving
>+					// it will delete the original from the workspace. Use runnable.
>+					useRunnable= !isNew() && !getOriginal().isLocal();
> 				} else {
>-					//file is persisted in the metadata not the workspace
>-					doSave0();
>+					useRunnable= false;
> 				}
>-	
>-				getLaunchManager().setMovedFromTo(null, null);
> 			}
>-	
>-			return new LaunchConfiguration(getLocation());
>-		} else {
>-			// save to parent working copy
>-			fParent.setName(getName());
>-			fParent.copyFrom(this);
>-			return fParent;
>+			if (useRunnable) {
>+				IWorkspaceRunnable wr = new IWorkspaceRunnable() {
>+					public void run(IProgressMonitor pm) throws CoreException {
>+						doSave0();
>+					}
>+				};
>+				
>+				ResourcesPlugin.getWorkspace().run(wr, null, 0, null);
>+			} else {
>+				//file is persisted in the metadata not the workspace
>+				doSave0();
>+			}
>+			getLaunchManager().setMovedFromTo(null, null);
> 		}
>+		return new LaunchConfiguration(getLocation());
> 	}
> 
> 	
>@@ -364,7 +361,20 @@
> 	 * @see ILaunchConfigurationWorkingCopy#getOriginal()
> 	 */
> 	public ILaunchConfiguration getOriginal() {
>-		return fOriginal;
>+		ILaunchConfiguration config = fOriginal;
>+		ILaunchConfigurationWorkingCopy parent = fParent;
>+		while(parent != null) {
>+			config = parent.getOriginal();
>+			parent = parent.getParent();
>+		}
>+		return config;
>+	}
>+	
>+	/**
>+	 * @see org.eclipse.debug.core.ILaunchConfigurationWorkingCopy#getParent()
>+	 */
>+	public ILaunchConfigurationWorkingCopy getParent() {
>+		return fParent;
> 	}
> 	
> 	/**
>@@ -670,25 +680,7 @@
> 	 * @see org.eclipse.debug.internal.core.LaunchConfiguration#getWorkingCopy()
> 	 */
> 	public ILaunchConfigurationWorkingCopy getWorkingCopy() throws CoreException {
>-		if (fParent == null) {
>-			return super.getWorkingCopy();
>-		} else {
>-			return getNestedWorkingCopy();
>-		}
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.debug.core.ILaunchConfigurationWorkingCopy#getNestedWorkingCopy()
>-	 */
>-	public ILaunchConfigurationWorkingCopy getNestedWorkingCopy() throws CoreException {
> 		return new LaunchConfigurationWorkingCopy(this);
> 	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.debug.core.ILaunchConfigurationWorkingCopy#getParent()
>-	 */
>-	public ILaunchConfigurationWorkingCopy getParent() {
>-		return fParent;
>-	}
> }
>

Actions: View | Diff

Attachments on bug 74480: 53335 | 54442 | 54503 | 55420 | 56341 | 56426 | 56666 | 56675 | 56736 | 56804 | 56849 | 56854 | 57047 | 57181 | 57350 | 58480 | 58788 | 58895