From 4c26cbe63e8b7b282894c5640a2975c32c7bcb1b Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Mon, 2 May 2011 13:58:54 +0000
Subject: [PATCH] Bug 344298: Support for Disassembly in case of multi-process.

---
 .../src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java  | 3 ++-
 .../cdt/dsf/gdb/service/command/GDBControlDMContext.java       | 3 +--
 .../src/org/eclipse/cdt/dsf/mi/service/MIProcesses.java        | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
index da7ef4157b2..73af2f984e4 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
@@ -35,6 +35,7 @@ import org.eclipse.cdt.dsf.datamodel.DMContexts;
 import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
 import org.eclipse.cdt.dsf.debug.service.ICachingService;
+import org.eclipse.cdt.dsf.debug.service.IDisassembly.IDisassemblyDMContext;
 import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext;
 import org.eclipse.cdt.dsf.debug.service.IProcesses;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext;
@@ -177,7 +178,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService
 	 */
     @Immutable
 	private static class MIContainerDMC extends AbstractDMContext
-	implements IMIContainerDMContext, IBreakpointsTargetDMContext
+	implements IMIContainerDMContext, IBreakpointsTargetDMContext, IDisassemblyDMContext
 	{
 		/**
 		 * String ID that is used to identify the thread group in the GDB/MI protocol.
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java
index 160e688936f..d2bd4fe106d 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.dsf.gdb.service.command;
 
-import org.eclipse.cdt.dsf.debug.service.IDisassembly.IDisassemblyDMContext;
 import org.eclipse.cdt.dsf.debug.service.IModules.ISymbolDMContext;
 import org.eclipse.cdt.dsf.debug.service.ISignals.ISignalsDMContext;
 import org.eclipse.cdt.dsf.debug.service.ISourceLookup.ISourceLookupDMContext;
@@ -23,7 +22,7 @@ import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext;
  */
 public class GDBControlDMContext extends MIControlDMContext
     implements ISymbolDMContext, ISourceLookupDMContext, 
-        ISignalsDMContext, IDisassemblyDMContext, ITraceTargetDMContext 
+        ISignalsDMContext, ITraceTargetDMContext 
 {
 
     public GDBControlDMContext(String sessionId, String commandControlId) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIProcesses.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIProcesses.java
index a137a902447..6ad7927ca05 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIProcesses.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIProcesses.java
@@ -22,6 +22,7 @@ import org.eclipse.cdt.dsf.datamodel.DMContexts;
 import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
 import org.eclipse.cdt.dsf.debug.service.ICachingService;
+import org.eclipse.cdt.dsf.debug.service.IDisassembly.IDisassemblyDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerResumedDMEvent;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerSuspendedDMEvent;
@@ -137,7 +138,7 @@ public class MIProcesses extends AbstractDsfService implements IMIProcesses, ICa
 	 */
     @Immutable
 	protected static class MIContainerDMC extends AbstractDMContext
-	implements IMIContainerDMContext, IBreakpointsTargetDMContext
+	implements IMIContainerDMContext, IBreakpointsTargetDMContext, IDisassemblyDMContext
 	{
 		/**
 		 * String ID that is used to identify the thread group in the GDB/MI protocol.