Attachment #27975 for bug #110317

View | Details | Raw Unified | Return to bug 110317 | Differences between

and this patch

Lines 13-19 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java (-3 / +3 lines)
13	import org.eclipse.jface.resource.ImageDescriptor;	13	import org.eclipse.jface.resource.ImageDescriptor;
14	import org.eclipse.ui.IWorkbenchPage;	14	import org.eclipse.ui.IWorkbenchPage;
15	import org.eclipse.ui.IWorkbenchPart;	15	import org.eclipse.ui.IWorkbenchPart;
16	import org.eclipse.ui.help.WorkbenchHelp;	16	import org.eclipse.ui.PlatformUI;
17		17
18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 74-81 Link Here
74	setDisabledImageDescriptor(DISABLED_PRINT_IMAGE);	74	setDisabledImageDescriptor(DISABLED_PRINT_IMAGE);
75		75
76	/* set the context sensitive help */	76	/* set the context sensitive help */
77	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	77	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
78		78
79	super.init();	79	super.init();
80	}	80	}
81		81

Lines 13-19 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCloseAction.java (-2 / +3 lines)
13		13
14	import org.eclipse.ui.IWorkbenchPage;	14	import org.eclipse.ui.IWorkbenchPage;
15	import org.eclipse.ui.IWorkbenchPart;	15	import org.eclipse.ui.IWorkbenchPart;
16	import org.eclipse.ui.help.WorkbenchHelp;	16	import org.eclipse.ui.PlatformUI;
17		17
18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 59-65 Link Here
59	// Do not define image descriptors. The "Close" action does not have one.	59	// Do not define image descriptors. The "Close" action does not have one.
60		60
61	// Set the context sensitive help	61	// Set the context sensitive help
62	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	62	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		63
63	super.init();	64	super.init();
64	}	65	}
65		66

Lines 15-21 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCopyAction.java (-2 / +3 lines)
15	import org.eclipse.jface.resource.ImageDescriptor;	15	import org.eclipse.jface.resource.ImageDescriptor;
16	import org.eclipse.ui.IWorkbenchPage;	16	import org.eclipse.ui.IWorkbenchPage;
17	import org.eclipse.ui.IWorkbenchPart;	17	import org.eclipse.ui.IWorkbenchPart;
18	import org.eclipse.ui.help.WorkbenchHelp;	18	import org.eclipse.ui.PlatformUI;
19		19
20	import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager;	20	import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager;
21	import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;	21	import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;
Lines 90-96 Link Here
90	setDisabledImageDescriptor(DISABLED_COPY_IMAGE);	90	setDisabledImageDescriptor(DISABLED_COPY_IMAGE);
91		91
92	/* set the context sensitive help */	92	/* set the context sensitive help */
93	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	93	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		94
94	super.init();	95	super.init();
95	}	96	}
96		97

Lines 15-21 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCutAction.java (-2 / +3 lines)
15	import org.eclipse.jface.resource.ImageDescriptor;	15	import org.eclipse.jface.resource.ImageDescriptor;
16	import org.eclipse.ui.IWorkbenchPage;	16	import org.eclipse.ui.IWorkbenchPage;
17	import org.eclipse.ui.IWorkbenchPart;	17	import org.eclipse.ui.IWorkbenchPart;
18	import org.eclipse.ui.help.WorkbenchHelp;	18	import org.eclipse.ui.PlatformUI;
19		19
20	import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager;	20	import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager;
21	import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;	21	import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;
Lines 88-94 Link Here
88	setDisabledImageDescriptor(DISABLED_CUT_IMAGE);	88	setDisabledImageDescriptor(DISABLED_CUT_IMAGE);
89		89
90	/* set the context sensitive help */	90	/* set the context sensitive help */
91	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	91	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		92
92	super.init();	93	super.init();
93	}	94	}
94		95

Lines 14-20 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalDeleteAction.java (-2 / +3 lines)
14	import org.eclipse.jface.resource.ImageDescriptor;	14	import org.eclipse.jface.resource.ImageDescriptor;
15	import org.eclipse.ui.IWorkbenchPage;	15	import org.eclipse.ui.IWorkbenchPage;
16	import org.eclipse.ui.IWorkbenchPart;	16	import org.eclipse.ui.IWorkbenchPart;
17	import org.eclipse.ui.help.WorkbenchHelp;	17	import org.eclipse.ui.PlatformUI;
18		18
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 85-91 Link Here
85	setDisabledImageDescriptor(DISABLED_DELETE_IMAGE);	85	setDisabledImageDescriptor(DISABLED_DELETE_IMAGE);
86		86
87	/* Set the context sensitive help */	87	/* Set the context sensitive help */
88	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	88	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		89
89	super.init();	90	super.init();
90	}	91	}
91		92

Lines 13-19 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalFindAction.java (-3 / +3 lines)
13		13
14	import org.eclipse.ui.IWorkbenchPage;	14	import org.eclipse.ui.IWorkbenchPage;
15	import org.eclipse.ui.IWorkbenchPart;	15	import org.eclipse.ui.IWorkbenchPart;
16	import org.eclipse.ui.help.WorkbenchHelp;	16	import org.eclipse.ui.PlatformUI;
17		17
18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 64-71 Link Here
64	setText(FIND_TEXT);	64	setText(FIND_TEXT);
65		65
66	/* set the context sensitive help */	66	/* set the context sensitive help */
67	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	67	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
68		68
69	super.init();	69	super.init();
70	}	70	}
71		71

Lines 14-20 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalMoveAction.java (-2 / +3 lines)
14	import org.eclipse.jface.resource.ImageDescriptor;	14	import org.eclipse.jface.resource.ImageDescriptor;
15	import org.eclipse.ui.IWorkbenchPage;	15	import org.eclipse.ui.IWorkbenchPage;
16	import org.eclipse.ui.IWorkbenchPart;	16	import org.eclipse.ui.IWorkbenchPart;
17	import org.eclipse.ui.help.WorkbenchHelp;	17	import org.eclipse.ui.PlatformUI;
18		18
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 85-91 Link Here
85	setDisabledImageDescriptor(DISABLED_MOVE_IMAGE);	85	setDisabledImageDescriptor(DISABLED_MOVE_IMAGE);
86		86
87	/* set the context sensitive help */	87	/* set the context sensitive help */
88	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	88	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		89
89	super.init();	90	super.init();
90	}	91	}
91		92

Lines 13-19 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalOpenAction.java (-2 / +3 lines)
13		13
14	import org.eclipse.ui.IWorkbenchPage;	14	import org.eclipse.ui.IWorkbenchPage;
15	import org.eclipse.ui.IWorkbenchPart;	15	import org.eclipse.ui.IWorkbenchPart;
16	import org.eclipse.ui.help.WorkbenchHelp;	16	import org.eclipse.ui.PlatformUI;
17		17
18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 65-71 Link Here
65	/* Do not define image dewscriptors. The "Open" command does not have them. */	65	/* Do not define image dewscriptors. The "Open" command does not have them. */
66		66
67	/* Set the context sensitive help */	67	/* Set the context sensitive help */
68	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	68	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		69
69	super.init();	70	super.init();
70	}	71	}
71		72




import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;

import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;

        setDisabledImageDescriptor(DISABLED_PASTE_IMAGE);

        /* set the context sensitive help */
        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		
        super.init();
    }

    /* (non-Javadoc)

Lines 13-19 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPropertiesAction.java (-2 / +3 lines)
13		13
14	import org.eclipse.ui.IWorkbenchPage;	14	import org.eclipse.ui.IWorkbenchPage;
15	import org.eclipse.ui.IWorkbenchPart;	15	import org.eclipse.ui.IWorkbenchPart;
16	import org.eclipse.ui.help.WorkbenchHelp;	16	import org.eclipse.ui.PlatformUI;
17		17
18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 65-71 Link Here
65	setText(PROPERTIES_TEXT);	65	setText(PROPERTIES_TEXT);
66		66
67	/* set the context sensitive help */	67	/* set the context sensitive help */
68	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	68	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		69
69	super.init();	70	super.init();
70	}	71	}
71		72

Lines 17-23 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRedoAction.java (-2 / +3 lines)
17	import org.eclipse.jface.resource.ImageDescriptor;	17	import org.eclipse.jface.resource.ImageDescriptor;
18	import org.eclipse.ui.IWorkbenchPage;	18	import org.eclipse.ui.IWorkbenchPage;
19	import org.eclipse.ui.IWorkbenchPart;	19	import org.eclipse.ui.IWorkbenchPart;
20	import org.eclipse.ui.help.WorkbenchHelp;	20	import org.eclipse.ui.PlatformUI;
21		21
22	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	22	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
23	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	23	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 97-103 Link Here
97	setDisabledImageDescriptor(DISABLED_REDO_IMAGE);	97	setDisabledImageDescriptor(DISABLED_REDO_IMAGE);
98		98
99	/* Set the context sensitive help */	99	/* Set the context sensitive help */
100	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	100	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		101
101	super.init();	102	super.init();
102	}	103	}
103		104

Lines 14-20 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRefreshAction.java (-2 / +3 lines)
14	import org.eclipse.jface.resource.ImageDescriptor;	14	import org.eclipse.jface.resource.ImageDescriptor;
15	import org.eclipse.ui.IWorkbenchPage;	15	import org.eclipse.ui.IWorkbenchPage;
16	import org.eclipse.ui.IWorkbenchPart;	16	import org.eclipse.ui.IWorkbenchPart;
17	import org.eclipse.ui.help.WorkbenchHelp;	17	import org.eclipse.ui.PlatformUI;
18		18
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 86-92 Link Here
86	setDisabledImageDescriptor(DISABLED_REFRESH_IMAGE);	86	setDisabledImageDescriptor(DISABLED_REFRESH_IMAGE);
87		87
88	/* set the context sensitive help */	88	/* set the context sensitive help */
89	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	89	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		90
90	super.init();	91	super.init();
91	}	92	}
92		93

Lines 14-20 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRenameAction.java (-2 / +3 lines)
14	import org.eclipse.jface.resource.ImageDescriptor;	14	import org.eclipse.jface.resource.ImageDescriptor;
15	import org.eclipse.ui.IWorkbenchPage;	15	import org.eclipse.ui.IWorkbenchPage;
16	import org.eclipse.ui.IWorkbenchPart;	16	import org.eclipse.ui.IWorkbenchPart;
17	import org.eclipse.ui.help.WorkbenchHelp;	17	import org.eclipse.ui.PlatformUI;
18		18
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 85-91 Link Here
85	setDisabledImageDescriptor(DISABLED_RENAME_IMAGE);	85	setDisabledImageDescriptor(DISABLED_RENAME_IMAGE);
86		86
87	/* set the context sensitive help */	87	/* set the context sensitive help */
88	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	88	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		89
89	super.init();	90	super.init();
90	}	91	}
91		92

Lines 14-20 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSaveAction.java (-2 / +3 lines)
14	import org.eclipse.jface.resource.ImageDescriptor;	14	import org.eclipse.jface.resource.ImageDescriptor;
15	import org.eclipse.ui.IWorkbenchPage;	15	import org.eclipse.ui.IWorkbenchPage;
16	import org.eclipse.ui.IWorkbenchPart;	16	import org.eclipse.ui.IWorkbenchPart;
17	import org.eclipse.ui.help.WorkbenchHelp;	17	import org.eclipse.ui.PlatformUI;
18		18
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	20	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 86-92 Link Here
86	setDisabledImageDescriptor(DISABLED_SAVE_IMAGE);	86	setDisabledImageDescriptor(DISABLED_SAVE_IMAGE);
87		87
88	/* Set the context sensitive help */	88	/* Set the context sensitive help */
89	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	89	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		90
90	super.init();	91	super.init();
91	}	92	}
92		93

Lines 13-19 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSelectAllAction.java (-2 / +3 lines)
13		13
14	import org.eclipse.ui.IWorkbenchPage;	14	import org.eclipse.ui.IWorkbenchPage;
15	import org.eclipse.ui.IWorkbenchPart;	15	import org.eclipse.ui.IWorkbenchPart;
16	import org.eclipse.ui.help.WorkbenchHelp;	16	import org.eclipse.ui.PlatformUI;
17		17
18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	18	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	19	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 66-72 Link Here
66	setText(SELECT_ALL_TEXT);	66	setText(SELECT_ALL_TEXT);
67		67
68	/* Set the context sensitive help */	68	/* Set the context sensitive help */
69	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	69	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		70
70	super.init();	71	super.init();
71	}	72	}
72		73

Lines 17-23 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalUndoAction.java (-2 / +3 lines)
17	import org.eclipse.jface.resource.ImageDescriptor;	17	import org.eclipse.jface.resource.ImageDescriptor;
18	import org.eclipse.ui.IWorkbenchPage;	18	import org.eclipse.ui.IWorkbenchPage;
19	import org.eclipse.ui.IWorkbenchPart;	19	import org.eclipse.ui.IWorkbenchPart;
20	import org.eclipse.ui.help.WorkbenchHelp;	20	import org.eclipse.ui.PlatformUI;
21		21
22	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;	22	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
23	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;	23	import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
Lines 98-104 Link Here
98	setDisabledImageDescriptor(DISABLED_UNDO_IMAGE);	98	setDisabledImageDescriptor(DISABLED_UNDO_IMAGE);
99		99
100	/* Set the context sensitive help */	100	/* Set the context sensitive help */
101	WorkbenchHelp.setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);	101	PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
		102
102	super.init();	103	super.init();
103	}	104	}
104		105

Return to bug 110317