From f04e2ecde36e6230330ad41fefea29f462e80d4a Mon Sep 17 00:00:00 2001 From: Bogdan Gheorghe Date: Tue, 5 Jul 2005 17:37:24 +0000 Subject: [PATCH] Clean up for Fix for 101861: NPE in ReferencesSearchGroup which breaks right click in external files --- .../internal/ui/search/actions/ReferencesSearchGroup.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java index 48b2e0d2319..c521ec9d7c7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java @@ -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 */} }