Attachment 109543 Details for Bug 243611 – Patch with proposed changes.

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

[patch] Patch with proposed changes.

20080808_commandControlService.patch (text/plain), 26.67 KB, created by Pawel Piech

on 2008-08-08 13:09:55 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Piech

Created: 2008-08-08 13:09:55 EDT

Size: 26.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.dd.gdb.ui
>Index: src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/LaunchVMProvider.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/LaunchVMProvider.java,v
>retrieving revision 1.8
>diff -u -r1.8 LaunchVMProvider.java
>--- src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/LaunchVMProvider.java	5 Aug 2008 19:15:02 -0000	1.8
>+++ src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/LaunchVMProvider.java	8 Aug 2008 17:09:12 -0000
>@@ -16,12 +16,12 @@
> import org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.launch.LaunchRootVMNode;
> import org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.launch.StackFramesVMNode;
> import org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.launch.StandardProcessVMNode;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlInitializedDMEvent;
> import org.eclipse.dd.dsf.service.DsfSession;
> import org.eclipse.dd.dsf.ui.viewmodel.AbstractVMAdapter;
> import org.eclipse.dd.dsf.ui.viewmodel.IRootVMNode;
> import org.eclipse.dd.dsf.ui.viewmodel.IVMNode;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendExitedEvent;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendStartedEvent;
> import org.eclipse.dd.mi.service.command.MIInferiorProcess.InferiorExitedDMEvent;
> import org.eclipse.dd.mi.service.command.MIInferiorProcess.InferiorStartedDMEvent;
> import org.eclipse.debug.core.DebugPlugin;
>@@ -75,8 +75,8 @@
>         // Never skip the process lifecycle events.
>         if (eventToSkip instanceof InferiorExitedDMEvent || 
>             eventToSkip instanceof InferiorStartedDMEvent ||
>-            eventToSkip instanceof BackendStartedEvent ||
>-            eventToSkip instanceof BackendExitedEvent) 
>+            eventToSkip instanceof ICommandControlInitializedDMEvent ||
>+            eventToSkip instanceof ICommandControlShutdownDMEvent) 
>         {
>             return false;
>         }
>Index: src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java,v
>retrieving revision 1.21
>diff -u -r1.21 ContainerVMNode.java
>--- src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java	6 Aug 2008 13:39:47 -0000	1.21
>+++ src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java	8 Aug 2008 17:09:12 -0000
>@@ -25,14 +25,14 @@
> import org.eclipse.dd.dsf.debug.service.IProcesses.IProcessDMContext;
> import org.eclipse.dd.dsf.debug.service.IProcesses.IThreadDMData;
> import org.eclipse.dd.dsf.debug.service.IRunControl.IContainerDMContext;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlInitializedDMEvent;
> import org.eclipse.dd.dsf.service.DsfSession;
> import org.eclipse.dd.dsf.ui.concurrent.ViewerDataRequestMonitor;
> import org.eclipse.dd.dsf.ui.viewmodel.VMDelta;
> import org.eclipse.dd.dsf.ui.viewmodel.datamodel.AbstractDMVMProvider;
> import org.eclipse.dd.dsf.ui.viewmodel.datamodel.IDMVMContext;
> import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendExitedEvent;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendStartedEvent;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider;
>@@ -127,9 +127,9 @@
> 
> 	@Override
> 	public int getDeltaFlags(Object e) {
>-		if (e instanceof BackendExitedEvent) {
>+		if (e instanceof ICommandControlShutdownDMEvent) {
> 	        return IModelDelta.CONTENT;
>-	    } else if (e instanceof BackendStartedEvent) {
>+	    } else if (e instanceof ICommandControlInitializedDMEvent) {
> 	        return IModelDelta.EXPAND;
> 	    }
> 	    return super.getDeltaFlags(e);
>@@ -137,9 +137,9 @@
> 
> 	@Override
> 	public void buildDelta(Object e, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
>-		if (e instanceof BackendExitedEvent) {
>+		if (e instanceof ICommandControlShutdownDMEvent) {
> 	        parentDelta.setFlags(parentDelta.getFlags() | IModelDelta.CONTENT);
>-	    } else if (e instanceof BackendStartedEvent) {
>+	    } else if (e instanceof ICommandControlInitializedDMEvent) {
> 	        parentDelta.addNode(createVMContext(((IDMEvent<?>)e).getDMContext()), IModelDelta.EXPAND);
> 	    } else {
> 	    	super.buildDelta(e, parentDelta, nodeOffset, requestMonitor);
>#P org.eclipse.dd.gdb
>Index: src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java,v
>retrieving revision 1.21
>diff -u -r1.21 GDBControl.java
>--- src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java	5 Aug 2008 19:14:57 -0000	1.21
>+++ src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java	8 Aug 2008 17:09:13 -0000
>@@ -38,6 +38,7 @@
> import org.eclipse.dd.dsf.concurrent.IDsfStatusConstants;
> import org.eclipse.dd.dsf.concurrent.RequestMonitor;
> import org.eclipse.dd.dsf.concurrent.Sequence;
>+import org.eclipse.dd.dsf.datamodel.AbstractDMEvent;
> import org.eclipse.dd.dsf.debug.service.command.ICommandControl;
> import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
> import org.eclipse.dd.dsf.service.DsfSession;
>@@ -72,6 +73,27 @@
>  */
> public class GDBControl extends AbstractMIControl {
> 
>+    /**
>+     * Event indicating that the back end process has started.
>+     */
>+    public static class GDBControlInitializedDMEvent extends AbstractDMEvent<ICommandControlDMContext> 
>+        implements ICommandControlInitializedDMEvent
>+    {
>+        public GDBControlInitializedDMEvent(GDBControlDMContext context) {
>+            super(context);
>+        }
>+    }
>+    
>+    /**
>+     * Event indicating that the back end process has terminated.
>+     */
>+    public static class GDBControlShutdownDMEvent extends AbstractDMEvent<ICommandControlDMContext> 
>+        implements ICommandControlShutdownDMEvent
>+    {
>+        public GDBControlShutdownDMEvent(GDBControlDMContext context) {
>+            super(context);
>+        }
>+    }
> 
>     private static int fgInstanceCounter = 0;
>     private final GDBControlDMContext fControlDmc;
>@@ -98,7 +120,7 @@
>     private PTY fPty;
> 
>     public GDBControl(DsfSession session, ILaunchConfiguration config) { 
>-        super(session);
>+        super(session, "gdbcontrol[" + ++fgInstanceCounter + "]"); //$NON-NLS-1$ //$NON-NLS-2$
>         fSessionType = LaunchUtils.getSessionType(config);
>         fAttach = LaunchUtils.getIsAttach(config);
>         fGdbPath = LaunchUtils.getGDBPath(config);
>@@ -107,18 +129,18 @@
> 		} catch (CoreException e) {
> 			fExecPath = new Path(""); //$NON-NLS-1$
> 		}
>-        fControlDmc = new GDBControlDMContext(session.getId(), "gdbcontrol[" + ++fgInstanceCounter + "]"); //$NON-NLS-1$ //$NON-NLS-2$
>+        fControlDmc = new GDBControlDMContext(session.getId(), getId()); 
>     }
> 
>     @Deprecated
>     public GDBControl(DsfSession session, IPath gdbPath, IPath execPath, SessionType sessionType, boolean attach, int gdbLaunchTimeout) {
>-        super(session);
>+        super(session, "gdbcontrol[" + ++fgInstanceCounter + "]"); //$NON-NLS-1$ //$NON-NLS-2$
>         fSessionType = sessionType;
>         fAttach = attach;
>         fGdbPath = gdbPath;
>         fExecPath = execPath;
>         fGDBLaunchTimeout = gdbLaunchTimeout;
>-        fControlDmc = new GDBControlDMContext(session.getId(), "gdbcontrol[" + ++fgInstanceCounter + "]"); //$NON-NLS-1$ //$NON-NLS-2$
>+        fControlDmc = new GDBControlDMContext(session.getId(), getId()); 
>     }
> 
>     @Override
>@@ -418,7 +440,7 @@
>     }
>         
>     @DsfServiceEventHandler 
>-    public void eventDispatched(BackendExitedEvent e) {
>+    public void eventDispatched(ICommandControlShutdownDMEvent e) {
>         // Handle our "GDB Exited" event and stop processing commands.
>         stopCommandProcessing();
>     }
>@@ -445,7 +467,7 @@
>                         Thread.interrupted();
>                     } finally {
>                         fExited = true;
>-                        getSession().dispatchEvent(new BackendExitedEvent(fControlDmc) {}, getProperties());
>+                        getSession().dispatchEvent(new GDBControlShutdownDMEvent(fControlDmc) {}, getProperties());
>                     }
>                 }
>             }
>@@ -717,7 +739,7 @@
>         public void initialize(final RequestMonitor requestMonitor) {
>             getSession().addServiceEventListener(GDBControl.this, null);
>             register(new String[]{ ICommandControl.class.getName(), AbstractMIControl.class.getName() }, new Hashtable<String,String>());
>-            getSession().dispatchEvent(new BackendStartedEvent(getGDBDMContext()), getProperties());
>+            getSession().dispatchEvent(new GDBControlInitializedDMEvent(getGDBDMContext()), getProperties());
>             requestMonitor.done();
>         }
> 
>Index: src/org/eclipse/dd/gdb/internal/provisional/launching/GdbLaunch.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/GdbLaunch.java,v
>retrieving revision 1.12
>diff -u -r1.12 GdbLaunch.java
>--- src/org/eclipse/dd/gdb/internal/provisional/launching/GdbLaunch.java	5 Aug 2008 19:14:57 -0000	1.12
>+++ src/org/eclipse/dd/gdb/internal/provisional/launching/GdbLaunch.java	8 Aug 2008 17:09:13 -0000
>@@ -32,6 +32,7 @@
> import org.eclipse.dd.dsf.debug.model.DsfMemoryBlockRetrieval;
> import org.eclipse.dd.dsf.debug.service.IDsfDebugServicesFactory;
> import org.eclipse.dd.dsf.debug.service.IMemory.IMemoryDMContext;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent;
> import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
> import org.eclipse.dd.dsf.service.DsfServicesTracker;
> import org.eclipse.dd.dsf.service.DsfSession;
>@@ -39,7 +40,6 @@
> import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl;
> import org.eclipse.dd.mi.service.command.AbstractCLIProcess;
> import org.eclipse.dd.mi.service.command.MIInferiorProcess;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendExitedEvent;
> import org.eclipse.debug.core.DebugException;
> import org.eclipse.debug.core.DebugPlugin;
> import org.eclipse.debug.core.ILaunchConfiguration;
>@@ -185,7 +185,7 @@
>     
>     ///////////////////////////////////////////////////////////////////////////
>     // IServiceEventListener
>-    @DsfServiceEventHandler public void eventDispatched(BackendExitedEvent event) {
>+    @DsfServiceEventHandler public void eventDispatched(ICommandControlShutdownDMEvent event) {
>         shutdownSession(new RequestMonitor(ImmediateExecutor.getInstance(), null));
>     }
> 
>#P org.eclipse.dd.dsf.debug
>Index: src/org/eclipse/dd/dsf/debug/service/command/ICommandControl.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/command/ICommandControl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ICommandControl.java
>--- src/org/eclipse/dd/dsf/debug/service/command/ICommandControl.java	30 May 2008 22:57:44 -0000	1.5
>+++ src/org/eclipse/dd/dsf/debug/service/command/ICommandControl.java	8 Aug 2008 17:09:14 -0000
>@@ -14,7 +14,10 @@
> 
> /**
>  * API for sending commands to the debugger and for receiving command results
>- * and asynchronous events.
>+ * and asynchronous events.  The command control may be implemented by a service
>+ * or a non-service object.
>+ * 
>+ * @see ICommandControlService
>  */
> public interface ICommandControl {
> 
>Index: src/org/eclipse/dd/dsf/debug/service/command/ICommandControlService.java
>===================================================================
>RCS file: src/org/eclipse/dd/dsf/debug/service/command/ICommandControlService.java
>diff -N src/org/eclipse/dd/dsf/debug/service/command/ICommandControlService.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/dd/dsf/debug/service/command/ICommandControlService.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,57 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 Wind River Systems and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ *     Wind River Systems - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.dd.dsf.debug.service.command;
>+
>+import org.eclipse.dd.dsf.datamodel.IDMContext;
>+import org.eclipse.dd.dsf.datamodel.IDMEvent;
>+import org.eclipse.dd.dsf.service.IDsfService;
>+
>+/**
>+ * Service which acts as a command control. 
>+ * 
>+ * @since 1.1
>+ */
>+public interface ICommandControlService extends ICommandControl, IDsfService {
>+    
>+    public interface ICommandControlDMContext extends IDMContext {
>+        /**
>+         * Returns the ID of the command control that this context
>+         * represents.
>+         */
>+        public String getCommandControlId();
>+    } 
>+    
>+    
>+    /**
>+     * Event indicating that the back end process has started.
>+     */
>+    public interface ICommandControlInitializedDMEvent extends IDMEvent<ICommandControlDMContext> {};
>+    
>+    /**
>+     * Event indicating that the back end process has terminated.
>+     */
>+    public interface ICommandControlShutdownDMEvent extends IDMEvent<ICommandControlDMContext> {};
>+
>+    /**
>+     * Returns the identifier of this command control service.  It can be used 
>+     * to distinguish between multiple instances of command control services.   
>+     */
>+    public String getId();
>+    
>+    /**
>+     * Returns whether this command control is currently active.  A command 
>+     * control service is active if it has been initialized and has not yet
>+     * shut down.
>+     * @return
>+     */
>+    public boolean isActive();
>+    
>+}
>#P org.eclipse.dd.mi
>Index: src/org/eclipse/dd/mi/service/MIRunControlNS.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java,v
>retrieving revision 1.9
>diff -u -r1.9 MIRunControlNS.java
>--- src/org/eclipse/dd/mi/service/MIRunControlNS.java	7 Aug 2008 19:17:55 -0000	1.9
>+++ src/org/eclipse/dd/mi/service/MIRunControlNS.java	8 Aug 2008 17:09:16 -0000
>@@ -30,12 +30,12 @@
> import org.eclipse.dd.dsf.debug.service.IProcesses.IThreadDMContext;
> import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMContext;
> import org.eclipse.dd.dsf.debug.service.command.CommandCache;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent;
> import org.eclipse.dd.dsf.service.AbstractDsfService;
> import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
> import org.eclipse.dd.dsf.service.DsfSession;
> import org.eclipse.dd.mi.internal.MIPlugin;
> import org.eclipse.dd.mi.service.command.AbstractMIControl;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendExitedEvent;
> import org.eclipse.dd.mi.service.command.commands.MIExecContinue;
> import org.eclipse.dd.mi.service.command.commands.MIExecFinish;
> import org.eclipse.dd.mi.service.command.commands.MIExecInterrupt;
>@@ -781,7 +781,7 @@
> 	}
> 	
> 	@DsfServiceEventHandler
>-	public void eventDispatched(BackendExitedEvent e) {
>+	public void eventDispatched(ICommandControlShutdownDMEvent e) {
> 		fTerminated = true;
> 	}
> 
>Index: src/org/eclipse/dd/mi/service/MIBreakpoints.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpoints.java,v
>retrieving revision 1.7
>diff -u -r1.7 MIBreakpoints.java
>--- src/org/eclipse/dd/mi/service/MIBreakpoints.java	5 Aug 2008 19:15:00 -0000	1.7
>+++ src/org/eclipse/dd/mi/service/MIBreakpoints.java	8 Aug 2008 17:09:16 -0000
>@@ -27,11 +27,11 @@
> import org.eclipse.dd.dsf.datamodel.IDMContext;
> import org.eclipse.dd.dsf.debug.service.IBreakpoints;
> import org.eclipse.dd.dsf.debug.service.command.ICommandControl;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent;
> import org.eclipse.dd.dsf.service.AbstractDsfService;
> import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
> import org.eclipse.dd.dsf.service.DsfSession;
> import org.eclipse.dd.mi.internal.MIPlugin;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendExitedEvent;
> import org.eclipse.dd.mi.service.command.commands.MIBreakAfter;
> import org.eclipse.dd.mi.service.command.commands.MIBreakCondition;
> import org.eclipse.dd.mi.service.command.commands.MIBreakDelete;
>@@ -271,13 +271,13 @@
> 	    }
> 	}
> 
>-	// Not used, kept for API compatibility.  BackendExitedEvent is used instead
>+	// Not used, kept for API compatibility.  ICommandControlShutdownDMEvent is used instead
>     @DsfServiceEventHandler
>     public void eventDispatched(MIGDBExitEvent e) {
>     }
> 
>     @DsfServiceEventHandler
>-    public void eventDispatched(BackendExitedEvent e) {
>+    public void eventDispatched(ICommandControlShutdownDMEvent e) {
>     }
> 
> 	///////////////////////////////////////////////////////////////////////////
>Index: src/org/eclipse/dd/mi/service/MIRunControl.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControl.java,v
>retrieving revision 1.23
>diff -u -r1.23 MIRunControl.java
>--- src/org/eclipse/dd/mi/service/MIRunControl.java	5 Aug 2008 19:15:00 -0000	1.23
>+++ src/org/eclipse/dd/mi/service/MIRunControl.java	8 Aug 2008 17:09:16 -0000
>@@ -24,12 +24,12 @@
> import org.eclipse.dd.dsf.debug.service.IRunControl;
> import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMContext;
> import org.eclipse.dd.dsf.debug.service.command.CommandCache;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent;
> import org.eclipse.dd.dsf.service.AbstractDsfService;
> import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
> import org.eclipse.dd.dsf.service.DsfSession;
> import org.eclipse.dd.mi.internal.MIPlugin;
> import org.eclipse.dd.mi.service.command.AbstractMIControl;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendExitedEvent;
> import org.eclipse.dd.mi.service.command.commands.MIExecContinue;
> import org.eclipse.dd.mi.service.command.commands.MIExecFinish;
> import org.eclipse.dd.mi.service.command.commands.MIExecInterrupt;
>@@ -404,14 +404,14 @@
>         fStepping = false;
>     }
>     
>-	// Not used, kept for API compatibility.  BackendExitedEvent is used instead
>+	// Not used, kept for API compatibility.  ICommandControlShutdownDMEvent is used instead
>     @DsfServiceEventHandler
>     public void eventDispatched(MIGDBExitEvent e) {
>         fTerminated = true;
>     }
>     
>     @DsfServiceEventHandler
>-    public void eventDispatched(BackendExitedEvent e) {
>+    public void eventDispatched(ICommandControlShutdownDMEvent e) {
>         fTerminated = true;
> 	}
> 
>Index: src/org/eclipse/dd/mi/service/MIBreakpointsManager.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpointsManager.java,v
>retrieving revision 1.11
>diff -u -r1.11 MIBreakpointsManager.java
>--- src/org/eclipse/dd/mi/service/MIBreakpointsManager.java	5 Aug 2008 19:15:00 -0000	1.11
>+++ src/org/eclipse/dd/mi/service/MIBreakpointsManager.java	8 Aug 2008 17:09:16 -0000
>@@ -63,6 +63,7 @@
> import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext;
> import org.eclipse.dd.dsf.debug.service.ISourceLookup.ISourceLookupDMContext;
> import org.eclipse.dd.dsf.debug.service.command.ICommandControl;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent;
> import org.eclipse.dd.dsf.service.AbstractDsfService;
> import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
> import org.eclipse.dd.dsf.service.DsfSession;
>@@ -72,7 +73,6 @@
> import org.eclipse.dd.mi.service.MIBreakpoints.BreakpointUpdatedEvent;
> import org.eclipse.dd.mi.service.MIBreakpoints.MIBreakpointDMContext;
> import org.eclipse.dd.mi.service.breakpoint.actions.BreakpointActionAdapter;
>-import org.eclipse.dd.mi.service.command.AbstractMIControl.BackendExitedEvent;
> import org.eclipse.dd.mi.service.command.events.MIBreakpointHitEvent;
> import org.eclipse.dd.mi.service.command.events.MIGDBExitEvent;
> import org.eclipse.dd.mi.service.command.events.MIWatchpointScopeEvent;
>@@ -1228,14 +1228,14 @@
>     // Session exit
>     //-------------------------------------------------------------------------
> 
>-	// Not used, kept for API compatibility.  BackendExitedEvent is used instead
>+	// Not used, kept for API compatibility.  ICommandControlShutdownDMEvent is used instead
>     @DsfServiceEventHandler
>     public void eventDispatched(MIGDBExitEvent e) {
>         terminated();
>     }
> 
>     @DsfServiceEventHandler
>-    public void eventDispatched(BackendExitedEvent e) {
>+    public void eventDispatched(ICommandControlShutdownDMEvent e) {
>         terminated();
>     }
> 
>Index: src/org/eclipse/dd/mi/service/command/MIControlDMContext.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIControlDMContext.java,v
>retrieving revision 1.3
>diff -u -r1.3 MIControlDMContext.java
>--- src/org/eclipse/dd/mi/service/command/MIControlDMContext.java	2 Jun 2008 18:27:34 -0000	1.3
>+++ src/org/eclipse/dd/mi/service/command/MIControlDMContext.java	8 Aug 2008 17:09:16 -0000
>@@ -14,14 +14,16 @@
> import org.eclipse.dd.dsf.datamodel.DMContexts;
> import org.eclipse.dd.dsf.datamodel.IDMContext;
> import org.eclipse.dd.dsf.debug.service.command.ICommandControl;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
> import org.eclipse.dd.dsf.service.IDsfService;
> import org.osgi.framework.Constants;
> 
> /**
>  * 
>  */
>-public class MIControlDMContext extends AbstractDMContext {
>-
>+public class MIControlDMContext extends AbstractDMContext 
>+    implements ICommandControlDMContext
>+{
>     private final String fCommandControlFilter;
>     private final String fCommandControlId;
>     
>@@ -44,15 +46,19 @@
>     public String getCommandControlFilter() { 
>         return fCommandControlFilter;
>     }
>+
>+    public String getCommandControlId() {
>+        return fCommandControlId;
>+    }
>     
>     @Override
>     public boolean equals(Object obj) {
>-        return baseEquals(obj) && fCommandControlFilter.equals(((MIControlDMContext)obj).fCommandControlFilter);
>+        return baseEquals(obj) && fCommandControlId.equals(((MIControlDMContext)obj).fCommandControlId);
>     }
> 
>     @Override
>     public int hashCode() {
>-        return baseHashCode() + fCommandControlFilter.hashCode(); 
>+        return baseHashCode() + fCommandControlId.hashCode(); 
>     }
>     
>     @Override
>Index: src/org/eclipse/dd/mi/service/command/AbstractMIControl.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractMIControl.java,v
>retrieving revision 1.17
>diff -u -r1.17 AbstractMIControl.java
>--- src/org/eclipse/dd/mi/service/command/AbstractMIControl.java	5 Aug 2008 19:15:00 -0000	1.17
>+++ src/org/eclipse/dd/mi/service/command/AbstractMIControl.java	8 Aug 2008 17:09:16 -0000
>@@ -30,13 +30,12 @@
> import org.eclipse.core.runtime.Status;
> import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
> import org.eclipse.dd.dsf.concurrent.DsfRunnable;
>-import org.eclipse.dd.dsf.datamodel.AbstractDMEvent;
> import org.eclipse.dd.dsf.datamodel.DMContexts;
> import org.eclipse.dd.dsf.datamodel.IDMContext;
> import org.eclipse.dd.dsf.debug.service.IRunControl;
> import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMContext;
> import org.eclipse.dd.dsf.debug.service.command.ICommand;
>-import org.eclipse.dd.dsf.debug.service.command.ICommandControl;
>+import org.eclipse.dd.dsf.debug.service.command.ICommandControlService;
> import org.eclipse.dd.dsf.debug.service.command.ICommandListener;
> import org.eclipse.dd.dsf.debug.service.command.ICommandResult;
> import org.eclipse.dd.dsf.debug.service.command.ICommandToken;
>@@ -65,28 +64,10 @@
>  * Extending classes need to implement the initialize() and shutdown() methods.
>  */
> public abstract class AbstractMIControl extends AbstractDsfService
>-    implements ICommandControl
>+    implements ICommandControlService
> {
>     final static String PROP_INSTANCE_ID = MIPlugin.PLUGIN_ID + ".miControlInstanceId";    //$NON-NLS-1$
>  
>-    /**
>-     * Event indicating that the back end process has started.
>-     */
>-    public static class BackendStartedEvent extends AbstractDMEvent<MIControlDMContext> {
>-        public BackendStartedEvent(MIControlDMContext context) {
>-            super(context);
>-        }
>-    }
>-    
>-    /**
>-     * Event indicating that the back end process has terminated.
>-     */
>-    public static class BackendExitedEvent extends AbstractDMEvent<MIControlDMContext> {
>-        public BackendExitedEvent(MIControlDMContext context) {
>-            super(context);
>-        }
>-    }
>-
>     /*
> 	 *  Thread control variables for the transmit and receive threads.
> 	 */
>@@ -126,12 +107,16 @@
>      */
>     private boolean fStoppedCommandProcessing = false;
> 
>-    /*
>-     *  Public constructor.
>-     */
>+    private String fId;
>     
>     public AbstractMIControl(DsfSession session) {
>         super(session);
>+        fId = "<no id>"; //$NON-NLS-1$
>+    }
>+
>+    public AbstractMIControl(DsfSession session, String id) {
>+        super(session);
>+        fId = id;
>     }
> 
>     /**
>@@ -363,6 +348,14 @@
>     
>     abstract public MIControlDMContext getControlDMContext();
>     
>+    public boolean isActive() {
>+        return !fStoppedCommandProcessing;
>+    }
>+    
>+    public String getId() {
>+        return fId;
>+    }
>+    
>     /*
>      *  These are the service routines which perform the various callouts back to the listeners.
>      */

Actions: View | Diff

Attachments on bug 243611: 109543 | 109546