From f406e39bdec2618475eeb4aefdfd4f79cde3de95 Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Tue, 13 Aug 2002 20:34:20 +0000
Subject: [PATCH] Changed the creation of debug target.

---
 .../org/eclipse/cdt/debug/core/CDebugModel.java  | 16 +++++++++++++---
 .../cdt/debug/internal/core/CDebugTarget.java    |  7 +------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
index d909f92d316..28adaff6fb0 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
@@ -6,12 +6,14 @@
 
 package org.eclipse.cdt.debug.core;
 
+import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.debug.internal.core.CDebugTarget;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IProcess;
@@ -74,7 +76,7 @@ public class CDebugModel
 											   final IProcess process,
 											   final boolean allowTerminate,
 											   final boolean allowDisconnect,
-											   final boolean resume )
+											   final boolean stopInMain ) throws DebugException
 	{
 		final IDebugTarget[] target = new IDebugTarget[1];
 		IWorkspaceRunnable r = new IWorkspaceRunnable()
@@ -86,8 +88,7 @@ public class CDebugModel
 											  name,
 											  process,
 											  allowTerminate,
-											  allowDisconnect,
-											  resume );
+											  allowDisconnect );
 			}
 		};
 		try
@@ -98,6 +99,15 @@ public class CDebugModel
 		{
 			CDebugCorePlugin.log( e );
 		}
+
+		if ( stopInMain )
+			breakInMain( cdiTarget );
+		target[0].resume();
+
 		return target[0];
 	}
+	
+	private static void breakInMain( ICDITarget cdiTarget ) throws DebugException
+	{
+	}
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
index b6468e9d3a3..016fcce4e12 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
@@ -154,8 +154,7 @@ public class CDebugTarget extends CDebugElement
 						 String name,
 						 IProcess process,
 						 boolean allowsTerminate,
-						 boolean allowsDisconnect, 
-						 boolean resume )
+						 boolean allowsDisconnect )
 	{
 		super( null );
 		setLaunch( launch );
@@ -402,12 +401,10 @@ public class CDebugTarget extends CDebugElement
 			setSuspended( false );
 			getCDITarget().resume();
 			resumeThreads();
-			fireResumeEvent( DebugEvent.CLIENT_REQUEST );
 		} 
 		catch( CDIException e ) 
 		{
 			setSuspended( true );
-			fireSuspendEvent( DebugEvent.CLIENT_REQUEST );
 			targetRequestFailed( MessageFormat.format( "{0} occurred resuming target.", new String[] { e.toString() } ), e );
 		}	
 	}
@@ -424,14 +421,12 @@ public class CDebugTarget extends CDebugElement
 		try
 		{
 			setSuspended( true );
-			fireSuspendEvent( DebugEvent.CLIENT_REQUEST );
 			getCDITarget().suspend();
 			suspendThreads();
 		}
 		catch( CDIException e )
 		{
 			setSuspended( false );
-			fireResumeEvent( DebugEvent.CLIENT_REQUEST );
 			targetRequestFailed( MessageFormat.format( "{0} occurred suspending target.", new String[] { e.toString()} ), e );
 		}
 	}