Attachment 190561 Details for Bug 338136 – Some fixes for showing the console

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Some fixes for showing the console

zpatch.txt (text/plain), 2.70 KB, created by Marc Khouzam

on 2011-03-07 10:51:07 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2011-03-07 10:51:07 EST

Size: 2.70 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb.ui
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java,v
>retrieving revision 1.2
>diff -u -r1.2 ConsolePageParticipant.java
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java	7 Mar 2011 11:35:04 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java	7 Mar 2011 15:44:55 -0000
>@@ -16,6 +16,7 @@
> import org.eclipse.cdt.dsf.gdb.launching.GDBProcess;
> import org.eclipse.cdt.dsf.gdb.launching.InferiorRuntimeProcess;
> import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
>+import org.eclipse.cdt.dsf.mi.service.MIProcesses;
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.debug.core.ILaunch;
> import org.eclipse.debug.core.model.IProcess;
>@@ -140,7 +141,7 @@
>         		// We have to check that the process is actually from a DSF-GDB session,
>         		// since the current context could be for any debug session
>         		if (processes[0] instanceof GDBProcess) {
>-        			return launch.getProcesses()[0];
>+        			return processes[0];
>         		}
>         	}
>         	
>@@ -154,12 +155,27 @@
> 			if (container != null) {
> 				ILaunch launch = (ILaunch)context.getAdapter(ILaunch.class);
> 				if (launch != null) {
>-					for (IProcess process : launch.getProcesses()) {
>-						String groupId = process.getAttribute(IGdbDebugConstants.INFERIOR_GROUPID_ATTR);
>-						if (container.getGroupId().equals(groupId)) {
>-							return process;
>-						}
>-					}
>+		        	IProcess[] processes = launch.getProcesses();
>+		        	if (processes != null && processes.length > 0) {
>+		        		for (IProcess process : launch.getProcesses()) {
>+		        			if (process instanceof InferiorRuntimeProcess) {
>+		        				String groupId = process.getAttribute(IGdbDebugConstants.INFERIOR_GROUPID_ATTR);
>+
>+		        				if (groupId == null || groupId.equals(MIProcesses.UNIQUE_GROUP_ID) || 
>+		        					container.getGroupId().equals(groupId)) {
>+		        					// if the groupId is not set in the process we know we are dealing
>+		        					// with single process debugging and we can just return the inferior.
>+		        					// If the groupId is set, then we must find the proper inferior
>+		        					return process;
>+		        				}
>+		        			}
>+		        		}
>+
>+		        		// No inferior?  return the gdb process
>+		        		if (processes[0] instanceof GDBProcess) {
>+		        			return processes[0];
>+		        		}
>+		        	}
> 				}
> 			}
> 		}

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 338136: 189768 | 189886 | 189966 | 190539 | 190561 | 190695