Attachment 109208 Details for Bug 243216 – API compatible patch

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

[patch] API compatible patch

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

on 2008-08-05 15:11:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2008-08-05 15:11:58 EDT

Size: 15.22 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.20
>diff -u -r1.20 GDBControl.java
>--- src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java	29 Jul 2008 19:55:28 -0000	1.20
>+++ src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java	5 Aug 2008 19:07:38 -0000
>@@ -38,7 +38,6 @@
> 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;
>@@ -73,23 +72,6 @@
>  */
> public class GDBControl extends AbstractMIControl {
> 
>-    /**
>-     * Event indicating that the back end process process has started.
>-     */
>-    public static class GDBStartedEvent extends AbstractDMEvent<GDBControlDMContext> {
>-        public GDBStartedEvent(GDBControlDMContext context) {
>-            super(context);
>-        }
>-    }
>-    
>-    /**
>-     * Event indicating that the back end process has terminated.
>-     */
>-    public static class GDBExitedEvent extends AbstractDMEvent<GDBControlDMContext> {
>-        public GDBExitedEvent(GDBControlDMContext context) {
>-            super(context);
>-        }
>-    }
> 
>     private static int fgInstanceCounter = 0;
>     private final GDBControlDMContext fControlDmc;
>@@ -436,7 +418,7 @@
>     }
>         
>     @DsfServiceEventHandler 
>-    public void eventDispatched(GDBExitedEvent e) {
>+    public void eventDispatched(BackendExitedEvent e) {
>         // Handle our "GDB Exited" event and stop processing commands.
>         stopCommandProcessing();
>     }
>@@ -463,7 +445,7 @@
>                         Thread.interrupted();
>                     } finally {
>                         fExited = true;
>-                        getSession().dispatchEvent(new GDBExitedEvent(fControlDmc) {}, getProperties());
>+                        getSession().dispatchEvent(new BackendExitedEvent(fControlDmc) {}, getProperties());
>                     }
>                 }
>             }
>@@ -735,7 +717,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 GDBStartedEvent(getGDBDMContext()), getProperties());
>+            getSession().dispatchEvent(new BackendStartedEvent(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.11
>diff -u -r1.11 GdbLaunch.java
>--- src/org/eclipse/dd/gdb/internal/provisional/launching/GdbLaunch.java	29 Jul 2008 17:12:14 -0000	1.11
>+++ src/org/eclipse/dd/gdb/internal/provisional/launching/GdbLaunch.java	5 Aug 2008 19:07:38 -0000
>@@ -39,6 +39,7 @@
> 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;
>@@ -184,7 +185,7 @@
>     
>     ///////////////////////////////////////////////////////////////////////////
>     // IServiceEventListener
>-    @DsfServiceEventHandler public void eventDispatched(GDBControl.GDBExitedEvent event) {
>+    @DsfServiceEventHandler public void eventDispatched(BackendExitedEvent event) {
>         shutdownSession(new RequestMonitor(ImmediateExecutor.getInstance(), null));
>     }
> 
>#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.4
>diff -u -r1.4 MIRunControlNS.java
>--- src/org/eclipse/dd/mi/service/MIRunControlNS.java	2 Aug 2008 01:15:51 -0000	1.4
>+++ src/org/eclipse/dd/mi/service/MIRunControlNS.java	5 Aug 2008 19:07:42 -0000
>@@ -35,6 +35,7 @@
> 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;
>@@ -48,7 +49,6 @@
> import org.eclipse.dd.mi.service.command.events.MIBreakpointHitEvent;
> import org.eclipse.dd.mi.service.command.events.MIErrorEvent;
> import org.eclipse.dd.mi.service.command.events.MIEvent;
>-import org.eclipse.dd.mi.service.command.events.MIGDBExitEvent;
> import org.eclipse.dd.mi.service.command.events.MIRunningEvent;
> import org.eclipse.dd.mi.service.command.events.MISharedLibEvent;
> import org.eclipse.dd.mi.service.command.events.MISignalEvent;
>@@ -850,7 +850,7 @@
> 	}
> 
> 	@DsfServiceEventHandler
>-	public void eventDispatched(MIGDBExitEvent e) {
>+	public void eventDispatched(BackendExitedEvent 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.6
>diff -u -r1.6 MIBreakpoints.java
>--- src/org/eclipse/dd/mi/service/MIBreakpoints.java	8 May 2008 20:52:26 -0000	1.6
>+++ src/org/eclipse/dd/mi/service/MIBreakpoints.java	5 Aug 2008 19:07:41 -0000
>@@ -31,6 +31,7 @@
> 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;
>@@ -274,6 +275,10 @@
>     public void eventDispatched(MIGDBExitEvent e) {
>     }
> 
>+    @DsfServiceEventHandler
>+    public void eventDispatched(BackendExitedEvent e) {
>+    }
>+
> 	///////////////////////////////////////////////////////////////////////////
> 	// IBreakpoints interface
> 	///////////////////////////////////////////////////////////////////////////
>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.22
>diff -u -r1.22 MIRunControl.java
>--- src/org/eclipse/dd/mi/service/MIRunControl.java	2 Aug 2008 01:15:51 -0000	1.22
>+++ src/org/eclipse/dd/mi/service/MIRunControl.java	5 Aug 2008 19:07:42 -0000
>@@ -29,6 +29,7 @@
> 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;
>@@ -407,6 +408,11 @@
>     @DsfServiceEventHandler
>     public void eventDispatched(MIGDBExitEvent e) {
>         fTerminated = true;
>+    }
>+    
>+    @DsfServiceEventHandler
>+    public void eventDispatched(BackendExitedEvent 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.10
>diff -u -r1.10 MIBreakpointsManager.java
>--- src/org/eclipse/dd/mi/service/MIBreakpointsManager.java	22 Jul 2008 19:19:48 -0000	1.10
>+++ src/org/eclipse/dd/mi/service/MIBreakpointsManager.java	5 Aug 2008 19:07:41 -0000
>@@ -72,6 +72,7 @@
> 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;
>@@ -1232,6 +1233,11 @@
>         terminated();
>     }
> 
>+    @DsfServiceEventHandler
>+    public void eventDispatched(BackendExitedEvent e) {
>+        terminated();
>+    }
>+
>     private void terminated() {
>         clearBreakpointStatus(fPlatformBPs.keySet().toArray(new ICBreakpoint[fPlatformBPs.size()]));
>         fPlatformBPs.clear();
>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.16
>diff -u -r1.16 AbstractMIControl.java
>--- src/org/eclipse/dd/mi/service/command/AbstractMIControl.java	27 Jul 2008 18:05:39 -0000	1.16
>+++ src/org/eclipse/dd/mi/service/command/AbstractMIControl.java	5 Aug 2008 19:07:42 -0000
>@@ -30,6 +30,7 @@
> 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;
>@@ -68,6 +69,24 @@
> {
>     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.
> 	 */
>#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.7
>diff -u -r1.7 LaunchVMProvider.java
>--- src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/LaunchVMProvider.java	16 Jun 2008 18:30:39 -0000	1.7
>+++ src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/LaunchVMProvider.java	5 Aug 2008 19:07:44 -0000
>@@ -20,8 +20,8 @@
> 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.gdb.internal.provisional.service.command.GDBControl.GDBExitedEvent;
>-import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl.GDBStartedEvent;
>+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 GDBStartedEvent ||
>-            eventToSkip instanceof GDBExitedEvent) 
>+            eventToSkip instanceof BackendStartedEvent ||
>+            eventToSkip instanceof BackendExitedEvent) 
>         {
>             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.19
>diff -u -r1.19 ContainerVMNode.java
>--- src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java	23 Jul 2008 19:33:20 -0000	1.19
>+++ src/org/eclipse/dd/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java	5 Aug 2008 19:07:44 -0000
>@@ -31,6 +31,8 @@
> 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;
>@@ -125,9 +127,9 @@
> 
> 	@Override
> 	public int getDeltaFlags(Object e) {
>-		if (e instanceof GDBControl.GDBExitedEvent) {
>+		if (e instanceof BackendExitedEvent) {
> 	        return IModelDelta.CONTENT;
>-	    } else if (e instanceof GDBControl.GDBStartedEvent) {
>+	    } else if (e instanceof BackendStartedEvent) {
> 	        return IModelDelta.EXPAND;
> 	    }
> 	    return super.getDeltaFlags(e);
>@@ -135,9 +137,9 @@
> 
> 	@Override
> 	public void buildDelta(Object e, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
>-		if (e instanceof GDBControl.GDBExitedEvent) {
>+		if (e instanceof BackendExitedEvent) {
> 	        parentDelta.setFlags(parentDelta.getFlags() | IModelDelta.CONTENT);
>-	    } else if (e instanceof GDBControl.GDBStartedEvent) {
>+	    } else if (e instanceof BackendStartedEvent) {
> 	        parentDelta.addNode(createVMContext(((IDMEvent<?>)e).getDMContext()), IModelDelta.EXPAND);
> 	    } else {
> 	    	super.buildDelta(e, parentDelta, nodeOffset, requestMonitor);

Flags:

cdtdoug: iplog-

Actions: View | Diff

Attachments on bug 243216: 109206 | 109208