NPE when opening .h/.c file in SystemTap IDE

Null Pointer Exception is raised when opening a file in Kernel Source
view in Systemtap IDE
https://bugs.eclipse.org/bugs/show_bug.cgi?id=345010

2 files changed, 13 insertions, 10 deletions

diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java
index 3be1d56..9c56b7f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java
@@ -93,10 +93,11 @@ public class OpenFileAction extends EditorAction {
 	protected String getEditorId(File file) {
 		IWorkbench workbench= window.getWorkbench();
 		IEditorRegistry editorRegistry= workbench.getEditorRegistry();
-		IEditorDescriptor descriptor= editorRegistry.getDefaultEditor(file.getName());
-		if (descriptor != null && descriptor.getId().startsWith("org.eclipse.linuxtools.systemtap.ui")) {	//TODO: descriptor.getId().startsWith("org.eclipse.linuxtools.systemtap.ui") is a temparary fix until we find out why .txt files are opening with org.eclipse.ui.DefautTextEditor //$NON-NLS-1$
-			return descriptor.getId();
-		}
+		IEditorDescriptor[] descriptors= editorRegistry.getEditors(file.getName());
+		for (IEditorDescriptor d : descriptors)
+			if (d.getId().startsWith("org.eclipse.linuxtools.systemtap.ui.ide.editors")) {
+				return d.getId();
+			}
 		return SimpleEditor.ID;
 	}
 
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/KernelSourceAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/KernelSourceAction.java
index 30e610f..65c4811 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/KernelSourceAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/KernelSourceAction.java
@@ -17,6 +17,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.linuxtools.systemtap.ui.editor.PathEditorInput;
+import org.eclipse.linuxtools.systemtap.ui.editor.SimpleEditor;
 import org.eclipse.linuxtools.systemtap.ui.ide.IDESessionSettings;
 import org.eclipse.linuxtools.systemtap.ui.ide.editors.stp.STPEditor;
 import org.eclipse.linuxtools.systemtap.ui.ide.internal.Localization;
@@ -119,13 +120,14 @@ public class KernelSourceAction extends Action implements ISelectionListener, IW
 	private String getEditorId(File file) {
 		IWorkbench workbench= window.getWorkbench();
 		IEditorRegistry editorRegistry= workbench.getEditorRegistry();
-		IEditorDescriptor descriptor= editorRegistry.getDefaultEditor(file.getName());
-		if (descriptor != null) {
-			LogManager.logDebug("getEditorId: returnVal-" + descriptor.getId(), this);
-			return descriptor.getId();
-		}
+		IEditorDescriptor[] descriptors= editorRegistry.getEditors(file.getName());
+		for (IEditorDescriptor d : descriptors)
+			if (d.getId().startsWith("org.eclipse.linuxtools.systemtap.ui.ide.editors")) {
+				LogManager.logDebug("getEditorId: returnVal-" + d.getId(), this);
+				return d.getId();
+			}
 		LogManager.logDebug("getEditorId: returnVal-...SimpleEditor", this);
-		return "org.eclipse.linuxtools.systemtap.ui.editor.SimpleEditor";
+		return SimpleEditor.ID;
 	}
 	
 	/**