Attachment #1829 for bug #19702




import org.eclipse.ui.IWorkbenchSite;
import org.eclipse.ui.part.Page;
import org.eclipse.ui.texteditor.ConvertLineDelimitersAction;
import org.eclipse.ui.texteditor.IUpdate;
import org.eclipse.ui.actions.ActionGroup;
import org.eclipse.ui.actions.AddBookmarkAction;


public class GenerateActionGroup extends ActionGroup {
	
	private boolean fEditorIsOwner;
	private CompilationUnitEditor fEditor;
	private IWorkbenchSite fSite;
	private String fGroupName= IContextMenuConstants.GROUP_SOURCE;
	private List fRegisteredSelectionListeners;

	public GenerateActionGroup(CompilationUnitEditor editor, String groupName) {
		fSite= editor.getSite();
		fEditorIsOwner= true;
		fEditor= editor;
		fGroupName= groupName;
		ISelectionProvider provider= fSite.getSelectionProvider();
		ISelection selection= provider.getSelection();
	
		fAddImport= new AddImportOnSelectionAction(editor);
		fAddImport.setActionDefinitionId(IJavaEditorActionDefinitionIds.ADD_IMPORT);
		fAddImport.update();

		fOrganizeImports.setActionDefinitionId(IJavaEditorActionDefinitionIds.ORGANIZE_IMPORTS);
		fOrganizeImports.editorStateChanged();
		editor.setAction("OrganizeImports", fOrganizeImports); //$NON-NLS-1$
	
		fOverrideMethods= new OverrideMethodsAction(editor);
		fOverrideMethods.setActionDefinitionId(IJavaEditorActionDefinitionIds.OVERRIDE_METHODS);
		fOverrideMethods.editorStateChanged();

		fConvertToUNIX= new ConvertLineDelimitersAction(editor, "\n"); //$NON-NLS-1$
		fConvertToUNIX.setActionDefinitionId(IJavaEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_UNIX);
		editor.setAction("ConvertLineDelimitersToUNIX", fConvertToUNIX); //$NON-NLS-1$		
	
		fConvertToMac= new ConvertLineDelimitersAction(editor, "\r"); //$NON-NLS-1$
		fConvertToMac.setActionDefinitionId(IJavaEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_MAC);
		editor.setAction("ConvertLineDelimitersToMac", fConvertToMac); //$NON-NLS-1$		

	private IMenuManager createEditorSubMenu(IMenuManager mainMenu) {
		IMenuManager result= new MenuManager(ActionMessages.getString("SourceMenu.label")); //$NON-NLS-1$
		int added= 0;
		added+= addEditorAction(result, "Comment"); //$NON-NLS-1$
		added+= addEditorAction(result, "Uncomment"); //$NON-NLS-1$
		result.add(new Separator());
		added+= addAction(result, fOrganizeImports);
		added+= addAction(result, fAddImport);
		result.add(new Separator());

				provider.removeSelectionChangedListener(listener);
			}
		}
		fEditor= null;
		super.dispose();
	}
	


	private int addAction(IMenuManager menu, IAction action) {
		if (action != null && action.isEnabled()) {
			menu.add(action);
			return 1;
		}
		return 0;
	}	
	
	private int addEditorAction(IMenuManager menu, String actionID) {
		if (fEditor == null)
			return 0;
		IAction action= fEditor.getAction(actionID);
		if (action == null)
			return 0;
		if (action instanceof IUpdate)
			((IUpdate)action).update();
		if (action.isEnabled()) {
			menu.add(action);
			return 1;
		}

Return to bug 19702

Lines 31-36 Link Here

(-)GenerateActionGroup.java (-3 / +25 lines)
31	import org.eclipse.ui.IWorkbenchSite;	31	import org.eclipse.ui.IWorkbenchSite;
32	import org.eclipse.ui.part.Page;	32	import org.eclipse.ui.part.Page;
33	import org.eclipse.ui.texteditor.ConvertLineDelimitersAction;	33	import org.eclipse.ui.texteditor.ConvertLineDelimitersAction;
		34	import org.eclipse.ui.texteditor.IUpdate;
34	import org.eclipse.ui.actions.ActionGroup;	35	import org.eclipse.ui.actions.ActionGroup;
35	import org.eclipse.ui.actions.AddBookmarkAction;	36	import org.eclipse.ui.actions.AddBookmarkAction;
36		37
Lines 54-59 Link Here
54	public class GenerateActionGroup extends ActionGroup {	55	public class GenerateActionGroup extends ActionGroup {
55		56
56	private boolean fEditorIsOwner;	57	private boolean fEditorIsOwner;
		58	private CompilationUnitEditor fEditor;
57	private IWorkbenchSite fSite;	59	private IWorkbenchSite fSite;
58	private String fGroupName= IContextMenuConstants.GROUP_SOURCE;	60	private String fGroupName= IContextMenuConstants.GROUP_SOURCE;
59	private List fRegisteredSelectionListeners;	61	private List fRegisteredSelectionListeners;
Lines 81-90 Link Here
81	public GenerateActionGroup(CompilationUnitEditor editor, String groupName) {	83	public GenerateActionGroup(CompilationUnitEditor editor, String groupName) {
82	fSite= editor.getSite();	84	fSite= editor.getSite();
83	fEditorIsOwner= true;	85	fEditorIsOwner= true;
		86	fEditor= editor;
84	fGroupName= groupName;	87	fGroupName= groupName;
85	ISelectionProvider provider= fSite.getSelectionProvider();	88	ISelectionProvider provider= fSite.getSelectionProvider();
86	ISelection selection= provider.getSelection();	89	ISelection selection= provider.getSelection();
87		90
88	fAddImport= new AddImportOnSelectionAction(editor);	91	fAddImport= new AddImportOnSelectionAction(editor);
89	fAddImport.setActionDefinitionId(IJavaEditorActionDefinitionIds.ADD_IMPORT);	92	fAddImport.setActionDefinitionId(IJavaEditorActionDefinitionIds.ADD_IMPORT);
90	fAddImport.update();	93	fAddImport.update();
Lines 94-100 Link Here
94	fOrganizeImports.setActionDefinitionId(IJavaEditorActionDefinitionIds.ORGANIZE_IMPORTS);	97	fOrganizeImports.setActionDefinitionId(IJavaEditorActionDefinitionIds.ORGANIZE_IMPORTS);
95	fOrganizeImports.editorStateChanged();	98	fOrganizeImports.editorStateChanged();
96	editor.setAction("OrganizeImports", fOrganizeImports); //$NON-NLS-1$	99	editor.setAction("OrganizeImports", fOrganizeImports); //$NON-NLS-1$
97		100
98	fOverrideMethods= new OverrideMethodsAction(editor);	101	fOverrideMethods= new OverrideMethodsAction(editor);
99	fOverrideMethods.setActionDefinitionId(IJavaEditorActionDefinitionIds.OVERRIDE_METHODS);	102	fOverrideMethods.setActionDefinitionId(IJavaEditorActionDefinitionIds.OVERRIDE_METHODS);
100	fOverrideMethods.editorStateChanged();	103	fOverrideMethods.editorStateChanged();
Lines 131-137 Link Here
131	fConvertToUNIX= new ConvertLineDelimitersAction(editor, "\n"); //$NON-NLS-1$	134	fConvertToUNIX= new ConvertLineDelimitersAction(editor, "\n"); //$NON-NLS-1$
132	fConvertToUNIX.setActionDefinitionId(IJavaEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_UNIX);	135	fConvertToUNIX.setActionDefinitionId(IJavaEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_UNIX);
133	editor.setAction("ConvertLineDelimitersToUNIX", fConvertToUNIX); //$NON-NLS-1$	136	editor.setAction("ConvertLineDelimitersToUNIX", fConvertToUNIX); //$NON-NLS-1$
134		137
135	fConvertToMac= new ConvertLineDelimitersAction(editor, "\r"); //$NON-NLS-1$	138	fConvertToMac= new ConvertLineDelimitersAction(editor, "\r"); //$NON-NLS-1$
136	fConvertToMac.setActionDefinitionId(IJavaEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_MAC);	139	fConvertToMac.setActionDefinitionId(IJavaEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_MAC);
137	editor.setAction("ConvertLineDelimitersToMac", fConvertToMac); //$NON-NLS-1$	140	editor.setAction("ConvertLineDelimitersToMac", fConvertToMac); //$NON-NLS-1$
Lines 262-267 Link Here
262	private IMenuManager createEditorSubMenu(IMenuManager mainMenu) {	265	private IMenuManager createEditorSubMenu(IMenuManager mainMenu) {
263	IMenuManager result= new MenuManager(ActionMessages.getString("SourceMenu.label")); //$NON-NLS-1$	266	IMenuManager result= new MenuManager(ActionMessages.getString("SourceMenu.label")); //$NON-NLS-1$
264	int added= 0;	267	int added= 0;
		268	added+= addEditorAction(result, "Comment"); //$NON-NLS-1$
		269	added+= addEditorAction(result, "Uncomment"); //$NON-NLS-1$
		270	result.add(new Separator());
265	added+= addAction(result, fOrganizeImports);	271	added+= addAction(result, fOrganizeImports);
266	added+= addAction(result, fAddImport);	272	added+= addAction(result, fAddImport);
267	result.add(new Separator());	273	result.add(new Separator());
Lines 289-294 Link Here
289	provider.removeSelectionChangedListener(listener);	295	provider.removeSelectionChangedListener(listener);
290	}	296	}
291	}	297	}
		298	fEditor= null;
292	super.dispose();	299	super.dispose();
293	}	300	}
294		301
Lines 322-327 Link Here
322		329
323	private int addAction(IMenuManager menu, IAction action) {	330	private int addAction(IMenuManager menu, IAction action) {
324	if (action != null && action.isEnabled()) {	331	if (action != null && action.isEnabled()) {
		332	menu.add(action);
		333	return 1;
		334	}
		335	return 0;
		336	}
		337
		338	private int addEditorAction(IMenuManager menu, String actionID) {
		339	if (fEditor == null)
		340	return 0;
		341	IAction action= fEditor.getAction(actionID);
		342	if (action == null)
		343	return 0;
		344	if (action instanceof IUpdate)
		345	((IUpdate)action).update();
		346	if (action.isEnabled()) {
325	menu.add(action);	347	menu.add(action);
326	return 1;	348	return 1;
327	}	349	}