diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java index 4ac51d96056..b5170b674e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java @@ -112,6 +112,8 @@ public abstract class FindAction extends SelectionParseAction { if( obj == null || !(obj instanceof ICElement ) ){ operationNotAvailable(); return; + } else { + clearStatusLine(); } ICElement element = (ICElement) obj; @@ -152,6 +154,8 @@ public abstract class FindAction extends SelectionParseAction { if (node == null || !( node instanceof IASTNode )){ operationNotAvailable(); return; + } else { + clearStatusLine(); } CSearchQuery job = createSearchQuery(node); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java index a8d99eafa11..c99f5c3d3e4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java @@ -187,6 +187,8 @@ public class OpenDeclarationsAction extends SelectionParseAction implements IUpd if( namedElement == null ){ operationNotAvailable(); return; + } else { + clearStatusLine(); } if( storage.getResource() != null ) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java index 143847cdc62..aea8c443055 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java @@ -130,6 +130,17 @@ public class SelectionParseAction extends Action { if( statusManager != null ) statusManager.setErrorMessage(CSearchMessages.getString("CSearchOperation.operationUnavailable.message"));//$NON-NLS-1$ } + protected void clearStatusLine() { + IStatusLineManager statusManager = null; + if (fSite instanceof IViewSite){ + statusManager = ((IViewSite) fSite).getActionBars().getStatusLineManager(); + } + else if (fSite instanceof IEditorSite){ + statusManager = ((IEditorSite) fSite).getActionBars().getStatusLineManager(); + } + if( statusManager != null ) + statusManager.setErrorMessage( "" ); //$NON-NLS-1$ + } //TODO: Change this to work with qualified identifiers public SelSearchNode getSelection( int fPos ) {