From 514f88bf08b7b25c8d4470ac898ae1b88b2cdd32 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Wed, 4 May 2011 10:12:45 +0000
Subject: [PATCH] Bug 343895: Missing Remote Shell entry in debug view

---
 .../launch/GdbStandardProcessVMNode.java      | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/GdbStandardProcessVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/GdbStandardProcessVMNode.java
index 4893f788f35..008a9c5083f 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/GdbStandardProcessVMNode.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/GdbStandardProcessVMNode.java
@@ -12,7 +12,7 @@ package org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.launch;
 
 import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
 import org.eclipse.cdt.dsf.debug.ui.viewmodel.launch.StandardProcessVMNode;
-import org.eclipse.cdt.dsf.gdb.launching.GDBProcess;
+import org.eclipse.cdt.dsf.gdb.launching.InferiorRuntimeProcess;
 import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMProvider;
 import org.eclipse.cdt.dsf.ui.viewmodel.VMDelta;
 import org.eclipse.debug.core.DebugEvent;
@@ -30,15 +30,10 @@ import org.eclipse.jface.viewers.TreePath;
  * It does not implement the label provider functionality, so the default 
  * adapters should be used to retrieve the label.
  * 
- * This version is specific to DSF-GDB to only show the GDB process.
+ * This version is specific to DSF-GDB to no longer show the inferiors.
  */
 public class GdbStandardProcessVMNode extends StandardProcessVMNode {
     
-	// We only want to show the GDB process and not the inferiors.
-	// The inferior was not considered valuable and would waste space
-	// especially in multi-process debugging
-	private final static Class<?> fProcessType = GDBProcess.class;
-	
     public GdbStandardProcessVMNode(AbstractVMProvider provider) {
         super(provider);
     }
@@ -66,7 +61,7 @@ public class GdbStandardProcessVMNode extends StandardProcessVMNode {
              */
             int count = 0;
             for (IProcess process : launch.getProcesses()) {
-            	if (fProcessType.isAssignableFrom(process.getClass())) {
+            	if (!(process instanceof InferiorRuntimeProcess)) {
             		update.setChild(process, count++);
             	}
             }
@@ -88,7 +83,7 @@ public class GdbStandardProcessVMNode extends StandardProcessVMNode {
     
             int count = 0;
             for (IProcess process : launch.getProcesses()) {
-            	if (fProcessType.isAssignableFrom(process.getClass())) {
+            	if (!(process instanceof InferiorRuntimeProcess)) {
             		count++;
             	}
             }
@@ -111,7 +106,7 @@ public class GdbStandardProcessVMNode extends StandardProcessVMNode {
     
             boolean hasChildren = false;
             for (IProcess process : launch.getProcesses()) {
-            	if (fProcessType.isAssignableFrom(process.getClass())) {
+            	if (!(process instanceof InferiorRuntimeProcess)) {
             		hasChildren = true;
             		break;
             	}
@@ -140,7 +135,7 @@ public class GdbStandardProcessVMNode extends StandardProcessVMNode {
         int myFlags = 0;
         if (e instanceof DebugEvent) {
             DebugEvent de = (DebugEvent)e;
-            if (fProcessType.isAssignableFrom(de.getSource().getClass()) && 
+        	if (!(de.getSource() instanceof InferiorRuntimeProcess) && 
                  (de.getKind() == DebugEvent.CHANGE || 
                   de.getKind() == DebugEvent.CREATE || 
                   de.getKind() == DebugEvent.TERMINATE) )
@@ -153,7 +148,7 @@ public class GdbStandardProcessVMNode extends StandardProcessVMNode {
     
     @Override
     public void buildDelta(Object e, VMDelta parent, int nodeOffset, RequestMonitor requestMonitor) {
-        if (e instanceof DebugEvent && fProcessType.isAssignableFrom(((DebugEvent)e).getSource().getClass())) {
+        if (e instanceof DebugEvent && !(((DebugEvent)e).getSource() instanceof InferiorRuntimeProcess)) {
             DebugEvent de = (DebugEvent)e;
             if (de.getKind() == DebugEvent.CHANGE) {
                 handleChange(de, parent);