# HG changeset patch
# User wpaul
# Date 1274394662 18000
# Node ID 4ddf9fb521b2d753bbf9d268764387504a76114e
# Parent  d1b0b4e203e9cb94c5bbfbfd9a35a6c74166ca0e
removed old crash debugger.

diff -r d1b0b4e203e9 -r 4ddf9fb521b2 debuggercdi/com.nokia.carbide.cpp.debug.crashdebugger/src/com/nokia/carbide/cpp/debug/crashdebugger/CrashDebuggerLaunchDelegate.java
--- a/debuggercdi/com.nokia.carbide.cpp.debug.crashdebugger/src/com/nokia/carbide/cpp/debug/crashdebugger/CrashDebuggerLaunchDelegate.java	Thu May 20 13:57:30 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.crashdebugger/src/com/nokia/carbide/cpp/debug/crashdebugger/CrashDebuggerLaunchDelegate.java	Thu May 20 17:31:02 2010 -0500
@@ -24,6 +24,7 @@
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -31,9 +32,10 @@
 import org.eclipse.ui.PlatformUI;
 
 import com.freescale.cdt.debug.cw.core.cdi.Session;
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
 import com.nokia.cdt.internal.debug.launch.NokiaAbstractLaunchDelegate;
 
+import cwdbg.PreferenceConstants;
+
 public class CrashDebuggerLaunchDelegate extends NokiaAbstractLaunchDelegate {
 
 	protected String getPluginID() {
@@ -57,8 +59,20 @@
 				return;
 			}
 
-			// See comment for this method for more.
-            SettingsData.setInternalPreferences(config, SettingsData.LaunchConfig_CrashDebugger);
+    		ILaunchConfigurationWorkingCopy wc = null;
+    		try {
+    			wc = config.getWorkingCopy();
+    			
+    			if (wc == null)
+    				return;
+    			
+    			wc.setAttribute( PreferenceConstants.J_PN_SupportOSView, true );
+    			wc.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, true );	
+    			
+    			wc.doSave();
+    		} catch (CoreException e) {
+    			e.printStackTrace();
+    		}
             			
 			CrashDebuggerSession session = null;
 			
diff -r d1b0b4e203e9 -r 4ddf9fb521b2 debuggercdi/com.nokia.carbide.cpp.debug.crashdebugger/src/com/nokia/carbide/cpp/debug/crashdebugger/ui/CrashDebugConfigurationTabGroup.java
--- a/debuggercdi/com.nokia.carbide.cpp.debug.crashdebugger/src/com/nokia/carbide/cpp/debug/crashdebugger/ui/CrashDebugConfigurationTabGroup.java	Thu May 20 13:57:30 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.crashdebugger/src/com/nokia/carbide/cpp/debug/crashdebugger/ui/CrashDebugConfigurationTabGroup.java	Thu May 20 17:31:02 2010 -0500
@@ -23,10 +23,14 @@
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
 import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
 
+import com.freescale.cdt.debug.cw.core.settings.ConnectionTypeInfo;
+import com.freescale.cdt.debug.cw.core.settings.DebuggerCommonData;
 import com.nokia.carbide.cpp.debug.crashdebugger.CrashDebugger;
 import com.nokia.cdt.debug.cw.symbian.SettingsData;
 import com.nokia.cdt.internal.debug.launch.ui.RomLogFileTab;
 
+import cwdbg.PreferenceConstants;
+
 public class CrashDebugConfigurationTabGroup extends
 		AbstractLaunchConfigurationTabGroup {
 
@@ -45,15 +49,46 @@
 	 * 
 	 * @see ILaunchConfigurationTabGroup#setDefaults(ILaunchConfigurationWorkingCopy)
 	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
+	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
 		// Call this to make sure options on those CDT common tabs such as "Common"
 		// and "Source" have correct default.
-		super.setDefaults(config);
+		super.setDefaults(configuration);
+
+		configuration.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, CrashDebugger.DEBUGGER_ID);
+		
+		configuration.setAttribute(DebuggerCommonData.Host_App_Path, ""); //$NON-NLS-1$
+		configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
+		configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, ""); //$NON-NLS-1$
+
+		// set rom log file defaults.  do this for all launch types since it shouldn't hurt
+		// and could be easy to miss some launch types that use this tab
+		configuration.setAttribute(PreferenceConstants.J_PN_ParseRomLogFile, false);
+		configuration.setAttribute(PreferenceConstants.J_PN_RomLogFilePath, ""); //$NON-NLS-1$
+		configuration.setAttribute(PreferenceConstants.J_PN_SymbianKitEpoc32Dir, ""); //$NON-NLS-1$
+		configuration.setAttribute(PreferenceConstants.J_PN_LogUnresolved, false);
 
-		config.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, CrashDebugger.DEBUGGER_ID);
-		SettingsData.setDefaults(
-					config, 
-					SettingsData.LaunchConfig_CrashDebugger, 
-					null /* no project needed for CD */);
+		configuration.setAttribute( PreferenceConstants.J_PN_SupportOSView, true );
+		configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, true );	
+		
+		SettingsData.setSerialConnTab(configuration, null);
+
+		// Crash debugger: specify crash debugger protocol plugin.
+		//
+		// For crash debugger, we don't need a project. But don't set the name to "" as it would 
+		// cause crasher in CDT if we tries to create CDebugTarget without a project.
+		configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, "Any"); //$NON-NLS-1$
+		
+		ConnectionTypeInfo connTI = new ConnectionTypeInfo(
+				"Carbide CrashDebugger", // Internal ID //$NON-NLS-1$
+				"SymbianCrashDebuggerProtocol", // Display name. see SymbianCrashDebuggerPrefix.h on DE side. //$NON-NLS-1$
+				SettingsData.spn_SerialComm); // Pref panel name
+
+		DebuggerCommonData.setLaunchConfigConnSettings(
+				configuration,
+				connTI, 
+				"SymbianCrashDebuggerProtocol", //$NON-NLS-1$
+				""); // see SymbianCrashDebuggerPrefix.h on DE side //$NON-NLS-1$
+
+		configuration.setAttribute(SettingsData.ATTR_originalName, configuration.getName());
 	}
 }
diff -r d1b0b4e203e9 -r 4ddf9fb521b2 debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Thu May 20 13:57:30 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Thu May 20 17:31:02 2010 -0500
@@ -32,7 +32,6 @@
 Export-Package: com.nokia.cdt.debug.cw.symbian;
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,
-   com.nokia.carbide.cpp.debug.crashdebugger,
    com.nokia.cdt.debug.cw.symbian.tests,
    com.nokia.cdt.debug.launch,
    com.nokia.cdt.debug.launch.platSim,
@@ -40,24 +39,20 @@
  com.nokia.cdt.debug.cw.symbian.binaryparser;
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,
-   com.nokia.carbide.cpp.debug.crashdebugger,
    com.nokia.cdt.debug.cw.symbian.tests,
    com.nokia.cdt.debug.launch",
  com.nokia.cdt.debug.cw.symbian.symbolreader;
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,
-   com.nokia.carbide.cpp.debug.crashdebugger,
    com.nokia.cdt.debug.cw.symbian.tests,
    com.nokia.cdt.debug.launch",
  com.nokia.cdt.debug.cw.symbian.ui;
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,
-   com.nokia.carbide.cpp.debug.crashdebugger,
    com.nokia.cdt.debug.cw.symbian.tests,
    com.nokia.cdt.debug.launch",
  com.nokia.cdt.debug.cw.symbian.ui.executables;
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,
-   com.nokia.carbide.cpp.debug.crashdebugger,
    com.nokia.cdt.debug.cw.symbian.tests,
    com.nokia.cdt.debug.launch"
diff -r d1b0b4e203e9 -r 4ddf9fb521b2 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Thu May 20 13:57:30 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Thu May 20 17:31:02 2010 -0500
@@ -80,7 +80,6 @@
 	public static final String LaunchConfig_Emulator = PREFIX + ".LaunchConfig_Emulator"; //$NON-NLS-1$
 	public static final String LaunchConfig_AppTRK = PREFIX + ".LaunchConfig_AppTRK"; //$NON-NLS-1$
 	public static final String LaunchConfig_SysTRK = PREFIX + ".LaunchConfig_SysTRK"; //$NON-NLS-1$
-	public static final String LaunchConfig_CrashDebugger = PREFIX + ".LaunchConfig_CrashDebugger"; //$NON-NLS-1$
 	public static final String LaunchConfig_Trace32 = PREFIX + ".LaunchConfig_Trace32"; //$NON-NLS-1$
 
 	public static final String ATTR_originalName = "originalName"; //$NON-NLS-1$
@@ -620,7 +619,7 @@
 		{
 			configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, false );
 		}
-		else // others like T32 and crash debugger.
+		else // others like T32
 			configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, true );	
 	}
 
@@ -731,14 +730,9 @@
 		configuration.setAttribute(PreferenceConstants.J_PN_SymbianKitEpoc32Dir, ""); //$NON-NLS-1$
 		configuration.setAttribute(PreferenceConstants.J_PN_LogUnresolved, false);
 
-		// For all but crash debugger, use our "SymbianDebugger".
-		// Crash debugger will set its own debugger (see CrashDebugConfigurationTabGroup.setDefaults()).
-		// 
-		if (!settingsGroup.equals(LaunchConfig_CrashDebugger)) {
-			configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, SymbianDebugger.DEBUGGER_ID);
-			// Executables tab is not shown for crash debugger launch configuration.
-			setExecutablesTab(configuration, settingsGroup, project);
-		}
+		configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, SymbianDebugger.DEBUGGER_ID);
+
+		setExecutablesTab(configuration, settingsGroup, project);
 		
 		setInternalPreferences(configuration, settingsGroup);
 
@@ -749,8 +743,7 @@
 		}
 		
 		if (settingsGroup.equals(LaunchConfig_AppTRK) || 
-			    settingsGroup.equals(LaunchConfig_SysTRK) ||
-				settingsGroup.equals(LaunchConfig_CrashDebugger))
+			    settingsGroup.equals(LaunchConfig_SysTRK))
 		{
 			setSerialConnTab(configuration, project);
 		}
@@ -793,25 +786,6 @@
 					""); // Protocol plugin name //$NON-NLS-1$
 		}
 
-		if (settingsGroup.equals(LaunchConfig_CrashDebugger)) {
-			// Crash debugger: specify crash debugger protocol plugin.
-			//
-			// For crash debugger, we don't need a project. But don't set the name to "" as it would 
-			// cause crasher in CDT if we tries to create CDebugTarget without a project.
-			configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, "Any"); //$NON-NLS-1$
-			
-			ConnectionTypeInfo connTI = new ConnectionTypeInfo(
-					"Carbide CrashDebugger", // Internal ID //$NON-NLS-1$
-					"SymbianCrashDebuggerProtocol", // Display name. see SymbianCrashDebuggerPrefix.h on DE side. //$NON-NLS-1$
-					spn_SerialComm); // Pref panel name
-
-			DebuggerCommonData.setLaunchConfigConnSettings(
-					configuration,
-					connTI, 
-					"SymbianCrashDebuggerProtocol", //$NON-NLS-1$
-					""); // see SymbianCrashDebuggerPrefix.h on DE side //$NON-NLS-1$
-		}
-		
 		if (settingsGroup.equals(LaunchConfig_Trace32)) {
 			String t32ExePathStr = "C:\\t32\\t32marm.exe"; //$NON-NLS-1$