Attachment #147924 for bug #206403

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

Lines 169-172 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java (+7 lines)
169	void setAnimationContainer(IAnimationContainer container) {	169	void setAnimationContainer(IAnimationContainer container) {
170	this.animationContainer = container;	170	this.animationContainer = container;
171	}	171	}
		172
		173	/**
		174	* @return Returns the window.
		175	*/
		176	public WorkbenchWindow getWindow() {
		177	return window;
		178	}
172	}	179	}

Lines 10-18 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java (-22 / +63 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.internal.progress;	11	package org.eclipse.ui.internal.progress;
12		12
		13	import org.eclipse.core.commands.ExecutionException;
		14	import org.eclipse.core.commands.NotEnabledException;
		15	import org.eclipse.core.commands.NotHandledException;
		16	import org.eclipse.core.commands.common.NotDefinedException;
13	import org.eclipse.core.runtime.IStatus;	17	import org.eclipse.core.runtime.IStatus;
		18	import org.eclipse.core.runtime.Status;
14	import org.eclipse.core.runtime.jobs.Job;	19	import org.eclipse.core.runtime.jobs.Job;
15	import org.eclipse.jface.action.IAction;	20	import org.eclipse.jface.action.IAction;
		21	import org.eclipse.jface.dialogs.ErrorDialog;
16	import org.eclipse.jface.util.Util;	22	import org.eclipse.jface.util.Util;
17	import org.eclipse.osgi.util.NLS;	23	import org.eclipse.osgi.util.NLS;
18	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
Lines 35-41 Link Here
35	import org.eclipse.swt.widgets.ProgressBar;	41	import org.eclipse.swt.widgets.ProgressBar;
36	import org.eclipse.swt.widgets.ToolBar;	42	import org.eclipse.swt.widgets.ToolBar;
37	import org.eclipse.swt.widgets.ToolItem;	43	import org.eclipse.swt.widgets.ToolItem;
		44	import org.eclipse.ui.IWorkbenchWindow;
38	import org.eclipse.ui.PlatformUI;	45	import org.eclipse.ui.PlatformUI;
		46	import org.eclipse.ui.handlers.IHandlerService;
39	import org.eclipse.ui.internal.WorkbenchImages;	47	import org.eclipse.ui.internal.WorkbenchImages;
40	import org.eclipse.ui.progress.IProgressConstants;	48	import org.eclipse.ui.progress.IProgressConstants;
41	import org.eclipse.ui.statushandlers.StatusAdapter;	49	import org.eclipse.ui.statushandlers.StatusAdapter;
Lines 109-138 Link Here
109	StatusManager.getManager().handle(statusAdapter,	117	StatusManager.getManager().handle(statusAdapter,
110	StatusManager.SHOW);	118	StatusManager.SHOW);
111		119
112	JobTreeElement topElement = (JobTreeElement) ji	120	removeTopElement(ji);
113	.getParent();
114	if (topElement == null) {
115	topElement = ji;
116	}
117	FinishedJobs.getInstance().remove(topElement);
118	}	121	}
119		122
120	IAction action = null;	123	execute(ji, job);
121	Object property = job
122	.getProperty(IProgressConstants.ACTION_PROPERTY);
123	if (property instanceof IAction) {
124	action = (IAction) property;
125	}
126	if (action != null && action.isEnabled()) {
127	action.run();
128	JobTreeElement topElement = (JobTreeElement) ji
129	.getParent();
130	if (topElement == null) {
131	topElement = ji;
132	}
133	FinishedJobs.getInstance().remove(topElement);
134	return;
135	}
136	}	124	}
137	}	125	}
138	}	126	}
Lines 141-146 Link Here
141	refresh();	129	refresh();
142	}	130	}
143		131
		132	/**
		133	* @param ji
		134	* @param job
		135	*/
		136	private void execute(JobInfo ji, Job job) {
		137
		138	Object prop = job.getProperty(IProgressConstants.ACTION_PROPERTY);
		139	if (prop instanceof IAction && ((IAction) prop).isEnabled()) {
		140	IAction action = (IAction) prop;
		141	action.run();
		142	removeTopElement(ji);
		143	}
		144
		145	prop = job.getProperty(IProgressConstants.COMMAND_PROPERTY);
		146	if (prop instanceof String) {
		147	String commandId = (String) prop;
		148	IWorkbenchWindow window = getWindow();
		149	IHandlerService service = (IHandlerService) window
		150	.getService(IHandlerService.class);
		151	Exception exception = null;
		152	try {
		153	service.executeCommand(commandId, null);
		154	removeTopElement(ji);
		155	} catch (ExecutionException e) {
		156	exception = e;
		157	} catch (NotDefinedException e) {
		158	exception = e;
		159	} catch (NotEnabledException e) {
		160	exception = e;
		161	} catch (NotHandledException e) {
		162	exception = e;
		163	}
		164
		165	if (exception != null) {
		166	Status status = new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID,
		167	exception.getMessage(), exception);
		168	ErrorDialog.openError(window.getShell(), "", "", status); //$NON-NLS-1$//$NON-NLS-2$
		169	}
		170
		171	}
		172	}
		173
		174	/**
		175	* @param ji
		176	*/
		177	private void removeTopElement(JobInfo ji) {
		178	JobTreeElement topElement = (JobTreeElement) ji.getParent();
		179	if (topElement == null) {
		180	topElement = ji;
		181	}
		182	FinishedJobs.getInstance().remove(topElement);
		183	}
		184
144	private IAction getAction(Job job) {	185	private IAction getAction(Job job) {
145	Object property = job.getProperty(IProgressConstants.ACTION_PROPERTY);	186	Object property = job.getProperty(IProgressConstants.ACTION_PROPERTY);
146	if (property instanceof IAction) {	187	if (property instanceof IAction) {

Lines 16-23 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java (-38 / +100 lines)
16	import java.util.Date;	16	import java.util.Date;
17	import java.util.Iterator;	17	import java.util.Iterator;
18	import java.util.List;	18	import java.util.List;
		19	import org.eclipse.core.commands.ExecutionException;
		20	import org.eclipse.core.commands.NotEnabledException;
		21	import org.eclipse.core.commands.NotHandledException;
		22	import org.eclipse.core.commands.common.NotDefinedException;
19	import org.eclipse.core.runtime.IProgressMonitor;	23	import org.eclipse.core.runtime.IProgressMonitor;
20	import org.eclipse.core.runtime.IStatus;	24	import org.eclipse.core.runtime.IStatus;
		25	import org.eclipse.core.runtime.Status;
21	import org.eclipse.core.runtime.jobs.Job;	26	import org.eclipse.core.runtime.jobs.Job;
22	import org.eclipse.jface.action.IAction;	27	import org.eclipse.jface.action.IAction;
23	import org.eclipse.jface.dialogs.Dialog;	28	import org.eclipse.jface.dialogs.Dialog;
Lines 50-56 Link Here
50	import org.eclipse.swt.widgets.ToolBar;	55	import org.eclipse.swt.widgets.ToolBar;
51	import org.eclipse.swt.widgets.ToolItem;	56	import org.eclipse.swt.widgets.ToolItem;
52	import org.eclipse.ui.PlatformUI;	57	import org.eclipse.ui.PlatformUI;
		58	import org.eclipse.ui.handlers.IHandlerService;
53	import org.eclipse.ui.internal.WorkbenchImages;	59	import org.eclipse.ui.internal.WorkbenchImages;
		60	import org.eclipse.ui.internal.WorkbenchPlugin;
54	import org.eclipse.ui.progress.IProgressConstants;	61	import org.eclipse.ui.progress.IProgressConstants;
55		62
56	/**	63	/**
Lines 93-99 Link Here
93		100
94	private static final String TEXT_KEY = "Text"; //$NON-NLS-1$	101	private static final String TEXT_KEY = "Text"; //$NON-NLS-1$
95		102
96	private static final String ACTION_KEY = "Action";//$NON-NLS-1$	103	private static final String TRIGGER_KEY = "Trigger";//$NON-NLS-1$
		104
		105	boolean triggerWarningLogged = false;
97		106
98	interface IndexListener {	107	interface IndexListener {
99	/**	108	/**
Lines 124-129 Link Here
124		133
125	private ResourceManager resourceManager;	134	private ResourceManager resourceManager;
126		135
		136	private Link link;
		137
127	static {	138	static {
128	JFaceResources	139	JFaceResources
129	.getImageRegistry()	140	.getImageRegistry()
Lines 222-237 Link Here
222	// busy	233	// busy
223		234
224	// cursor we might have	235	// cursor we might have
225	actionButton = new ToolItem(actionBar, SWT.NONE);	236	if (info.isCancellable()) {
226	actionButton	237	actionButton = new ToolItem(actionBar, SWT.NONE);
227	.setToolTipText(ProgressMessages.NewProgressView_CancelJobToolTip);	238	actionButton
228	actionButton.addSelectionListener(new SelectionAdapter() {	239	.setToolTipText(ProgressMessages.NewProgressView_CancelJobToolTip);
229	public void widgetSelected(SelectionEvent e) {	240	actionButton.addSelectionListener(new SelectionAdapter() {
230	actionButton.setEnabled(false);	241	public void widgetSelected(SelectionEvent e) {
231	cancelOrRemove();	242	actionButton.setEnabled(false);
232	}	243	cancelOrRemove();
233		244	}
234	});	245	});
		246	}
		247
235	actionBar.addListener(SWT.Traverse, new Listener() {	248	actionBar.addListener(SWT.Traverse, new Listener() {
236	/*	249	/*
237	* (non-Javadoc)	250	* (non-Javadoc)
Lines 654-659 Link Here
654	*	667	*
655	*/	668	*/
656	private void updateToolBarValues() {	669	private void updateToolBarValues() {
		670	if (actionButton == null) {
		671	return;
		672	}
657	if (isCompleted()) {	673	if (isCompleted()) {
658	actionButton.setImage(JFaceResources	674	actionButton.setImage(JFaceResources
659	.getImage(CLEAR_FINISHED_JOB_KEY));	675	.getImage(CLEAR_FINISHED_JOB_KEY));
Lines 726-732 Link Here
726	*/	742	*/
727	void setLinkText(Job linkJob, String taskString, int index) {	743	void setLinkText(Job linkJob, String taskString, int index) {
728		744
729	Link link;
730	if (index >= taskEntries.size()) {// Is it new?	745	if (index >= taskEntries.size()) {// Is it new?
731	link = new Link(this, SWT.NONE);	746	link = new Link(this, SWT.NONE);
732		747
Lines 754-761 Link Here
754		769
755	link.setLayoutData(linkData);	770	link.setLayoutData(linkData);
756		771
757	final Link finalLink = link;
758
759	link.addSelectionListener(new SelectionAdapter() {	772	link.addSelectionListener(new SelectionAdapter() {
760	/*	773	/*
761	* (non-Javadoc)	774	* (non-Javadoc)
Lines 764-780 Link Here
764	*/	777	*/
765	public void widgetSelected(SelectionEvent e) {	778	public void widgetSelected(SelectionEvent e) {
766		779
767	IAction action = (IAction) finalLink.getData(ACTION_KEY);	780	executeTrigger();
768	action.run();
769
770	updateAction(action, finalLink);
771
772	Object text = finalLink.getData(TEXT_KEY);
773	if (text == null)
774	return;
775
776	// Refresh the text as enablement might have changed
777	updateText((String) text, finalLink);
778	}	781	}
779	});	782	});
780		783
Lines 786-796 Link Here
786	*/	789	*/
787	public void handleEvent(Event event) {	790	public void handleEvent(Event event) {
788		791
789	Object text = finalLink.getData(TEXT_KEY);	792	Object text = link.getData(TEXT_KEY);
790	if (text == null)	793	if (text == null)
791	return;	794	return;
792		795
793	updateText((String) text, finalLink);	796	updateText((String) text, link);
794		797
795	}	798	}
796	});	799	});
Lines 803-830 Link Here
803	link.setData(TEXT_KEY, taskString);	806	link.setData(TEXT_KEY, taskString);
804		807
805	// check for action property	808	// check for action property
806	Object property = linkJob	809	Object actionProperty = linkJob
807	.getProperty(IProgressConstants.ACTION_PROPERTY);	810	.getProperty(IProgressConstants.ACTION_PROPERTY);
808	updateAction(property, link);	811	Object commandProperty = linkJob
		812	.getProperty(IProgressConstants.COMMAND_PROPERTY);
		813
		814	if (actionProperty != null && commandProperty != null) {
		815	// if both are specified, then use neither
		816	updateAction(null, link);
		817	} else {
		818	Object property = actionProperty == null ? commandProperty
		819	: actionProperty;
		820	updateAction(property, link);
		821	}
809		822
810	updateText(taskString, link);	823	updateText(taskString, link);
811		824
812	}	825	}
813		826
		827	public void executeTrigger() {
		828
		829	Object data = link.getData(TRIGGER_KEY);
		830	if (data instanceof IAction) {
		831	IAction action = (IAction) data;
		832	action.run();
		833	updateAction(action, link);
		834	} else if (data instanceof String) {
		835	IHandlerService handlerService = (IHandlerService) PlatformUI
		836	.getWorkbench().getService(IHandlerService.class);
		837	IStatus status = Status.OK_STATUS;
		838	try {
		839	handlerService.executeCommand((String) data, null);
		840	} catch (ExecutionException e) {
		841	status = new Status(
		842	IStatus.ERROR,
		843	PlatformUI.PLUGIN_ID,
		844	"An error occured while executing the command specified on the Job", e); //$NON-NLS-1$
		845	} catch (NotDefinedException e) {
		846	status = new Status(
		847	IStatus.ERROR,
		848	PlatformUI.PLUGIN_ID,
		849	"An error occured while executing the command specified on the Job", e); //$NON-NLS-1$
		850	} catch (NotEnabledException e) {
		851	status = new Status(IStatus.WARNING, PlatformUI.PLUGIN_ID,
		852	"The command specified on the job is not disabled", e); //$NON-NLS-1$
		853	} catch (NotHandledException e) {
		854	status = new Status(
		855	IStatus.ERROR,
		856	PlatformUI.PLUGIN_ID,
		857	"An error occured while executing the command specified on the Job", e); //$NON-NLS-1$
		858	}
		859
		860	if (!status.isOK()) {
		861	WorkbenchPlugin.log(status);
		862	}
		863	}
		864
		865	Object text = link.getData(TEXT_KEY);
		866	if (text == null)
		867	return;
		868
		869	// Refresh the text as enablement might have changed
		870	updateText((String) text, link);
		871	}
		872
814	/**	873	/**
815	* Update the action key if action is enabled or remove it if not	874	* Update the trigger key if either action is available and enabled or
		875	* command is available
816	*	876	*
817	* @param action	877	* @param trigger
818	* {@link Object} or <code>null</code>	878	* {@link Object} or <code>null</code>
819	* @param link	879	* @param link
820	*/	880	*/
821	private void updateAction(Object action, Link link) {	881	private void updateAction(Object trigger, Link link) {
822		882
823	if (action != null && action instanceof IAction	883	if (trigger instanceof IAction && ((IAction) trigger).isEnabled()) {
824	&& ((IAction) action).isEnabled())	884	link.setData(TRIGGER_KEY, trigger);
825	link.setData(ACTION_KEY, action);	885	} else if (trigger instanceof String) {
826	else	886	link.setData(TRIGGER_KEY, trigger);
827	link.setData(ACTION_KEY, null);	887	} else {
		888	link.setData(TRIGGER_KEY, null);
		889	}
828		890
829	}	891	}
830		892
Lines 838-844 Link Here
838	taskString = Dialog.shortenText(taskString, link);	900	taskString = Dialog.shortenText(taskString, link);
839		901
840	// Put in a hyperlink if there is an action	902	// Put in a hyperlink if there is an action
841	link.setText(link.getData(ACTION_KEY) == null ? taskString : NLS.bind(	903	link.setText(link.getData(TRIGGER_KEY) == null ? taskString : NLS.bind(
842	"<a>{0}</a>", taskString));//$NON-NLS-1$	904	"<a>{0}</a>", taskString));//$NON-NLS-1$
843	}	905	}
844		906




<?xml version="1.0" encoding="UTF-8"?>
<component id="org.eclipse.ui.workbench" version="2">
<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>




    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.
  	 * <p>
  	 * The progress UI will track the enabled state of the action and its
  	 * tooltip text.
  	 * </p>
  	 * <p>
  	 * 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.
  	 * </p>
  	 * <p>
  	 * Note: Only one of <code>ACTION_PROPERTY</code> or
  	 * <code>COMMAND_PROPERTY</code> should be used
  	 * </p>
  	 * 
  	 * @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.
	 * <p>
	 * Note: Only one of <code>ACTION_PROPERTY</code> or
	 * <code>COMMAND_PROPERTY</code> should be used
	 * </p>
	 * 
	 * @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

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true	4	Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
5	Bundle-Version: 3.5.100.qualifier	5	Bundle-Version: 3.6.100.qualifier
6	Bundle-ClassPath: e4-workbench.jar,	6	Bundle-ClassPath: e4-workbench.jar,
7	compatibility.jar,	7	compatibility.jar,
8	.	8	.

Return to bug 206403

Lines 1-72 Link Here

(-).settings/.api_filters (-69 / +77 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<component id="org.eclipse.ui.workbench" version="2">	2	<component id="org.eclipse.ui.workbench" version="2">
3	<resource path="Eclipse UI/org/eclipse/ui/services/IEvaluationReference.java" type="org.eclipse.ui.services.IEvaluationReference">	3	<resource path="Eclipse UI/org/eclipse/ui/branding/IBundleGroupConstants.java" type="org.eclipse.ui.branding.IBundleGroupConstants">
4	<filter id="403853384">	4	<filter id="403767336">
5	<message_arguments>	5	<message_arguments>
6	<message_argument value="org.eclipse.ui.services.IEvaluationReference"/>	6	<message_argument value="org.eclipse.ui.branding.IBundleGroupConstants"/>
7	</message_arguments>	7	<message_argument value="BRANDING_BUNDLE_ID"/>
8	</filter>	8	</message_arguments>
9	</resource>	9	</filter>
10	<resource path="Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java" type="org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager">	10	<filter id="403767336">
11	<filter id="336744520">	11	<message_arguments>
12	<message_arguments>	12	<message_argument value="org.eclipse.ui.branding.IBundleGroupConstants"/>
13	<message_argument value="org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager"/>	13	<message_argument value="BRANDING_BUNDLE_VERSION"/>
14	</message_arguments>	14	</message_arguments>
15	</filter>	15	</filter>
16	</resource>	16	</resource>
17	<resource path="Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java" type="org.eclipse.ui.part.MultiPageEditorPart">	17	<resource path="Eclipse UI/org/eclipse/ui/menus/CommandContributionItemParameter.java" type="org.eclipse.ui.menus.CommandContributionItemParameter">
18	<filter id="420630660">	18	<filter id="338948223">
19	<message_arguments>	19	<message_arguments>
20	<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>	20	<message_argument value="org.eclipse.ui.menus.CommandContributionItemParameter"/>
21	<message_argument value="getActivePage()"/>	21	<message_argument value="CommandContributionItemParameter(IServiceLocator, String, String, Map, ImageDescriptor, ImageDescriptor, ImageDescriptor, String, String, String, int, String, boolean)"/>
22	</message_arguments>	22	</message_arguments>
23	</filter>	23	</filter>
24	<filter id="421679236">	24	</resource>
25	<message_arguments>	25	<resource path="Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java" type="org.eclipse.ui.part.MultiPageEditorPart">
26	<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>	26	<filter id="420630660">
27	<message_argument value="getActiveEditor()"/>	27	<message_arguments>
28	</message_arguments>	28	<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
29	</filter>	29	<message_argument value="getActivePage()"/>
30	<filter id="421679236">	30	</message_arguments>
31	<message_arguments>	31	</filter>
32	<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>	32	<filter id="420630660">
33	<message_argument value="getActivePage()"/>	33	<message_arguments>
34	</message_arguments>	34	<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
35	</filter>	35	<message_argument value="getActiveEditor()"/>
36	<filter id="420630660">	36	</message_arguments>
37	<message_arguments>	37	</filter>
38	<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>	38	<filter id="421679236">
39	<message_argument value="getActiveEditor()"/>	39	<message_arguments>
40	</message_arguments>	40	<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
41	</filter>	41	<message_argument value="getActivePage()"/>
42	</resource>	42	</message_arguments>
43	<resource path="Eclipse UI/org/eclipse/ui/branding/IBundleGroupConstants.java" type="org.eclipse.ui.branding.IBundleGroupConstants">	43	</filter>
44	<filter id="403767336">	44	<filter id="421679236">
45	<message_arguments>	45	<message_arguments>
46	<message_argument value="org.eclipse.ui.branding.IBundleGroupConstants"/>	46	<message_argument value="org.eclipse.ui.part.MultiPageEditorPart"/>
47	<message_argument value="BRANDING_BUNDLE_ID"/>	47	<message_argument value="getActiveEditor()"/>
48	</message_arguments>	48	</message_arguments>
49	</filter>	49	</filter>
50	<filter id="403767336">	50	</resource>
51	<message_arguments>	51	<resource path="Eclipse UI/org/eclipse/ui/progress/IProgressConstants.java" type="org.eclipse.ui.progress.IProgressConstants">
52	<message_argument value="org.eclipse.ui.branding.IBundleGroupConstants"/>	52	<filter id="403767336">
53	<message_argument value="BRANDING_BUNDLE_VERSION"/>	53	<message_arguments>
54	</message_arguments>	54	<message_argument value="org.eclipse.ui.progress.IProgressConstants"/>
55	</filter>	55	<message_argument value="COMMAND_PROPERTY"/>
56	</resource>	56	</message_arguments>
57	<resource path="Eclipse UI/org/eclipse/ui/menus/CommandContributionItemParameter.java" type="org.eclipse.ui.menus.CommandContributionItemParameter">	57	</filter>
58	<filter id="338948223">	58	</resource>
59	<message_arguments>	59	<resource path="Eclipse UI/org/eclipse/ui/services/IEvaluationReference.java" type="org.eclipse.ui.services.IEvaluationReference">
60	<message_argument value="org.eclipse.ui.menus.CommandContributionItemParameter"/>	60	<filter id="403853384">
61	<message_argument value="CommandContributionItemParameter(IServiceLocator, String, String, Map, ImageDescriptor, ImageDescriptor, ImageDescriptor, String, String, String, int, String, boolean)"/>	61	<message_arguments>
62	</message_arguments>	62	<message_argument value="org.eclipse.ui.services.IEvaluationReference"/>
63	</filter>	63	</message_arguments>
64	</resource>	64	</filter>
65	<resource path="Eclipse UI/org/eclipse/ui/services/IServiceScopes.java" type="org.eclipse.ui.services.IServiceScopes">	65	</resource>
66	<filter id="403853384">	66	<resource path="Eclipse UI/org/eclipse/ui/services/IServiceScopes.java" type="org.eclipse.ui.services.IServiceScopes">
67	<message_arguments>	67	<filter id="403853384">
68	<message_argument value="org.eclipse.ui.services.IServiceScopes"/>	68	<message_arguments>
69	</message_arguments>	69	<message_argument value="org.eclipse.ui.services.IServiceScopes"/>
70	</filter>	70	</message_arguments>
71	</resource>	71	</filter>
		72	</resource>
		73	<resource path="Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java" type="org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager">
		74	<filter id="336744520">
		75	<message_arguments>
		76	<message_argument value="org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager"/>
		77	</message_arguments>
		78	</filter>
		79	</resource>
72	</component>	80	</component>

Lines 63-87 Link Here

(-)Eclipse UI/org/eclipse/ui/progress/IProgressConstants.java (-16 / +38 lines)
63	public static final QualifiedName KEEPONE_PROPERTY = new QualifiedName(	63	public static final QualifiedName KEEPONE_PROPERTY = new QualifiedName(
64	PROPERTY_PREFIX, "keepone"); //$NON-NLS-1$	64	PROPERTY_PREFIX, "keepone"); //$NON-NLS-1$
65		65
66	/**	66	/**
67	* This property is used to associate an <code>IAction</code> with a Job.	67	* This property is used to associate an <code>IAction</code> with a Job. If
68	* If the Job is shown in the UI, the action might be represented as a button or	68	* the Job is shown in the UI, the action might be represented as a button
69	* hyper link to allow the user to trigger a job specific action, like showing	69	* or hyper link to allow the user to trigger a job specific action, like
70	* the Job's results.	70	* showing the Job's results.
71	* <p>	71	* <p>
72	* The progress UI will track the enabled state of the action and its tooltip text.	72	* The progress UI will track the enabled state of the action and its
73	* </p>	73	* tooltip text.
74	* <p>	74	* </p>
75	* If the action implements <code>ActionFactory.IWorkbenchAction</code>, its	75	* <p>
76	* <code>dispose</code> method will be called as soon as the Job is finally	76	* If the action implements <code>ActionFactory.IWorkbenchAction</code>, its
77	* removed from the set of kept jobs.	77	* <code>dispose</code> method will be called as soon as the Job is finally
78	* </p>	78	* removed from the set of kept jobs.
79	* @see org.eclipse.jface.action.IAction	79	* </p>
80	* @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction	80	* <p>
81	**/	81	* Note: Only one of <code>ACTION_PROPERTY</code> or
		82	* <code>COMMAND_PROPERTY</code> should be used
		83	* </p>
		84	*
		85	* @see org.eclipse.jface.action.IAction
		86	* @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction
		87	**/
82	public static final QualifiedName ACTION_PROPERTY = new QualifiedName(	88	public static final QualifiedName ACTION_PROPERTY = new QualifiedName(
83	PROPERTY_PREFIX, "action"); //$NON-NLS-1$	89	PROPERTY_PREFIX, "action"); //$NON-NLS-1$
84		90
		91	/**
		92	* This property is used to associate an <code>Command</code>'s id with a
		93	* Job. If the Job is shown in the UI, the command might be represented as a
		94	* button or hyper link to allow the user to trigger a job specific action,
		95	* like showing the Job's results.
		96	* <p>
		97	* Note: Only one of <code>ACTION_PROPERTY</code> or
		98	* <code>COMMAND_PROPERTY</code> should be used
		99	* </p>
		100	*
		101	* @see org.eclipse.core.commands.Command
		102	* @since 3.6
		103	**/
		104	public static final QualifiedName COMMAND_PROPERTY = new QualifiedName(
		105	PROPERTY_PREFIX, "command"); //$NON-NLS-1$
		106
85	/**	107	/**
86	* This property is used to associate an <code>ImageDescriptor</code> with a Job.	108	* This property is used to associate an <code>ImageDescriptor</code> with a Job.
87	* If the Job is shown in the UI, this descriptor is used to create an icon that	109	* If the Job is shown in the UI, this descriptor is used to create an icon that