mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Fix enabled state of editor actions in case of non-TUs

Browse source
This commit is contained in:
Anton Leherbauer 2007-05-07 10:55:02 +00:00
parent 403e59ebed
commit 6871fd9ab5
3 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
View file

@ -145,6 +145,9 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate {
public void run() { public void run() {
ITranslationUnit tu= getTranslationUnit(); ITranslationUnit tu= getTranslationUnit();
if (tu == null) {
return;
}
IIndex index; IIndex index;
try { try {
index = CCorePlugin.getIndexManager().getIndex(tu.getCProject(), IIndexManager.ADD_DEPENDENCIES); index = CCorePlugin.getIndexManager().getIndex(tu.getCProject(), IIndexManager.ADD_DEPENDENCIES);
@ -377,7 +380,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate {
} }
public void update() { public void update() {
setEnabled(true); setEnabled(getTranslationUnit() != null);
} }
/** /**

25
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java
View file

@ -195,14 +195,10 @@ public class ToggleSourceAndHeaderAction extends TextEditorAction {
* @see org.eclipse.jface.action.Action#run() * @see org.eclipse.jface.action.Action#run()
*/ */
public void run() { public void run() {
IEditorPart editor = getTextEditor(); IWorkingCopy currentUnit= getWorkingCopy();
if (editor == null) { if (currentUnit == null) {
return; return;
} }
IEditorInput input= editor.getEditorInput();
IWorkingCopyManager manager= CUIPlugin.getDefault().getWorkingCopyManager();
IWorkingCopy currentUnit= manager.getWorkingCopy(input);
ITranslationUnit partnerUnit= computePartnerFile(currentUnit); ITranslationUnit partnerUnit= computePartnerFile(currentUnit);
if (partnerUnit != null) { if (partnerUnit != null) {
fgLastSourceUnit= currentUnit.getOriginalElement(); fgLastSourceUnit= currentUnit.getOriginalElement();
@ -217,6 +213,23 @@ public class ToggleSourceAndHeaderAction extends TextEditorAction {
} }
} }
private IWorkingCopy getWorkingCopy() {
IEditorPart editor = getTextEditor();
if (editor == null) {
return null;
}
IEditorInput input= editor.getEditorInput();
IWorkingCopyManager manager= CUIPlugin.getDefault().getWorkingCopyManager();
return manager.getWorkingCopy(input);
}
/*
* @see org.eclipse.ui.texteditor.TextEditorAction#update()
*/
public void update() {
setEnabled(getWorkingCopy() != null);
}
/** /**
* Compute the corresponding translation unit for the given unit. * Compute the corresponding translation unit for the given unit.
* *

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 IBM Corporation and others. * Copyright (c) 2000, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -469,6 +469,8 @@ public class GenerateActionGroup extends ActionGroup {
} }
private int addAction(IMenuManager menu, IAction action) { private int addAction(IMenuManager menu, IAction action) {
if (action instanceof IUpdate)
((IUpdate)action).update();
if (action != null && action.isEnabled()) { if (action != null && action.isEnabled()) {
menu.add(action); menu.add(action);
return 1; return 1;