mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Clean up for Fix for 101861: NPE in ReferencesSearchGroup which breaks right click in external files

Browse source
This commit is contained in:
Bogdan Gheorghe 2005-07-05 17:37:24 +00:00
parent 1dfd3e2006
commit f04e2ecde3
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java
View file

@ -16,13 +16,11 @@ import java.util.Iterator;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.index.ICDTIndexer;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.editor.ExternalSearchEditor;
import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds;
import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.CSearchUtil;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
@ -42,8 +40,6 @@ public class ReferencesSearchGroup extends ActionGroup {
private CEditor fEditor;
private IWorkbenchSite fSite;
private ArrayList actions;
public ReferencesSearchGroup(IWorkbenchSite site) {
fFindRefsAction= new FindRefsAction(site);
fFindRefsInWorkingSetAction = new FindRefsInWorkingSetAction(site, null);
@ -83,7 +79,6 @@ public class ReferencesSearchGroup extends ActionGroup {
}
if (fEditor != null){
//IFile fileInput= fEditor.getInputFile();
ICElement celement = fEditor.getInputCElement();
ICDTIndexer indexer = CCorePlugin.getDefault().getCoreModel().getIndexManager().getIndexerForProject(celement.getCProject().getProject());
if (indexer != null){
@ -98,13 +93,12 @@ public class ReferencesSearchGroup extends ActionGroup {
Object cElement = structSel.getFirstElement();
if (cElement instanceof ICElement){
ICElement el = (ICElement) cElement;
//ICProject p= el.getCProject();
IProject proj = el.getCProject().getProject();
ICDTIndexer indexer = CCorePlugin.getDefault().getCoreModel().getIndexManager().getIndexerForProject(proj);
setReferenceMenuEnabled(indexer.getIndexerFeatures());
}
}
} catch (NullPointerException err){}
} catch (NullPointerException err){/* Safety */}
}