Attachment 147924 Details for Bug 206403 – Patch v02

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

[patch] Patch v02

JobCommandProperty 01.txt (text/plain), 23.01 KB, created by Prakash Rangaraj

on 2009-09-23 15:13:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Prakash Rangaraj

Created: 2009-09-23 15:13:44 EDT

Size: 23.01 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java,v
>retrieving revision 1.48
>diff -u -r1.48 AnimationItem.java
>--- Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java	16 Mar 2007 18:00:37 -0000	1.48
>+++ Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java	3 Sep 2009 17:58:09 -0000
>@@ -169,4 +169,11 @@
> void setAnimationContainer(IAnimationContainer container) {
> this.animationContainer = container;
> }
>+
>+	/**
>+	 * @return Returns the window.
>+	 */
>+	public WorkbenchWindow getWindow() {
>+		return window;
>+	}
> }
>Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java,v
>retrieving revision 1.55
>diff -u -r1.55 ProgressAnimationItem.java
>--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java	1 Oct 2008 15:36:11 -0000	1.55
>+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java	3 Sep 2009 17:58:09 -0000
>@@ -10,9 +10,15 @@
> *******************************************************************************/
> package org.eclipse.ui.internal.progress;
> 
>+import org.eclipse.core.commands.ExecutionException;
>+import org.eclipse.core.commands.NotEnabledException;
>+import org.eclipse.core.commands.NotHandledException;
>+import org.eclipse.core.commands.common.NotDefinedException;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.jface.action.IAction;
>+import org.eclipse.jface.dialogs.ErrorDialog;
> import org.eclipse.jface.util.Util;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
>@@ -35,7 +41,9 @@
> import org.eclipse.swt.widgets.ProgressBar;
> import org.eclipse.swt.widgets.ToolBar;
> import org.eclipse.swt.widgets.ToolItem;
>+import org.eclipse.ui.IWorkbenchWindow;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.handlers.IHandlerService;
> import org.eclipse.ui.internal.WorkbenchImages;
> import org.eclipse.ui.progress.IProgressConstants;
> import org.eclipse.ui.statushandlers.StatusAdapter;
>@@ -109,30 +117,10 @@
> 						StatusManager.getManager().handle(statusAdapter,
> 								StatusManager.SHOW);
> 
>-						JobTreeElement topElement = (JobTreeElement) ji
>-								.getParent();
>-						if (topElement == null) {
>-							topElement = ji;
>-						}
>-						FinishedJobs.getInstance().remove(topElement);
>+						removeTopElement(ji);
> 					}
> 
>-					IAction action = null;
>-					Object property = job
>-							.getProperty(IProgressConstants.ACTION_PROPERTY);
>-					if (property instanceof IAction) {
>-						action = (IAction) property;
>-					}
>-					if (action != null && action.isEnabled()) {
>-						action.run();
>-						JobTreeElement topElement = (JobTreeElement) ji
>-								.getParent();
>-						if (topElement == null) {
>-							topElement = ji;
>-						}
>-						FinishedJobs.getInstance().remove(topElement);
>-						return;
>-					}
>+					execute(ji, job);
> 				}
> 			}
> 		}
>@@ -141,6 +129,59 @@
> 		refresh();
> 	}
> 
>+	/**
>+	 * @param ji
>+	 * @param job
>+	 */
>+	private void execute(JobInfo ji, Job job) {
>+
>+		Object prop = job.getProperty(IProgressConstants.ACTION_PROPERTY);
>+		if (prop instanceof IAction && ((IAction) prop).isEnabled()) {
>+			IAction action = (IAction) prop;
>+			action.run();
>+			removeTopElement(ji);
>+		}
>+
>+		prop = job.getProperty(IProgressConstants.COMMAND_PROPERTY);
>+		if (prop instanceof String) {
>+			String commandId = (String) prop;
>+			IWorkbenchWindow window = getWindow();
>+			IHandlerService service = (IHandlerService) window
>+					.getService(IHandlerService.class);
>+			Exception exception = null;
>+			try {
>+				service.executeCommand(commandId, null);
>+				removeTopElement(ji);
>+			} catch (ExecutionException e) {
>+				exception = e;
>+			} catch (NotDefinedException e) {
>+				exception = e;
>+			} catch (NotEnabledException e) {
>+				exception = e;
>+			} catch (NotHandledException e) {
>+				exception = e;
>+			}
>+
>+			if (exception != null) {
>+				Status status = new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID,
>+						exception.getMessage(), exception);
>+				ErrorDialog.openError(window.getShell(), "", "", status); //$NON-NLS-1$//$NON-NLS-2$
>+			}
>+
>+		}
>+	}
>+
>+	/**
>+	 * @param ji
>+	 */
>+	private void removeTopElement(JobInfo ji) {
>+		JobTreeElement topElement = (JobTreeElement) ji.getParent();
>+		if (topElement == null) {
>+			topElement = ji;
>+		}
>+		FinishedJobs.getInstance().remove(topElement);
>+	}
>+
> 	private IAction getAction(Job job) {
> 		Object property = job.getProperty(IProgressConstants.ACTION_PROPERTY);
> 		if (property instanceof IAction) {
>Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java,v
>retrieving revision 1.53
>diff -u -r1.53 ProgressInfoItem.java
>--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java	4 Aug 2009 11:08:45 -0000	1.53
>+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java	3 Sep 2009 17:58:15 -0000
>@@ -16,8 +16,13 @@
> import java.util.Date;
> import java.util.Iterator;
> import java.util.List;
>+import org.eclipse.core.commands.ExecutionException;
>+import org.eclipse.core.commands.NotEnabledException;
>+import org.eclipse.core.commands.NotHandledException;
>+import org.eclipse.core.commands.common.NotDefinedException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.dialogs.Dialog;
>@@ -50,7 +55,9 @@
> import org.eclipse.swt.widgets.ToolBar;
> import org.eclipse.swt.widgets.ToolItem;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.handlers.IHandlerService;
> import org.eclipse.ui.internal.WorkbenchImages;
>+import org.eclipse.ui.internal.WorkbenchPlugin;
> import org.eclipse.ui.progress.IProgressConstants;
> 
> /**
>@@ -93,7 +100,9 @@
> 
> 	private static final String TEXT_KEY = "Text"; //$NON-NLS-1$
> 
>-	private static final String ACTION_KEY = "Action";//$NON-NLS-1$
>+	private static final String TRIGGER_KEY = "Trigger";//$NON-NLS-1$
>+
>+	boolean triggerWarningLogged = false;
> 
> 	interface IndexListener {
> 		/**
>@@ -124,6 +133,8 @@
> 
> 	private ResourceManager resourceManager;
> 
>+	private Link link;
>+
> 	static {
> 		JFaceResources
> 				.getImageRegistry()
>@@ -222,16 +233,18 @@
> 		// busy
> 
> 		// cursor we might have
>-		actionButton = new ToolItem(actionBar, SWT.NONE);
>-		actionButton
>-				.setToolTipText(ProgressMessages.NewProgressView_CancelJobToolTip);
>-		actionButton.addSelectionListener(new SelectionAdapter() {
>-			public void widgetSelected(SelectionEvent e) {
>-				actionButton.setEnabled(false);
>-				cancelOrRemove();
>-			}
>-
>-		});
>+		if (info.isCancellable()) {
>+			actionButton = new ToolItem(actionBar, SWT.NONE);
>+			actionButton
>+					.setToolTipText(ProgressMessages.NewProgressView_CancelJobToolTip);
>+			actionButton.addSelectionListener(new SelectionAdapter() {
>+				public void widgetSelected(SelectionEvent e) {
>+					actionButton.setEnabled(false);
>+					cancelOrRemove();
>+				}
>+			});
>+		}
>+			
> 		actionBar.addListener(SWT.Traverse, new Listener() {
> 			/*
> 			 * (non-Javadoc)
>@@ -654,6 +667,9 @@
> 	 * 
> 	 */
> 	private void updateToolBarValues() {
>+		if (actionButton == null) {
>+			return;
>+		}
> 		if (isCompleted()) {
> 			actionButton.setImage(JFaceResources
> 					.getImage(CLEAR_FINISHED_JOB_KEY));
>@@ -726,7 +742,6 @@
> 	 */
> 	void setLinkText(Job linkJob, String taskString, int index) {
> 
>-		Link link;
> 		if (index >= taskEntries.size()) {// Is it new?
> 			link = new Link(this, SWT.NONE);
> 
>@@ -754,8 +769,6 @@
> 
> 			link.setLayoutData(linkData);
> 
>-			final Link finalLink = link;
>-
> 			link.addSelectionListener(new SelectionAdapter() {
> 				/*
> 				 * (non-Javadoc)
>@@ -764,17 +777,7 @@
> 				 */
> 				public void widgetSelected(SelectionEvent e) {
> 
>-					IAction action = (IAction) finalLink.getData(ACTION_KEY);
>-					action.run();
>-
>-					updateAction(action, finalLink);
>-
>-					Object text = finalLink.getData(TEXT_KEY);
>-					if (text == null)
>-						return;
>-
>-					// Refresh the text as enablement might have changed
>-					updateText((String) text, finalLink);
>+					executeTrigger();
> 				}
> 			});
> 
>@@ -786,11 +789,11 @@
> 				 */
> 				public void handleEvent(Event event) {
> 
>-					Object text = finalLink.getData(TEXT_KEY);
>+					Object text = link.getData(TEXT_KEY);
> 					if (text == null)
> 						return;
> 
>-					updateText((String) text, finalLink);
>+					updateText((String) text, link);
> 
> 				}
> 			});
>@@ -803,28 +806,87 @@
> 		link.setData(TEXT_KEY, taskString);
> 
> 		// check for action property
>-		Object property = linkJob
>+		Object actionProperty = linkJob
> 				.getProperty(IProgressConstants.ACTION_PROPERTY);
>-		updateAction(property, link);
>+		Object commandProperty = linkJob
>+				.getProperty(IProgressConstants.COMMAND_PROPERTY);
>+
>+		if (actionProperty != null && commandProperty != null) {
>+			// if both are specified, then use neither
>+			updateAction(null, link);
>+		} else {
>+			Object property = actionProperty == null ? commandProperty
>+					: actionProperty;
>+			updateAction(property, link);
>+		}
> 
> 		updateText(taskString, link);
> 
> 	}
> 
>+	public void executeTrigger() {
>+
>+		Object data = link.getData(TRIGGER_KEY);
>+		if (data instanceof IAction) {
>+			IAction action = (IAction) data;
>+			action.run();
>+			updateAction(action, link);
>+		} else if (data instanceof String) {
>+			IHandlerService handlerService = (IHandlerService) PlatformUI
>+					.getWorkbench().getService(IHandlerService.class);
>+			IStatus status = Status.OK_STATUS;
>+			try {
>+				handlerService.executeCommand((String) data, null);
>+			} catch (ExecutionException e) {
>+				status = new Status(
>+						IStatus.ERROR,
>+						PlatformUI.PLUGIN_ID,
>+						"An error occured while executing the command specified on the Job", e); //$NON-NLS-1$
>+			} catch (NotDefinedException e) {
>+				status = new Status(
>+						IStatus.ERROR,
>+						PlatformUI.PLUGIN_ID,
>+						"An error occured while executing the command specified on the Job", e); //$NON-NLS-1$
>+			} catch (NotEnabledException e) {
>+				status = new Status(IStatus.WARNING, PlatformUI.PLUGIN_ID,
>+						"The command specified on the job is not disabled", e); //$NON-NLS-1$
>+			} catch (NotHandledException e) {
>+				status = new Status(
>+						IStatus.ERROR,
>+						PlatformUI.PLUGIN_ID,
>+						"An error occured while executing the command specified on the Job", e); //$NON-NLS-1$
>+			}
>+
>+			if (!status.isOK()) {
>+				WorkbenchPlugin.log(status);
>+			}
>+		}
>+
>+		Object text = link.getData(TEXT_KEY);
>+		if (text == null)
>+			return;
>+
>+		// Refresh the text as enablement might have changed
>+		updateText((String) text, link);
>+	}
>+
> 	/**
>-	 * Update the action key if action is enabled or remove it if not
>+	 * Update the trigger key if either action is available and enabled or
>+	 * command is available
> 	 * 
>-	 * @param action
>+	 * @param trigger
> 	 * {@link Object} or <code>null</code>
> 	 * @param link
> 	 */
>-	private void updateAction(Object action, Link link) {
>+	private void updateAction(Object trigger, Link link) {
> 
>-		if (action != null && action instanceof IAction
>-				&& ((IAction) action).isEnabled())
>-			link.setData(ACTION_KEY, action);
>-		else
>-			link.setData(ACTION_KEY, null);
>+		if (trigger instanceof IAction && ((IAction) trigger).isEnabled()) {
>+				link.setData(TRIGGER_KEY, trigger);
>+		} else if (trigger instanceof String) {
>+			link.setData(TRIGGER_KEY, trigger);
>+		} else {
>+			link.setData(TRIGGER_KEY, null);
>+		}
> 
> 	}
> 
>@@ -838,7 +900,7 @@
> 		taskString = Dialog.shortenText(taskString, link);
> 
> 		// Put in a hyperlink if there is an action
>-		link.setText(link.getData(ACTION_KEY) == null ? taskString : NLS.bind(
>+		link.setText(link.getData(TRIGGER_KEY) == null ? taskString : NLS.bind(
> 				"<a>{0}</a>", taskString));//$NON-NLS-1$
> 	}
> 
>Index: .settings/.api_filters
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/.settings/.api_filters,v
>retrieving revision 1.8
>diff -u -r1.8 .api_filters
>--- .settings/.api_filters	4 Mar 2009 19:16:47 -0000	1.8
>+++ .settings/.api_filters	3 Sep 2009 17:58:09 -0000
>@@ -1,72 +1,80 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <component id="org.eclipse.ui.workbench" version="2">
>- <resource path="Eclipse UI/org/eclipse/ui/services/IEvaluationReference.java" type="org.eclipse.ui.services.IEvaluationReference">
>- <filter id="403853384">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.services.IEvaluationReference"/>
>- </message_arguments>
>- </filter>
>- </resource>
>- <resource path="Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java" type="org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager">
>- <filter id="336744520">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager"/>
>- </message_arguments>
>- </filter>
>- </resource>
>- <resource path="Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java" type="org.eclipse.ui.part.MultiPageEditorPart">
>- <filter id="420630660">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
>- <message_argument value="getActivePage()"/>
>- </message_arguments>
>- </filter>
>- <filter id="421679236">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
>- <message_argument value="getActiveEditor()"/>
>- </message_arguments>
>- </filter>
>- <filter id="421679236">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
>- <message_argument value="getActivePage()"/>
>- </message_arguments>
>- </filter>
>- <filter id="420630660">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
>- <message_argument value="getActiveEditor()"/>
>- </message_arguments>
>- </filter>
>- </resource>
>- <resource path="Eclipse UI/org/eclipse/ui/branding/IBundleGroupConstants.java" type="org.eclipse.ui.branding.IBundleGroupConstants">
>- <filter id="403767336">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.branding.IBundleGroupConstants"/>
>- <message_argument value="BRANDING_BUNDLE_ID"/>
>- </message_arguments>
>- </filter>
>- <filter id="403767336">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.branding.IBundleGroupConstants"/>
>- <message_argument value="BRANDING_BUNDLE_VERSION"/>
>- </message_arguments>
>- </filter>
>- </resource>
>- <resource path="Eclipse UI/org/eclipse/ui/menus/CommandContributionItemParameter.java" type="org.eclipse.ui.menus.CommandContributionItemParameter">
>- <filter id="338948223">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.menus.CommandContributionItemParameter"/>
>- <message_argument value="CommandContributionItemParameter(IServiceLocator, String, String, Map, ImageDescriptor, ImageDescriptor, ImageDescriptor, String, String, String, int, String, boolean)"/>
>- </message_arguments>
>- </filter>
>- </resource>
>- <resource path="Eclipse UI/org/eclipse/ui/services/IServiceScopes.java" type="org.eclipse.ui.services.IServiceScopes">
>- <filter id="403853384">
>- <message_arguments>
>- <message_argument value="org.eclipse.ui.services.IServiceScopes"/>
>- </message_arguments>
>- </filter>
>- </resource>
>+<resource path="Eclipse UI/org/eclipse/ui/branding/IBundleGroupConstants.java" type="org.eclipse.ui.branding.IBundleGroupConstants">
>+<filter id="403767336">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.branding.IBundleGroupConstants"/>
>+<message_argument value="BRANDING_BUNDLE_ID"/>
>+</message_arguments>
>+</filter>
>+<filter id="403767336">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.branding.IBundleGroupConstants"/>
>+<message_argument value="BRANDING_BUNDLE_VERSION"/>
>+</message_arguments>
>+</filter>
>+</resource>
>+<resource path="Eclipse UI/org/eclipse/ui/menus/CommandContributionItemParameter.java" type="org.eclipse.ui.menus.CommandContributionItemParameter">
>+<filter id="338948223">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.menus.CommandContributionItemParameter"/>
>+<message_argument value="CommandContributionItemParameter(IServiceLocator, String, String, Map, ImageDescriptor, ImageDescriptor, ImageDescriptor, String, String, String, int, String, boolean)"/>
>+</message_arguments>
>+</filter>
>+</resource>
>+<resource path="Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java" type="org.eclipse.ui.part.MultiPageEditorPart">
>+<filter id="420630660">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
>+<message_argument value="getActivePage()"/>
>+</message_arguments>
>+</filter>
>+<filter id="420630660">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
>+<message_argument value="getActiveEditor()"/>
>+</message_arguments>
>+</filter>
>+<filter id="421679236">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
>+<message_argument value="getActivePage()"/>
>+</message_arguments>
>+</filter>
>+<filter id="421679236">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
>+<message_argument value="getActiveEditor()"/>
>+</message_arguments>
>+</filter>
>+</resource>
>+<resource path="Eclipse UI/org/eclipse/ui/progress/IProgressConstants.java" type="org.eclipse.ui.progress.IProgressConstants">
>+<filter id="403767336">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.progress.IProgressConstants"/>
>+<message_argument value="COMMAND_PROPERTY"/>
>+</message_arguments>
>+</filter>
>+</resource>
>+<resource path="Eclipse UI/org/eclipse/ui/services/IEvaluationReference.java" type="org.eclipse.ui.services.IEvaluationReference">
>+<filter id="403853384">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.services.IEvaluationReference"/>
>+</message_arguments>
>+</filter>
>+</resource>
>+<resource path="Eclipse UI/org/eclipse/ui/services/IServiceScopes.java" type="org.eclipse.ui.services.IServiceScopes">
>+<filter id="403853384">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.services.IServiceScopes"/>
>+</message_arguments>
>+</filter>
>+</resource>
>+<resource path="Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java" type="org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager">
>+<filter id="336744520">
>+<message_arguments>
>+<message_argument value="org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager"/>
>+</message_arguments>
>+</filter>
>+</resource>
> </component>
>Index: Eclipse UI/org/eclipse/ui/progress/IProgressConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IProgressConstants.java,v
>retrieving revision 1.11
>diff -u -r1.11 IProgressConstants.java
>--- Eclipse UI/org/eclipse/ui/progress/IProgressConstants.java	8 May 2006 20:55:31 -0000	1.11
>+++ Eclipse UI/org/eclipse/ui/progress/IProgressConstants.java	3 Sep 2009 17:58:15 -0000
>@@ -63,25 +63,47 @@
> public static final QualifiedName KEEPONE_PROPERTY = new QualifiedName(
> PROPERTY_PREFIX, "keepone"); //$NON-NLS-1$
> 
>- /**
>- * This property is used to associate an <code>IAction</code> with a Job.
>- * If the Job is shown in the UI, the action might be represented as a button or
>- * hyper link to allow the user to trigger a job specific action, like showing
>- * the Job's results.
>- * 
>- * The progress UI will track the enabled state of the action and its tooltip text.
>- * 
>- * 
>- * If the action implements <code>ActionFactory.IWorkbenchAction</code>, its
>- * <code>dispose</code> method will be called as soon as the Job is finally
>- * removed from the set of kept jobs.
>- * 
>- * @see org.eclipse.jface.action.IAction
>- * @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction
>- **/
>+ 	/**
>+ 	 * This property is used to associate an <code>IAction</code> with a Job. If
>+ 	 * the Job is shown in the UI, the action might be represented as a button
>+ 	 * or hyper link to allow the user to trigger a job specific action, like
>+ 	 * showing the Job's results.
>+ 	 * 
>+ 	 * The progress UI will track the enabled state of the action and its
>+ 	 * tooltip text.
>+ 	 * 
>+ 	 * 
>+ 	 * If the action implements <code>ActionFactory.IWorkbenchAction</code>, its
>+ 	 * <code>dispose</code> method will be called as soon as the Job is finally
>+ 	 * removed from the set of kept jobs.
>+ 	 * 
>+ 	 * 
>+ 	 * Note: Only one of <code>ACTION_PROPERTY</code> or
>+ 	 * <code>COMMAND_PROPERTY</code> should be used
>+ 	 * 
>+ 	 * 
>+ 	 * @see org.eclipse.jface.action.IAction
>+ 	 * @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction
>+ 	 **/
> public static final QualifiedName ACTION_PROPERTY = new QualifiedName(
> PROPERTY_PREFIX, "action"); //$NON-NLS-1$
> 
>+	/**
>+	 * This property is used to associate an <code>Command</code>'s id with a
>+	 * Job. If the Job is shown in the UI, the command might be represented as a
>+	 * button or hyper link to allow the user to trigger a job specific action,
>+	 * like showing the Job's results.
>+	 * 
>+	 * Note: Only one of <code>ACTION_PROPERTY</code> or
>+	 * <code>COMMAND_PROPERTY</code> should be used
>+	 * 
>+	 * 
>+	 * @see org.eclipse.core.commands.Command
>+	 * @since 3.6
>+	 **/
>+	public static final QualifiedName COMMAND_PROPERTY = new QualifiedName(
>+			PROPERTY_PREFIX, "command"); //$NON-NLS-1$
>+
> /**
> * This property is used to associate an <code>ImageDescriptor</code> with a Job.
> * If the Job is shown in the UI, this descriptor is used to create an icon that
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/META-INF/MANIFEST.MF,v
>retrieving revision 1.65
>diff -u -r1.65 MANIFEST.MF
>--- META-INF/MANIFEST.MF	1 Sep 2009 04:32:24 -0000	1.65
>+++ META-INF/MANIFEST.MF	3 Sep 2009 17:58:15 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
>-Bundle-Version: 3.5.100.qualifier
>+Bundle-Version: 3.6.100.qualifier
> Bundle-ClassPath: e4-workbench.jar,
> compatibility.jar,
> .

Actions: View | Diff

Attachments on bug 206403: 146431 | 147924 | 148315