From b6d69ba0e1fc729c759f60f7bdb604508219ded2 Mon Sep 17 00:00:00 2001 From: Sebastien Marineau Date: Mon, 26 Aug 2002 22:11:42 +0000 Subject: [PATCH] Merge in fix submitted by Alex Chapiro for NPE in CView --- .../eclipse/cdt/internal/ui/cview/CView.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java index 2dc1f006bc1..ad36fa7c3e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java @@ -998,10 +998,11 @@ public class CView extends ViewPart implements IMenuListener, ISetSelectionTarge IEditorReference[] editorReferences = page.getEditorReferences(); for (int i = 0; i < editorReferences.length; ++i) { IEditorPart editor = editorReferences[i].getEditor(false); - IEditorInput input = editor.getEditorInput(); - if (input instanceof IFileEditorInput - && file.equals(((IFileEditorInput)input).getFile())) { - page.bringToTop(editor); + if(null != editor) { + IEditorInput input = editor.getEditorInput(); + if (input instanceof IFileEditorInput && file.equals(((IFileEditorInput)input).getFile())) { + page.bringToTop(editor); + } return; } } @@ -1014,15 +1015,16 @@ public class CView extends ViewPart implements IMenuListener, ISetSelectionTarge IEditorReference editorReferences[] = page.getEditorReferences(); for (int i = 0; i < editorReferences.length; ++i) { IEditorPart editor = editorReferences[i].getEditor(false); - IEditorInput input = editor.getEditorInput(); - if (input instanceof IFileEditorInput - && res.equals(((IFileEditorInput)input).getFile())) { - page.bringToTop(editor); - if (editor instanceof CEditor) { - CEditor e = (CEditor)editor; - e.selectionChanged (new SelectionChangedEvent (e.getOutlinePage (), selection)); + if(null != editor) { + IEditorInput input = editor.getEditorInput(); + if (input instanceof IFileEditorInput && res.equals(((IFileEditorInput)input).getFile())) { + page.bringToTop(editor); + if (editor instanceof CEditor) { + CEditor e = (CEditor)editor; + e.selectionChanged (new SelectionChangedEvent (e.getOutlinePage (),selection)); + } + return; } - return; } }