Reversing changes made to fix bug 107571. The fix for bug 119683 covers this problem too. Inferior process shouldn't be shown as a part of the attach session.

3 files changed, 8 insertions, 15 deletions

diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 1ddee5a5a40..b0448bd9583 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-25 Mikhail Khodjaiants
+	Reversing changes made to fix bug 107571. The fix for bug 119683 covers this problem too.
+	Inferior process shouldn't be shown as a part of the attach session.
+	* LocalCDILaunchDelegate.java
+	* LocalAttachLaunchDelegate.java
+
 2006-01-23 Mikhail Khodjaiants
 	Bug 119683: long messages during launch cause gdb to timeout, launch to fail.
 	+ LocalCDILaunchDelegate.java
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java
index f354c1c1fe9..cb149b22c4d 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java
@@ -11,7 +11,6 @@
 package org.eclipse.cdt.launch.internal;
 
 import java.io.FileNotFoundException;
-
 import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.debug.core.CDIDebugModel;
@@ -37,7 +36,6 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.debug.core.model.IProcess;
 
 public class LocalAttachLaunchDelegate extends AbstractCLaunchDelegate {
 
@@ -105,14 +103,8 @@ public class LocalAttachLaunchDelegate extends AbstractCLaunchDelegate {
 							setDefaultSourceLocator(launch, config);
 							ICDITarget[] targets = dsession.getTargets();
 							for (int i = 0; i < targets.length; i++) {
-								Process process = targets[i].getProcess();
-								IProcess iprocess = null;
-								if (process != null) {
-									iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(exePath.toOSString()), getDefaultProcessMap());
-								}
-
 								CDIDebugModel.newDebugTarget(launch, cproject.getProject(), targets[i],
-										renderTargetLabel(debugConfig), iprocess, exeFile, true, true, false);
+										renderTargetLabel(debugConfig), null, exeFile, true, true, false);
 							}
 						} catch (CoreException e) {
 							try {
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
index 8e6c11e2b69..a48069a9311 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
@@ -204,12 +204,7 @@ public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate {
 		try {
 			ICDITarget[] targets = dsession.getTargets();
 			for( int i = 0; i < targets.length; i++ ) {
-				Process process = targets[i].getProcess();
-				IProcess iprocess = null;
-				if ( process != null ) {
-					iprocess = DebugPlugin.newProcess( launch, process, renderProcessLabel( exePath.toOSString() ), getDefaultProcessMap() );
-				}
-				CDIDebugModel.newDebugTarget( launch, project.getProject(), targets[i], renderTargetLabel( debugConfig ), iprocess, exeFile, true, true, false );
+				CDIDebugModel.newDebugTarget( launch, project.getProject(), targets[i], renderTargetLabel( debugConfig ), null, exeFile, true, true, false );
 			}
 		}
 		catch( CoreException e ) {