removed trace32 and nokia trace32 support.
authorwpaul
Thu, 20 May 2010 19:05:56 -0500
changeset 1384 10b788ab16fe
parent 1383 619a297ab336
child 1385 e626d1981906
removed trace32 and nokia trace32 support.
core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java
debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml
debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java
debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java
debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/T32CommLogConsoleFactory.java
debuggercdi/com.nokia.cdt.debug.launch/plugin.xml
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/BoardLaunchShortcut.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/Trace32LaunchDelegate.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesBlock.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/LaunchTabHelpIds.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomImageTab.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/StopModeDebuggerTab.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/T32ConfigFileReader.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/T32StopModeConfigurationTabGroup.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/Trace32ConnectionTab.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AbstractLaunchWizard.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCategorySelectionPage.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardHelpIds.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/StopModeRomImageWizardPage.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32LaunchWizard.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32WizardPage.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties
--- a/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java	Thu May 20 18:40:28 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java	Thu May 20 19:05:56 2010 -0500
@@ -21,10 +21,8 @@
 	public static final String CARBIDE_KERNELAWARE = "Carbide_KernelAware"; // symbian os data view
 	public static final String CARBIDE_SYS_TRK = "Carbide_Sys_TRK";
 	public static final String CARBIDE_PROFILER = "Carbide_Profiler";
-	public static final String CARBIDE_CRASH_DEBUGGER = "Carbide_Crash_Debugger";
 	public static final String CARBIDE_APPDEP = "Carbide_AppDep"; // dependency explorer
 	public static final String CARBIDE_CODESCANNER = "Carbide_CodeScanner";
-	public static final String CARBIDE_TRACE32 = "Carbide_Trace32";
 	public static final String CARBIDE_OST_TRACE = "Carbide_OST_Trace";
 	public static final String CARBIDE_IDE = "Carbide_IDE"; // did user launch IDE
 	public static final String CARBIDE_INTERNALONLY = "Carbide_InternalOnly"; // many carbide extensions
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml	Thu May 20 19:05:56 2010 -0500
@@ -74,12 +74,6 @@
             label="New TRK Communications Log Console"
             class="com.nokia.cdt.debug.cw.symbian.TRKCommLogConsoleFactory"/>
    </extension>
-    <extension
-         point="org.eclipse.ui.console.consoleFactories">
-      <consoleFactory
-            label="New Trace32 Communications Log Console"
-            class="com.nokia.cdt.debug.cw.symbian.T32CommLogConsoleFactory"/>
-   </extension>
    <extension
          point="org.eclipse.ui.console.consoleFactories">
       <consoleFactory
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Thu May 20 19:05:56 2010 -0500
@@ -60,7 +60,6 @@
 import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
 import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
 import com.nokia.carbide.cdt.builder.project.ISISBuilderInfo;
-import com.nokia.carbide.cpp.internal.support.SupportPlugin;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
 import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
@@ -80,7 +79,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_Trace32 = PREFIX + ".LaunchConfig_Trace32"; //$NON-NLS-1$
 
 	public static final String ATTR_originalName = "originalName"; //$NON-NLS-1$
 
@@ -99,7 +97,6 @@
 	public static final String APP_TRK_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "appTRKLaunch"; //$NON-NLS-1$
 	public static final String SYS_TRK_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "systemTRKLaunch"; //$NON-NLS-1$
 	public static final String ATTACH_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "attachLaunch"; //$NON-NLS-1$
-	public static final String T32_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "t32Launch"; //$NON-NLS-1$
 
 	//================ Shadowed CW Preference Panels =================================
 	// These match prefs in a pref panel that exist in the CodeWarrior IDE. The names
@@ -125,17 +122,6 @@
 	public static final String spn_SerialComm_serialConn= SPN(spn_SerialComm, "serial"); //$NON-NLS-1$
 	public static final String spn_SerialComm_xtiConn= SPN(spn_SerialComm, "tcpip"); //$NON-NLS-1$
 
-	//---< T32 Connection Panel> -------------------
-	
-	public static final String spn_Trace32Conn= "Trace32 Connection"; //$NON-NLS-1$
-	
-	public static final String spn_Trace32Conn_ExePath= SPN(spn_Trace32Conn, "LauterbachTrace32ExePath"); //$NON-NLS-1$
-	public static final String spn_Trace32Conn_ConfigFilePath= SPN(spn_Trace32Conn, "Trace32ConfigFilePath"); //$NON-NLS-1$
-	public static final String spn_Trace32Conn_BootScriptFile= SPN(spn_Trace32Conn, "Trace32BootConfigFilePath"); //$NON-NLS-1$
-	public static final String spn_Trace32Conn_UdpPort= SPN(spn_Trace32Conn, "LauterbachTrace32UDPPort"); //$NON-NLS-1$
-	public static final String spn_Trace32Conn_LogOption= SPN(spn_Trace32Conn, "Trace32LogOption"); //$NON-NLS-1$	
-	public static final String spn_Trace32Conn_BootConfigArgs= SPN(spn_Trace32Conn, "Trace32BootConfigArgs"); //$NON-NLS-1$
-	
 	//================= End of Shadowed panels ===========================================
 
 	public static final String TARGET_PATH_INCLUDES_FILENAME = "TARGET_PATH_INCLUDES_FILENAME"; //$NON-NLS-1$
@@ -434,31 +420,6 @@
 		}	
 	}
 	
-	public static void setRomImgTab(ILaunchConfigurationWorkingCopy configuration, IProject project) {
-
-		configuration.setAttribute( PreferenceConstants.J_PN_DownloadRomImage, false);
-		configuration.setAttribute( PreferenceConstants.J_PN_RomImagePath, ""); //$NON-NLS-1$
-		configuration.setAttribute( PreferenceConstants.J_PN_DownloadAddress, 0);
-		configuration.setAttribute( PreferenceConstants.J_PN_AskForDownload, true);		
-
-		if (project != null) {
-	        ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project.getProject());
-	        
-	        if (cpi != null) {
-	        	final ICarbideBuildConfiguration buildConfig = cpi.getDefaultConfiguration();
-	    		if (buildConfig != null){
-	    			if (buildConfig.getPlatformString().compareTo(ISymbianBuildContext.EMULATOR_PLATFORM) != 0) {
-	    				String epoc32Dir = buildConfig.getSDK().getEPOCROOT()+ "epoc32";
-	    				if (new File(epoc32Dir).exists())
-	    					configuration.setAttribute(PreferenceConstants.J_PN_SymbianKitEpoc32Dir, epoc32Dir);
-	    			} else {
-	    				displayWarningDialog(Messages.getString("SettingsData.37")); //$NON-NLS-1$
-	    			}
-	    		}
-	        }
-		}	        
-	}
-
 	public static void setTrkDebuggerTab(ILaunchConfigurationWorkingCopy configuration, IProject project) {
 		//======  TRK:  debugger tab ================================================================
 		//
@@ -619,8 +580,6 @@
 		{
 			configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, false );
 		}
-		else // others like T32
-			configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, true );	
 	}
 
 	// a convenience function.
@@ -761,13 +720,6 @@
 			setFileTransferTab(configuration, project);
 		}
 
-		if (settingsGroup.equals(LaunchConfig_Trace32))
-		{
-			setStopModeMainTab(configuration, project);
-			setStopModeDebuggerTab(configuration, project);
-			setRomImgTab(configuration, project);
-		}
-
 		if (settingsGroup.equals(LaunchConfig_AppTRK) || settingsGroup.equals(LaunchConfig_SysTRK)) {
 			setTrkMainTab(configuration, project);
 			setTrkDebuggerTab(configuration, project);
@@ -786,40 +738,6 @@
 					""); // Protocol plugin name //$NON-NLS-1$
 		}
 
-		if (settingsGroup.equals(LaunchConfig_Trace32)) {
-			String t32ExePathStr = "C:\\t32\\t32marm.exe"; //$NON-NLS-1$
-			
-			//set the default config file from the Symbian support folder which has the predefined settings for connecting to Carbide.
-			String supportDir = SupportPlugin.getDefault().getSymbianSupportDirectory();
-			String defaultConfigFilePath = supportDir + "\\Trace32\\config_carbide.t32"; //$NON-NLS-1$
-	
-			if (new File("C:\\apps\\t32\\t32marm.exe").exists()) { //$NON-NLS-1$
-				t32ExePathStr = "C:\\apps\\t32\\t32marm.exe"; //$NON-NLS-1$
-				// use config_carbide_1.t32 where the SYS path is C:\Apps\T32\
-				defaultConfigFilePath = supportDir + "\\Trace32\\config_carbide_1.t32"; //$NON-NLS-1$
-			}
-
-			configuration.setAttribute(spn_Trace32Conn_ExePath, t32ExePathStr);
-			configuration.setAttribute(spn_Trace32Conn_ConfigFilePath, defaultConfigFilePath);
-			configuration.setAttribute(spn_Trace32Conn_BootScriptFile, ""); //$NON-NLS-1$
-			configuration.setAttribute(spn_Trace32Conn_LogOption, false);
-			configuration.setAttribute(spn_Trace32Conn_UdpPort, "20000"); //$NON-NLS-1$
-			configuration.setAttribute(spn_Trace32Conn_BootConfigArgs, ""); //$NON-NLS-1$
-
-			// Stop mode debugging using Trace32 : specify Trace32 debugger protocol plugin.
-			//
-			ConnectionTypeInfo connTI = new ConnectionTypeInfo(
-					"Carbide Trace32", // Internal ID //$NON-NLS-1$
-					"Trace32 Configuration", // Display name. //$NON-NLS-1$
-					"Trace32 Connection"); // Pref panel name
-
-			DebuggerCommonData.setLaunchConfigConnSettings(
-					configuration,
-					connTI, 
-					"LAUTERBACH TRACE32 Plugin", //$NON-NLS-1$
-					""); //$NON-NLS-1$
-		}
-	
 		// Add the Symbian OS SDK Mapping.
 		addSymbianSDKMapping(project, configuration);
 
@@ -943,20 +861,6 @@
 		} );
 	}
 	
-	
-	public static boolean isStopModeConfiguration(ILaunchConfiguration configuration) {
-		try {
-			ILaunchConfigurationType configurationType = configuration.getType();
-			String id = configurationType.getIdentifier();
-			return id.equals(T32_LAUNCH_TYPE_ID) ||
-			id.endsWith("T32Launch"); //$NON-NLS-1$
-		} catch (CoreException e) {
-		}
-		
-		return false;
-	}
-
-
 	public static boolean isAppTRKConfiguration(ILaunchConfiguration configuration) {
 		try {
 			ILaunchConfigurationType configurationType = configuration.getType();
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java	Thu May 20 19:05:56 2010 -0500
@@ -43,7 +43,6 @@
 	private final String debugConsoleName = "Emulation Program Output"; //$NON-NLS-1$
 	private final String unframedDataConsoleName = "TRK Program Output"; //$NON-NLS-1$
 	private final String commMessagesConsoleName = "TRK Communication Log"; //$NON-NLS-1$
-	private final String t32CommMessagesConsoleName = "Trace32 Communications Log"; //$NON-NLS-1$
 	private final String symbianRomLogMessagesConsoleName = "Rom Log File Messages";
 	public static final String DebugTraceMessagesConsoleName = "Emulator Output"; //$NON-NLS-1$
 	
@@ -145,10 +144,6 @@
 		openConsole(commMessagesConsoleName, clearConsole);
 	}
 	
-	public void openT32CommLogConsole(boolean clearConsole) {
-		openConsole(t32CommMessagesConsoleName, clearConsole);
-	}
-	
 	public void openSymbianRomLogConsole(boolean clearConsole) {
 		openConsole(symbianRomLogMessagesConsoleName, clearConsole);
 	}
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/T32CommLogConsoleFactory.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-package com.nokia.cdt.debug.cw.symbian;
-
-import org.eclipse.ui.console.*;
-
-/**
- * Console factory is used to show the console from the Console view "Open Console"
- * drop-down action. This factory is registered via the org.eclipse.ui.console.consoleFactory 
- * extension point. 
- * 
- * @since 3.1
- */
-public class T32CommLogConsoleFactory implements IConsoleFactory {
-
-	public T32CommLogConsoleFactory() {
-	}
-	
-	public void openConsole() {
-		SymbianPlugin.getDefault().openT32CommLogConsole(true);
-	}
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Thu May 20 19:05:56 2010 -0500
@@ -49,17 +49,6 @@
             sourcePathComputerId="com.nokia.cdt.debug.common.internal.source.lookup.CarbideSourcePathComputer">
       </launchDelegate>
     
-      <launchDelegate
-            name="Classic Symbian OS Trace32"
-            delegate="com.nokia.cdt.internal.debug.launch.Trace32LaunchDelegate"
-            delegateDescription="Launch a classic Symbian OS Trace32 debug session."          
-            modes="debug"
-            type="com.nokia.cdt.debug.launch.t32Launch"
-            id="com.nokia.cdt.debug.launch.t32LaunchDelegate"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="com.nokia.cdt.debug.common.internal.source.lookup.CarbideSourcePathComputer">
-      </launchDelegate>
-      
    </extension>
 
    <extension
@@ -89,12 +78,6 @@
             id="com.nokia.cdt.debug.launch.attachLaunch">
       </launchConfigurationType>
     
-      <launchConfigurationType
-            name="Symbian OS Trace32"
-            public="true"
-            id="com.nokia.cdt.debug.launch.t32Launch">
-      </launchConfigurationType>
-      
    </extension>
    
   <extension
@@ -120,11 +103,6 @@
             configTypeID="com.nokia.cdt.debug.launch.attachLaunch"
             id="com.nokia.cdt.debug.launch.attachLaunchImage">
       </launchConfigurationTypeImage>
-      <launchConfigurationTypeImage
-            icon="icons/launch_config_file_16x16.png"
-            configTypeID="com.nokia.cdt.debug.launch.t32Launch"
-            id="com.nokia.cdt.debug.launch.t32LaunchImage">
-      </launchConfigurationTypeImage>
     </extension>
 
    <extension
@@ -162,16 +140,6 @@
             id="com.nokia.cdt.debug.launch.attachLaunchTabGroup">
       </launchConfigurationTabGroup>
     </extension>
-
-	<extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="com.nokia.cdt.debug.launch.t32Launch"
-            class="com.nokia.cdt.internal.debug.launch.ui.T32StopModeConfigurationTabGroup"
-            id="com.nokia.cdt.debug.launch.t32LaunchTabGroup">
-      </launchConfigurationTabGroup>
-    </extension>
-    
  
     <extension
          point="org.eclipse.debug.ui.launchShortcuts">
@@ -255,85 +223,6 @@
          </description>
       </shortcut>
       <shortcut
-            class="com.nokia.cdt.internal.debug.launch.BoardLaunchShortcut"
-            icon="icons/launch_config_file_16x16.png"
-            id="com.nokia.cdt.debug.launch.symbianCPPShortcut.refboard"
-            label="Symbian OS Reference Board Launch"
-            modes="run, debug">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate>
-                     <and>
-                        <or>
-                           <instanceof
-                                 value="org.eclipse.cdt.core.model.IBinary">
-                           </instanceof>
-                           <instanceof
-                                 value="org.eclipse.cdt.core.model.ICProject">
-                           </instanceof>
-                           <instanceof
-                                 value="org.eclipse.cdt.debug.core.executables.Executable">
-                           </instanceof>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="org.eclipse.cdt.launch.isExecutable">
-                           </test>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="org.eclipse.cdt.launch.isCProject">
-                           </test>
-                           <and>
-                              <instanceof
-                                    value="org.eclipse.ui.IFileEditorInput">
-                              </instanceof>
-                              <adapt
-                                    type="org.eclipse.core.resources.IResource">
-                                 <adapt
-                                       type="org.eclipse.cdt.core.model.ICElement">
-                                 </adapt>
-                              </adapt>
-                           </and>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="com.nokia.cdt.debug.launch.isCarbideProject">
-                           </test>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="com.nokia.cdt.debug.launch.isExecutable">
-                           </test>
-                        </or>
-                        <test
-                              forcePluginActivation="true"
-                              property="com.nokia.cdt.debug.launch.isNotEmulator">
-                        </test>
-                     </and>
-                  </iterate>
-               </with>
-            </enablement>
-            <contextLabel
-                  label="Run Symbian OS System on Reference Board"
-                  mode="run">
-            </contextLabel>
-            <contextLabel
-                  label="Debug Symbian OS System on Reference Board"
-                  mode="debug">
-            </contextLabel>
-         </contextualLaunch>
-         <description
-               description="Runs on a development board or reference hardware using a JTAG connection."
-               mode="run">
-         </description>
-         <description
-               description="Debugs on a development board or reference hardware using a JTAG connection."
-               mode="debug">
-         </description>
-      </shortcut>
-      <shortcut
             class="com.nokia.cdt.internal.debug.launch.EmulatorLaunchShortcut"
             icon="icons/launch_config_file_16x16.png"
             id="com.nokia.cdt.debug.launch.symbianCPPShortcut.emulator"
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/BoardLaunchShortcut.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch;
-
-import org.eclipse.cdt.debug.core.executables.Executable;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchConfiguration;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin.ILaunchCreationWizardFactory;
-import com.nokia.cdt.internal.debug.launch.wizard.AbstractLaunchWizard;
-import com.nokia.cdt.internal.debug.launch.wizard.ILaunchCreationWizard;
-import com.nokia.cdt.internal.debug.launch.wizard.LaunchCreationWizard;
-import com.nokia.cdt.internal.debug.launch.wizard.LaunchCreationWizardInstance;
-import com.nokia.cdt.internal.debug.launch.wizard.LaunchOptions;
-
-public class BoardLaunchShortcut extends AbstractSymbianLaunchShortcut {
-	
-	/* (non-Javadoc)
-	 * @see com.nokia.cdt.internal.debug.launch.AbstractSymbianLaunchShortcut#isSupportedConfiguration(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	@Override
-	protected boolean isSupportedConfiguration(ILaunchConfiguration config)
-			throws CoreException {
-		return SettingsData.isStopModeConfiguration(config);
-	}
-	
-	@Override
-	protected void launchProject(IProject project, Executable executable, IPath defaultMMP, String mode) {
-		LaunchPlugin.getDefault().launchProject(project, executable, defaultMMP, mode, 
-																new ILaunchCreationWizardFactory() {
-			public ILaunchCreationWizard createLaunchCreationWizard(LaunchOptions launchOptions) throws Exception {
-				LaunchCreationWizard creationWizard = 
-					LaunchCreationWizardInstance.getInstance().create(
-						launchOptions.project, 
-						launchOptions.configurationName, 
-						launchOptions.mmps,
-						launchOptions.exes,
-						launchOptions.defaultExecutable,
-						launchOptions.isEmulation,
-						launchOptions.emulatorOnly,
-						launchOptions.mode);
-				creationWizard.setCategoryId(AbstractLaunchWizard.BOARD_CATEGORY_ID);
-				return creationWizard;
-			}
-		});
-	}
-
-
-}
-
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/Trace32LaunchDelegate.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch;
-
-import java.io.File;
-
-import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.debug.core.ICDebugConfiguration;
-import org.eclipse.cdt.debug.core.cdi.ICDISession;
-import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-
-import com.freescale.cdt.debug.cw.CWException;
-import com.freescale.cdt.debug.cw.core.cdi.Session;
-import com.freescale.cdt.debug.cw.core.cdi.model.Target;
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.debug.cw.symbian.SymbianPlugin;
-
-import cwdbg.PreferenceConstants;
-
-public class Trace32LaunchDelegate extends NokiaAbstractLaunchDelegate {
-
-	public void launch(ILaunchConfiguration config, 
-					   String mode,
-					   ILaunch launch, 
-					   IProgressMonitor monitor) throws CoreException {
-		
-
-		// See comment at definition of the "mutex" for why this "synchronized".		
-		synchronized(Session.sessionStartStopMutex()) {
-
-	        if (monitor == null) {
-	            monitor = new NullProgressMonitor();
-	        }
-
-	        monitor.beginTask(LaunchMessages.getString("LocalRunLaunchDelegate.Launching_Local_C_Application"), 10); //$NON-NLS-1$
-	        // check for cancellation
-	        if (monitor.isCanceled())
-	            return;
-
-	        try {
-	        	addBeingLaunched(config); // indicating the LC is being launched
-	        	
-	            monitor.worked(1);
-	            IPath exePath = verifyProgramPath(config);
-	            ICProject project = verifyCProject(config);
-	            IBinaryObject exeFile = verifyBinary(project, exePath);
-	            String arguments[] = getProgramArgumentsArray(config);
-
-				// See comment for this method for more.
-	            SettingsData.setInternalPreferences(config, SettingsData.LaunchConfig_Trace32);
-	            			
-	            // set the default source locator if required
-	            setDefaultSourceLocator(launch, config);
-
-	            if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-	                // debug mode
-	                ICDebugConfiguration debugConfig = getDebugConfig(config);
-	                ICDISession dsession = null;
-	                String debugMode = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
-	                        ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
-	                if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
-	                    dsession = debugConfig.createDebugger().createDebuggerSession(launch, exeFile,
-	                            new SubProgressMonitor(monitor, 8));
-
-						assert(dsession instanceof Session);
-						Session cwDebugSession = (Session)dsession;
-
-						doAdditionalSessionSetup(cwDebugSession);
-						
-						IPath[] otherExecutables = getOtherExecutables(project, exePath, config, monitor);
-
-						{
-							try {
-								monitor.worked(1);
-								
-								// if enabled in the prefs, show the console view(s)
-								if (config.getAttribute(SettingsData.spn_Trace32Conn_LogOption, false)) {
-									SymbianPlugin.getDefault().openT32CommLogConsole(true);
-								}
-								if (config.getAttribute(PreferenceConstants.J_PN_LogUnresolved, false)) {
-									SymbianPlugin.getDefault().openSymbianRomLogConsole(true);
-								}
-								
-								config = synchronizeWithProjectAccessPaths(project, config);
-								
-								File wd = getWorkingDirectory(config);
-								Target target = cwDebugSession.launchExecutable(launch, config, exeFile, otherExecutables, arguments, wd, getEnvironmentAsProperty(config), monitor, project, getTargetLabel(exeFile.getName()), true);
-								ATFLaunchSupport.saveDebugTargetFromLaunchDelegate(target.getCoreModelTarget());
-
-							} catch (CoreException e) {
-								Session session = (Session)dsession;
-								session.cleanupAfterLaunchFailure();
-								throw e;
-							} catch (Exception e) {
-								Session session = (Session)dsession;
-								session.debuggingStopped(null);
-								String msg = e.getLocalizedMessage();
-								if (msg == null)
-									msg = "Trace32 Debug session launch error due to exception.";
-								this.abort(msg, null, 0);
-							}
-						}
-	                }
-	            }
-	            else if (mode.equals(ILaunchManager.RUN_MODE)) {
-	                // Run the program.
-	            	// Connect to DE, download and launch the program, close debug session.
-	                ICDebugConfiguration debugConfig = getDebugConfig(config);
-	                ICDISession dsession = null;
-	                
-	                // Set up communication with DE.
-	                dsession = debugConfig.createDebugger().createDebuggerSession(launch, exeFile,
-	                            new SubProgressMonitor(monitor, 8));
-
-	                // Launch the program through the DE.
-	                Session cwDebugSession = (Session)dsession;
-					cwDebugSession.launchExecutable(
-											launch, 
-											config, 
-											exeFile, 
-											new IPath[0], 
-											arguments, 
-											null, 
-											getEnvironmentAsProperty(config), 
-											monitor, 
-											project, 
-											"",  //$NON-NLS-1$
-											false  /* run instead of debug */);
-					
-					// The above call would throw exception on error. So it must have succeeded 
-					// if control gets here. Show success message in a dialog.
-		    		//
-		    		// get the name of the executable that's launched instead of, say, the DLL name if
-		    		// exeFile is a DLL.
-		    		final String exeLaunched = config.getAttribute(PreferenceConstants.J_PN_RemoteProcessToLaunch, exeFile.toString());
-					Display display = Display.getCurrent();
-					if (display == null) {
-						display = Display.getDefault();
-					}
-					
-					display.syncExec(new Runnable() {
-						public void run() {
-							MessageDialog.openInformation(
-								CUIPlugin.getActiveWorkbenchShell(),
-								LaunchMessages.getString("CarbideCPPLaunchDelegate.DebuggerName"),  //$NON-NLS-1$
-								LaunchMessages.getString("TRKLaunchDelegate.runSucceed") + //$NON-NLS-1$
-							           "\n\t\"" + exeLaunched + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-					});
-	            }
-	        } catch (CWException e) {
-	        	if (! monitor.isCanceled()) // don't throw on user cancellation
-	        		e.printStackTrace();
-			} catch (CoreException e) {
-	        	if (! monitor.isCanceled()) // don't throw on user cancellation
-	        		throw e;
-			} finally {
-	            monitor.done();
-	            removeBeingLaunched(config);
-	        }
-		} // end of synchronized.
-	}
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesBlock.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesBlock.java	Thu May 20 19:05:56 2010 -0500
@@ -16,8 +16,6 @@
 */
 package com.nokia.cdt.internal.debug.launch.ui;
 
-import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.*;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
@@ -49,7 +47,6 @@
 	 */
 	private CheckboxTableViewer fExeFileList;
 	private ExeFileToDebug fMainExecutable;
-	private boolean wantsMainExecutable;
 	
 	private final static Color GRAY = new Color(null, 128, 128, 128);
 
@@ -79,9 +76,8 @@
 		
 	}
 
-	ExecutablesBlock(ExecutablesTab launchTab, boolean wantsMainExecutable) {
+	ExecutablesBlock(ExecutablesTab launchTab) {
 		fLaunchTab = launchTab;
-		this.wantsMainExecutable = wantsMainExecutable;
 	}
 
 	/**
@@ -172,18 +168,10 @@
 			fExeFileList.setInput(fExeFiles);
 			fExeFileList.refresh();
 			
-			String launchExeName = ""; //$NON-NLS-1$
-			try {
-				launchExeName = AbstractCLaunchDelegate.getProgramName(fLaunchTab.getLaunchConfiguration());
-			} catch (CoreException e) {}
-
 			for (int i = 0; i < fExeFiles.size(); i++) {
 				ExeFileToDebug file = (ExeFileToDebug) fExeFiles.get(i);
 				fExeFileList.setChecked(file, file.getEnabled());
-				if (wantsMainExecutable && file.getExePath().equalsIgnoreCase(launchExeName)) {
-					fMainExecutable = file;
-				}
-			}			
+			}
 		}
 	}
 
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java	Thu May 20 19:05:56 2010 -0500
@@ -120,7 +120,6 @@
 	private int targetingRule;
 	private boolean supportsTargetAll;
 	private boolean disposed;
-	private boolean wantsMainExecutable;
 	private List<ExeFileToDebug> executablesToTarget;
 
 	public ExecutablesTab(boolean supportsTargetAll) {
@@ -146,7 +145,7 @@
 		ExecutablesTabHeader header = new ExecutablesTabHeader(comp, SWT.NONE);
 		header.setLayoutData(new GridData(GridData.FILL_HORIZONTAL, GridData.FILL_VERTICAL, true, false, 3, 1));
 
-		executablesBlock = new ExecutablesBlock(this, wantsMainExecutable);
+		executablesBlock = new ExecutablesBlock(this);
 		executablesBlock.createControl(comp);
 		Control control = executablesBlock.getControl();
 		GridData data = new GridData(GridData.FILL_BOTH);
@@ -221,7 +220,6 @@
 	 */
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		this.configuration = configuration;
-		wantsMainExecutable = SettingsData.isStopModeConfiguration(configuration);
 		try {
 			int targetingRule = configuration.getAttribute(SettingsData.LCS_ExecutableTargetingRule,
 					SettingsData.LCS_ExeTargetingRule_AllInSDK); //$NON-NLS-1$
@@ -272,36 +270,34 @@
 					PreferenceConstants.J_PN_SymbolLoadingRule,
 					PreferenceConstants.J_PV_SymbolLoadingRule_Auto);
 		
-		if (!wantsMainExecutable) {
-			// get the current program name because it needs to be set to some executable to target
-			String programName = null;
-			try {
-				programName = AbstractCLaunchDelegate.getProgramName(configuration);
-			} catch (CoreException e) {
+		// get the current program name because it needs to be set to some executable to target
+		String programName = null;
+		try {
+			programName = AbstractCLaunchDelegate.getProgramName(configuration);
+		} catch (CoreException e) {
+		}
+		
+		// only do this when the current program name is not empty.  if it is, we'll be changing it
+		// which causes the apply button to become enabled which is not expected behavior.  this will
+		// be called later if/when they do specify the main program, so we'll make sure then that it's
+		// actually being targeted.
+		if (programName != null && programName.length() > 0) {
+			boolean resetProgramName = true;
+			// check to see if the current program name is one of the executables to target
+			for (ExeFileToDebug exeFileToDebug : executablesToTarget) {
+				if (exeFileToDebug.getExePath().equalsIgnoreCase(programName)) {
+					resetProgramName = false;
+					break;
+				}
 			}
-			
-			// only do this when the current program name is not empty.  if it is, we'll be changing it
-			// which causes the apply button to become enabled which is not expected behavior.  this will
-			// be called later if/when they do specify the main program, so we'll make sure then that it's
-			// actually being targeted.
-			if (programName != null && programName.length() > 0) {
-				boolean resetProgramName = true;
-				// check to see if the current program name is one of the executables to target
+			if (resetProgramName) {
+				// ensure one of the enabled files to target is set as the program name
 				for (ExeFileToDebug exeFileToDebug : executablesToTarget) {
-					if (exeFileToDebug.getExePath().equalsIgnoreCase(programName)) {
-						resetProgramName = false;
+					if (exeFileToDebug.getEnabled()) {
+						configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, exeFileToDebug.getExePath());
 						break;
 					}
 				}
-				if (resetProgramName) {
-					// ensure one of the enabled files to target is set as the program name
-					for (ExeFileToDebug exeFileToDebug : executablesToTarget) {
-						if (exeFileToDebug.getEnabled()) {
-							configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, exeFileToDebug.getExePath());
-							break;
-						}
-					}
-				}
 			}
 		}
 	}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/LaunchTabHelpIds.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/LaunchTabHelpIds.java	Thu May 20 19:05:56 2010 -0500
@@ -54,14 +54,8 @@
 	
 	public static final String STOP_MODE_MAIN = HelpID_Prefix + "stopmode_main"; //$NON-NLS-1$
 	
-	public static final String STOP_MODE_DEBUGGER = HelpID_Prefix + "stopmode_debugger"; //$NON-NLS-1$
-	
 	public static final String STOP_MODE_EXCEPTIONS = HelpID_Prefix + "stopmode_exceptions"; //$NON-NLS-1$
 	
-	public static final String STOP_MODE_T32_CONNECTION = HelpID_Prefix + "stopmode_t32connection"; //$NON-NLS-1$
-	
-	public static final String STOP_MODE_ROM_IMAGE = HelpID_Prefix + "stopmode_romimage"; //$NON-NLS-1$
-	
 	public static final String RUN_MODE_ROM_LOG_FILE = HelpID_Prefix + "runmode_romlogfile"; //$NON-NLS-1$
 
 	public static final String PARTIAL_UPGRADE_ALERT_DIALOG = HelpID_Prefix + "partial_upgrade_alert_dialog"; //$NON-NLS-1$
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomImageTab.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,476 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.ui;
-
-import java.io.File;
-
-import org.eclipse.cdt.launch.ui.CLaunchConfigurationTab;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import com.freescale.swt.widgets.CheckboxGroup;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
-
-import cwdbg.PreferenceConstants;
-
-public class RomImageTab extends CLaunchConfigurationTab {
-
-	private Label osImageLabel;
-	private Text osImagePath;
-	private Button osImageBrowse;
-	private Label downloadAddressLabel;
-	private Text downloadAddress;
-	private Button askForDownload;
-	private CheckboxGroup downloadImgGroup;
-	
-	private CheckboxGroup parseRomLogGroup;
-	private Label romLogFileLabel;
-	private Text romLogFilePath;
-	private Button romLogFileBrowse;
-	
-	private Label epoc32DirLabel;
-	private Text epoc32DirPath;
-	private Button epoc32DirBrowse;
-	
-	private Button logUnresolvedModules;
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-				
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), LaunchTabHelpIds.STOP_MODE_ROM_IMAGE);
-		
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;		
-		comp.setLayout(topLayout);
-
-		createVerticalSpacer(comp, 2);		
-		createRomLogFileGroup(comp, 2);		
-		createOsImgGroup(comp, 2);		
-		
-		Dialog.applyDialogFont(parent);
-	}
-
-	protected void createOsImgGroup(Composite parent, int colSpan) {
-
-		Composite projComp = new Composite(parent, SWT.NONE);
-		GridLayout projLayout = new GridLayout();
-		projLayout.numColumns = 3;
-		projLayout.marginHeight = 0;
-		projLayout.marginWidth = 0;
-		projComp.setLayout(projLayout);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = colSpan;
-		projComp.setLayoutData(data);
-
-		downloadImgGroup = new CheckboxGroup(projComp, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		downloadImgGroup.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = colSpan;
-		downloadImgGroup.setLayoutData(gd);
-		downloadImgGroup.setText(Messages.getString("RomImageTab.9")); //$NON-NLS-1$
-		downloadImgGroup.setFont(parent.getFont());
-		downloadImgGroup.setToolTipText(Messages.getString("RomImageTab.10")); //$NON-NLS-1$
-		downloadImgGroup.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();				
-			}
-		});
-		osImageLabel = new Label(downloadImgGroup.getGroup(), SWT.NONE);
-		osImageLabel.setText(Messages.getString("RomImageTab.11")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		osImageLabel.setLayoutData(gd);
-		osImageLabel.setToolTipText(Messages.getString("RomImageTab.12")); //$NON-NLS-1$
-
-		osImagePath = new Text(downloadImgGroup.getGroup(), SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 1;
-		osImagePath.setLayoutData(gd);
-		osImagePath.setToolTipText(Messages.getString("RomImageTab.12")); //$NON-NLS-1$
-		osImagePath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		osImageBrowse = createPushButton(downloadImgGroup.getGroup(), Messages.getString("RomImageTab.13"), null); //$NON-NLS-1$
-		osImageBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("RomImageTab.14")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.img*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("RomImageTab.15"), Messages.getString("RomImageTab.16")}); //$NON-NLS-1$ //$NON-NLS-2$
-				
-				BrowseDialogUtils.initializeFrom(dialog, osImagePath);
-				
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					osImagePath.setText(result);
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-
-	
-		downloadAddressLabel = new Label(downloadImgGroup.getGroup(), SWT.NONE);
-		downloadAddressLabel.setText(Messages.getString("RomImageTab.17")); //$NON-NLS-1$
-		gd = new GridData(); 
-		gd.horizontalSpan = 1;
-		downloadAddressLabel.setLayoutData(gd);
-		downloadAddressLabel.setToolTipText(Messages.getString("RomImageTab.18")); //$NON-NLS-1$
-
-		downloadAddress = new Text(downloadImgGroup.getGroup(), SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		downloadAddress.setLayoutData(gd);
-		downloadAddress.setToolTipText(Messages.getString("RomImageTab.18")); //$NON-NLS-1$
-		downloadAddress.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-					
-		askForDownload = createCheckButton(downloadImgGroup.getGroup(), Messages.getString("RomImageTab.19")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		askForDownload.setLayoutData(gd);
-		askForDownload.setToolTipText(Messages.getString("RomImageTab.20")); //$NON-NLS-1$
-		askForDownload.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-	}
-	
-	protected void createRomLogFileGroup(Composite parent, int colSpan) {
-
-		Composite projComp = new Composite(parent, SWT.NONE);
-		GridLayout projLayout = new GridLayout();
-		projLayout.numColumns = 3;
-		projLayout.marginHeight = 0;
-		projLayout.marginWidth = 0;
-		projComp.setLayout(projLayout);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = colSpan;
-		projComp.setLayoutData(data);
-
-		parseRomLogGroup = new CheckboxGroup(projComp, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		parseRomLogGroup.setLayout(layout);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = colSpan;
-		parseRomLogGroup.setLayoutData(data);
-		parseRomLogGroup.setText(Messages.getString("RomLogFileTab.1")); //$NON-NLS-1$
-		parseRomLogGroup.setFont(parent.getFont());
-		parseRomLogGroup.setToolTipText(Messages.getString("RomLogFileTab.2")); //$NON-NLS-1$
-		parseRomLogGroup.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		romLogFileLabel = new Label(parseRomLogGroup.getGroup(), SWT.NONE);
-		romLogFileLabel.setText(Messages.getString("RomLogFileTab.3")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 1;
-		romLogFileLabel.setLayoutData(data);
-		romLogFileLabel.setToolTipText(Messages.getString("RomLogFileTab.4")); //$NON-NLS-1$
-
-		romLogFilePath = new Text(parseRomLogGroup.getGroup(), SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 1;
-		romLogFilePath.setLayoutData(data);
-		romLogFilePath.setToolTipText(Messages.getString("RomLogFileTab.4")); //$NON-NLS-1$
-		romLogFilePath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		romLogFileBrowse = createPushButton(parseRomLogGroup.getGroup(), Messages.getString("RomLogFileTab.5"), null); //$NON-NLS-1$
-		romLogFileBrowse.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("RomLogFileTab.6")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.log*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("RomLogFileTab.7"), Messages.getString("RomLogFileTab.8")}); //$NON-NLS-1$ //$NON-NLS-2$
-				
-				BrowseDialogUtils.initializeFrom(dialog, romLogFilePath);
-				
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					romLogFilePath.setText(result);
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-		
-		epoc32DirLabel = new Label(parseRomLogGroup.getGroup(), SWT.NONE);
-		epoc32DirLabel.setText(Messages.getString("RomLogFileTab.9")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 1;
-		epoc32DirLabel.setLayoutData(data);
-		epoc32DirLabel.setToolTipText(Messages.getString("RomLogFileTab.10")); //$NON-NLS-1$
-
-		epoc32DirPath = new Text(parseRomLogGroup.getGroup(), SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		epoc32DirPath.setLayoutData(data);
-		epoc32DirPath.setToolTipText(Messages.getString("RomLogFileTab.10")); //$NON-NLS-1$
-		epoc32DirPath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		epoc32DirBrowse = createPushButton(parseRomLogGroup.getGroup(), Messages.getString("RomLogFileTab.5"), null); //$NON-NLS-1$
-		epoc32DirBrowse.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent evt) {
-				DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.NONE);
-				BrowseDialogUtils.initializeFrom(dialog, epoc32DirPath);
-
-				dialog.setText(Messages.getString("RomLogFileTab.11")); //$NON-NLS-1$
-				String result = dialog.open();
-				
-				if (result != null && new File(result).exists()) {
-					epoc32DirPath.setText(result);
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-		
-		logUnresolvedModules = createCheckButton(parseRomLogGroup.getGroup(), Messages.getString("RomLogFileTab.13")); //$NON-NLS-1$
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 3;
-		logUnresolvedModules.setLayoutData(data);
-		logUnresolvedModules.setToolTipText(Messages.getString("RomLogFileTab.14")); //$NON-NLS-1$
-		logUnresolvedModules.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});			
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			
-			parseRomLogGroup.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_ParseRomLogFile , false ));
-			romLogFilePath.setText(configuration.getAttribute( PreferenceConstants.J_PN_RomLogFilePath , "" )); //$NON-NLS-1$	
-			epoc32DirPath.setText(configuration.getAttribute( PreferenceConstants.J_PN_SymbianKitEpoc32Dir , "" )); //$NON-NLS-1$
-			logUnresolvedModules.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_LogUnresolved , false ));
-
-			downloadImgGroup.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_DownloadRomImage , false ));
-			osImagePath.setText(configuration.getAttribute( PreferenceConstants.J_PN_RomImagePath , "" )); //$NON-NLS-1$
-			
-			int downloadAddressValue = configuration.getAttribute( PreferenceConstants.J_PN_DownloadAddress , 0);
-			downloadAddress.setText(new String("0x" + Integer.toHexString(downloadAddressValue))); //$NON-NLS-1$
-			
-			askForDownload.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_AskForDownload  , true ));
-			
-		} catch (CoreException e) {
-			LaunchPlugin.log(e);
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		
-		configuration.setAttribute( PreferenceConstants.J_PN_ParseRomLogFile, parseRomLogGroup.getSelection());
-		configuration.setAttribute( PreferenceConstants.J_PN_RomLogFilePath, romLogFilePath.getText());
-		String epoc32Dir = epoc32DirPath.getText();		
-		if ((epoc32Dir!=null) && (epoc32Dir.length()>0) && (epoc32Dir.charAt(epoc32Dir.length()-1) == '\\')) {
-			epoc32Dir = epoc32Dir.substring(0, epoc32Dir.length()-1);
-		}	
-		configuration.setAttribute( PreferenceConstants.J_PN_SymbianKitEpoc32Dir, epoc32Dir);
-		configuration.setAttribute( PreferenceConstants.J_PN_LogUnresolved, logUnresolvedModules.getSelection());		
-		
-		configuration.setAttribute( PreferenceConstants.J_PN_DownloadRomImage, downloadImgGroup.getSelection());
-		configuration.setAttribute( PreferenceConstants.J_PN_RomImagePath, osImagePath.getText());
-		
-		String downloadAddressText = downloadAddress.getText().trim().toLowerCase();
-		
-		int index = downloadAddressText.indexOf('x');
-		if (index > 0)
-		{
-			downloadAddressText = downloadAddressText.substring(2); //ignore 0x or 0X.
-		}
-		try {
-			Long longValue = Long.parseLong(downloadAddressText, 16);
-			configuration.setAttribute( PreferenceConstants.J_PN_DownloadAddress, longValue.intValue());
-		} catch (NumberFormatException e) {
-			setErrorMessage(Messages.getString("RomImageTab.22")); //$NON-NLS-1		 //$NON-NLS-1$
-			return;
-		}
-		configuration.setAttribute( PreferenceConstants.J_PN_AskForDownload, askForDownload.getSelection());		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.getString("RomImageTab.0"); //$NON-NLS-1$
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return LaunchImages.get(LaunchImages.IMG_ROM_IMAGE_TAB);
-	}
-
-	public boolean isValid(ILaunchConfiguration config) {
-	
-		setErrorMessage(null);
-		setMessage(null);
-	
-		boolean result = super.isValid(config);		
-		
-		if (result) {			
-			
-			if (parseRomLogGroup.getSelection()) {
-				
-				// check if rom log file is specified. If specified, check if it exists or not.
-				String romLogFile = romLogFilePath.getText().trim();
-				if (romLogFile.length() < 1) {
-					setErrorMessage(Messages.getString("RomLogFileTab.17")); //$NON-NLS-1$
-					result = false;
-				} else {
-					if (!new File(romLogFile).exists()) {
-						setErrorMessage(Messages.getString("RomLogFileTab.18")); //$NON-NLS-1$
-						result = false;
-					}
-				}
-				
-				// check if epoc32 dir is specified. If specified, check if it exists or not.
-				String epoc32Dir = epoc32DirPath.getText().trim();
-				if (epoc32Dir.length() < 1) {
-					setErrorMessage(Messages.getString("RomLogFileTab.19")); //$NON-NLS-1$
-					result = false;
-				} else {
-					if (!new File(epoc32Dir).exists()) {
-						setErrorMessage(Messages.getString("RomLogFileTab.20")); //$NON-NLS-1$
-						result = false;
-					}
-				}
-
-			}
-			//else {
-			//	setErrorMessage(Messages.getString("RomLogFileTab.21"));
-			//}
-
-			if (downloadImgGroup.getSelection()) {
-				
-				try {				
-					int debugMode = config.getAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Attach);
-					
-					if (debugMode == PreferenceConstants.J_PV_DebugRunFromStart_Attach) {
-						setMessage(Messages.getString("RomImageTab.27")); //$NON-NLS-1$
-					}						
-				}
-				catch(CoreException e) {					
-					LaunchPlugin.log(e);
-				}
-
-				// check if memory config file is specified, if specified, check if it exists or not.
-				String imgFilePath = osImagePath.getText().trim();
-				if (imgFilePath.length() < 1) {
-					setErrorMessage(Messages.getString("RomImageTab.23")); //$NON-NLS-1$
-					result = false;
-				} else {
-					if (!new File(imgFilePath).exists()) {
-						setErrorMessage(Messages.getString("RomImageTab.24")); //$NON-NLS-1$
-						result = false;
-					}
-				}
-			
-				String downloadAddressText = downloadAddress.getText().trim().toLowerCase();			
-				if (downloadAddressText.length() < 3) {
-					setErrorMessage(Messages.getString("RomImageTab.22")); //$NON-NLS-1$
-					result = false;
-				} else {
-					try {						
-						int index = downloadAddressText.indexOf('x');
-						if (index > 0)
-						{
-							downloadAddressText = downloadAddressText.substring(2); //ignore 0x or 0X.
-						}
-						
-						Long longValue = Long.parseLong(downloadAddressText, 16);
-						
-						int downloadAddressValue = longValue.intValue();
-					}
-					catch (NumberFormatException e) {
-						setErrorMessage(Messages.getString("RomImageTab.22")); //$NON-NLS-1$
-						result = false;
-						return result;
-					}
-				}
-			}
-		}
-		
-		return result;
-	}
-
-	@Override
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		super.activated(workingCopy);
-		
-		// forces page to get focus so that help works without having to select some control first.
-		getControl().setFocus();
-	}
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/StopModeDebuggerTab.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,562 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.ui;
-
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-
-import java.io.File;
-
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.launch.ui.CLaunchConfigurationTab;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-import cwdbg.PreferenceConstants;
-
-public class StopModeDebuggerTab extends CLaunchConfigurationTab {
-
-	private Button breakAtMain;
-	private Text mainBreakSymbol;
-	
-	private Label startAddressLabel;
-	private Text startAddress; 
-	protected Button debugFromStartButton;
-	protected Button runFromStartButton;
-	protected Button softAttachButton;
-	private Button autoButton;
-	private Button armButton;
-	private Button thumbButton;
-	
-	private Button targetInitFile;
-	private Text targetInitFilePath;
-	private Button targetInitFileBrowse;
-	
-	private Button memoryConfigFile;
-	private Text memoryConfigFilePath;
-	private Button memoryConfigFileBrowse;
-	
-	private Button resetTarget;
-	
-	private Combo processorsList;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), LaunchTabHelpIds.STOP_MODE_DEBUGGER);
-		
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		comp.setLayout(topLayout);
-
-		createVerticalSpacer(comp, 2);
-		createBooleanGroup(comp, 2);
-		createStartUpOptionsGroup(comp, 2);
-		createInitFileGroup(comp, 2);
-		createArmModeGroup(comp, 2);
-
-		Dialog.applyDialogFont(parent);
-		checkControlState();
-	}
-
-	protected void createBooleanGroup(Composite parent, int colSpan) {
-		
-		breakAtMain = createCheckButton(parent, Messages.getString("StopModeDebuggerTab.0")); //$NON-NLS-1$
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 1;
-		breakAtMain.setLayoutData(data);
-		breakAtMain.setFont(parent.getFont());
-		breakAtMain.setToolTipText(Messages.getString("StopModeDebuggerTab.1")); //$NON-NLS-1$
-		breakAtMain.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-				checkControlState();
-			}
-		});
-
-		mainBreakSymbol = new Text(parent, SWT.BORDER);
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 1;
-		mainBreakSymbol.setLayoutData(data);
-		mainBreakSymbol.setToolTipText(Messages.getString("StopModeDebuggerTab.1")); //$NON-NLS-1$
-		mainBreakSymbol.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-	}
-	
-	protected void createStartUpOptionsGroup(Composite parent, int colSpan) {
-		
-		Group group = new Group(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = colSpan;
-		group.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = colSpan;
-		group.setLayoutData(gd);
-		group.setText(Messages.getString("StopModeDebuggerTab.28")); //$NON-NLS-1$
-		group.setFont(parent.getFont());
-		group.setToolTipText(Messages.getString("StopModeDebuggerTab.29")); //$NON-NLS-1$
-
-		softAttachButton = new Button(group, SWT.RADIO);
-		softAttachButton.setText(Messages.getString("StopModeDebuggerTab.34")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = colSpan;
-		softAttachButton.setLayoutData(gd);
-		softAttachButton.setToolTipText(Messages.getString("StopModeDebuggerTab.35")); //$NON-NLS-1$
-		softAttachButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-				checkControlState();
-			}
-		});
-		
-		debugFromStartButton = new Button(group, SWT.RADIO);
-		debugFromStartButton.setText(Messages.getString("StopModeDebuggerTab.30")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = colSpan;
-		debugFromStartButton.setLayoutData(gd);
-		debugFromStartButton.setToolTipText(Messages.getString("StopModeDebuggerTab.31")); //$NON-NLS-1$
-		debugFromStartButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-				checkControlState();
-			}
-		});
-
-		runFromStartButton = new Button(group, SWT.RADIO);
-		runFromStartButton.setText(Messages.getString("StopModeDebuggerTab.32")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = colSpan;
-		runFromStartButton.setLayoutData(gd);
-		runFromStartButton.setToolTipText(Messages.getString("StopModeDebuggerTab.33")); //$NON-NLS-1$
-		runFromStartButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-				checkControlState();
-			}
-		});
-
-		
-		startAddressLabel = new Label(group, SWT.NONE);
-		startAddressLabel.setText(Messages.getString("StopModeDebuggerTab.36")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		startAddressLabel.setLayoutData(gd);
-		startAddressLabel.setToolTipText(Messages.getString("StopModeDebuggerTab.37")); //$NON-NLS-1$
-
-		startAddress = new Text(group, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 1;
-		startAddress.setLayoutData(gd);
-		startAddress.setToolTipText(Messages.getString("StopModeDebuggerTab.37")); //$NON-NLS-1$
-		startAddress.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-				checkControlState();
-			}
-		});	
-		
-		resetTarget = createCheckButton(group, Messages.getString("StopModeDebuggerTab.16")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = colSpan;
-		resetTarget.setLayoutData(gd);
-		resetTarget.setToolTipText(Messages.getString("StopModeDebuggerTab.17")); //$NON-NLS-1$
-		resetTarget.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-	}
-
-	protected void createInitFileGroup(Composite parent, int colSpan){
-		
-		Group group = new Group(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		group.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);		
-		gd.horizontalSpan = colSpan;
-		group.setLayoutData(gd);
-		group.setText(Messages.getString("StopModeDebuggerTab.2")); //$NON-NLS-1$
-		group.setFont(parent.getFont());
-		group.setToolTipText(Messages.getString("StopModeDebuggerTab.3")); //$NON-NLS-1$
-
-		
-		final Label processorsLabel = new Label(group, SWT.NONE);
-		processorsLabel.setText(Messages.getString("StopModeDebuggerTab.4")); //$NON-NLS-1$
-		GridData data = new GridData();
-		data.horizontalSpan = 1;
-		processorsLabel.setLayoutData(data);
-		processorsLabel.setToolTipText(Messages.getString("StopModeDebuggerTab.5")); //$NON-NLS-1$
-
-		processorsList = new Combo(group, SWT.READ_ONLY);
-		processorsList.setItems(new String[] { "ARM920T", "ARM926TEJ", "ARM1136J-S", "OMAP3xx", "OMAP15xx", "OMAP16xx", "OMAP24xx", "OMAP34xx", "Generic" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		processorsList.setLayoutData(data);
-		processorsList.setToolTipText(Messages.getString("StopModeDebuggerTab.5")); //$NON-NLS-1$
-		processorsList.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		targetInitFile = createCheckButton(group, Messages.getString("StopModeDebuggerTab.6")); //$NON-NLS-1$		
-		data = new GridData();
-		data.horizontalSpan = 1;
-		targetInitFile.setLayoutData(data);
-		targetInitFile.setToolTipText(Messages.getString("StopModeDebuggerTab.7")); //$NON-NLS-1$
-		targetInitFile.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-				checkControlState();
-			}
-		});
-
-		
-		targetInitFilePath = new Text(group, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 1;
-		targetInitFilePath.setLayoutData(data);
-		targetInitFilePath.setToolTipText(Messages.getString("StopModeDebuggerTab.7")); //$NON-NLS-1$
-		targetInitFilePath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		targetInitFileBrowse = createPushButton(group, Messages.getString("StopModeDebuggerTab.8"), null); //$NON-NLS-1$
-		targetInitFileBrowse.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("StopModeDebuggerTab.9")); //$NON-NLS-1$
-				
-				dialog.setFilterExtensions(new String[] {"*.cfg*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("StopModeDebuggerTab.10"), Messages.getString("StopModeDebuggerTab.11")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					targetInitFilePath.setText(result);
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-
-		memoryConfigFile = createCheckButton(group, Messages.getString("StopModeDebuggerTab.12")); //$NON-NLS-1$;
-		data = new GridData();
-		data.horizontalSpan = 1;
-		memoryConfigFile.setLayoutData(data);
-		memoryConfigFile.setToolTipText(Messages.getString("StopModeDebuggerTab.13")); //$NON-NLS-1$
-		memoryConfigFile.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-				checkControlState();
-			}
-		});
-
-		memoryConfigFilePath = new Text(group, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 1;
-		memoryConfigFilePath.setLayoutData(data);
-		memoryConfigFilePath.setToolTipText(Messages.getString("StopModeDebuggerTab.13")); //$NON-NLS-1$
-		memoryConfigFilePath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		memoryConfigFileBrowse = createPushButton(group, Messages.getString("StopModeDebuggerTab.8"), null); //$NON-NLS-1$
-		memoryConfigFileBrowse.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("StopModeDebuggerTab.14")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.mem*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("StopModeDebuggerTab.15"), Messages.getString("StopModeDebuggerTab.11")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					memoryConfigFilePath.setText(result);
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});		
-	}
-
-	protected void createArmModeGroup(Composite parent, int colSpan) {
-		Group group = new Group(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		group.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = colSpan;
-		group.setLayoutData(gd);
-		group.setText(Messages.getString("StopModeDebuggerTab.18")); //$NON-NLS-1$
-		group.setFont(parent.getFont());
-		group.setToolTipText(Messages.getString("StopModeDebuggerTab.19")); //$NON-NLS-1$
-
-		autoButton = new Button(group, SWT.RADIO);
-		autoButton.setText(Messages.getString("StopModeDebuggerTab.22")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		autoButton.setLayoutData(gd);
-		autoButton.setToolTipText(Messages.getString("StopModeDebuggerTab.19")); //$NON-NLS-1$
-		autoButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		armButton = new Button(group, SWT.RADIO);
-		armButton.setText(Messages.getString("StopModeDebuggerTab.20")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		armButton.setLayoutData(gd);
-		armButton.setToolTipText(Messages.getString("StopModeDebuggerTab.19")); //$NON-NLS-1$
-		armButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		thumbButton = new Button(group, SWT.RADIO);
-		thumbButton.setText(Messages.getString("StopModeDebuggerTab.21")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		thumbButton.setLayoutData(gd);
-		thumbButton.setToolTipText(Messages.getString("StopModeDebuggerTab.19")); //$NON-NLS-1$
-		thumbButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {			
-			breakAtMain.setSelection(configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN , false ));
-			mainBreakSymbol.setText(configuration.getAttribute( PreferenceConstants.J_PN_StopAtMainSymbol , "E32Main" )); //$NON-NLS-1$
-
-			int startAddressValue = configuration.getAttribute( PreferenceConstants.J_PN_RomImgStartAddress , 0);
-			startAddress.setText(new String("0x" + Integer.toHexString(startAddressValue))); //$NON-NLS-1$
-
-			int debugMode = configuration.getAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Debug);
-			debugFromStartButton.setSelection(debugMode == PreferenceConstants.J_PV_DebugRunFromStart_Debug);
-			runFromStartButton.setSelection(debugMode == PreferenceConstants.J_PV_DebugRunFromStart_Run);		
-			softAttachButton.setSelection(debugMode == PreferenceConstants.J_PV_DebugRunFromStart_Attach);
-			
-			processorsList.select(configuration.getAttribute( PreferenceConstants.J_PN_TargetProcessor, 8 ));			
-			targetInitFile.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_RunTargetInitFile, false ));
-			targetInitFilePath.setText(configuration.getAttribute( PreferenceConstants.J_PN_TargetInitFilePath, "" )); //$NON-NLS-1$
-			memoryConfigFile.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_RunMemConfigFile, false ));
-			memoryConfigFilePath.setText(configuration.getAttribute( PreferenceConstants.J_PN_MemConfigFilePath, "" )); //$NON-NLS-1$
-			resetTarget.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_ResetTarget, false ));
-
-			int defaultMode = configuration.getAttribute( PreferenceConstants.J_PN_DefaultInstructionSet, PreferenceConstants.J_PV_DefaultInstructionSet_Arm);
-			autoButton.setSelection(defaultMode == PreferenceConstants.J_PV_DefaultInstructionSet_Auto);
-			armButton.setSelection(defaultMode == PreferenceConstants.J_PV_DefaultInstructionSet_Arm);
-			thumbButton.setSelection(defaultMode == PreferenceConstants.J_PV_DefaultInstructionSet_Thumb);
-		
-			checkControlState();
-		} catch (CoreException e) {
-			LaunchPlugin.log(e);
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		
-		configuration.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, breakAtMain.getSelection());
-		configuration.setAttribute( PreferenceConstants.J_PN_StopAtMainSymbol, mainBreakSymbol.getText());
-		
-		String startAddressText = startAddress.getText().trim().toLowerCase();
-		
-		int index = startAddressText.indexOf('x');
-		if (index > 0)
-		{
-			startAddressText = startAddressText.substring(2); //ignore 0x or 0X.
-		}
-		try {
-			Long longValue = Long.parseLong(startAddressText, 16);
-			configuration.setAttribute( PreferenceConstants.J_PN_RomImgStartAddress , longValue.intValue());
-		} catch (NumberFormatException e) {
-			setErrorMessage(Messages.getString("StopModeDebuggerTab.38")); //$NON-NLS-1$	
-			return;
-		}
-		
-		if (debugFromStartButton.getSelection())
-			configuration.setAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Debug);
-		else if (runFromStartButton.getSelection())
-			configuration.setAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Run);
-		else if (softAttachButton.getSelection())
-			configuration.setAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Attach);
-
-		configuration.setAttribute( PreferenceConstants.J_PN_TargetProcessor, processorsList.getSelectionIndex());
-		configuration.setAttribute( PreferenceConstants.J_PN_RunTargetInitFile, targetInitFile.getSelection());
-		configuration.setAttribute( PreferenceConstants.J_PN_TargetInitFilePath, targetInitFilePath.getText());
-		configuration.setAttribute( PreferenceConstants.J_PN_RunMemConfigFile, memoryConfigFile.getSelection());
-		configuration.setAttribute( PreferenceConstants.J_PN_MemConfigFilePath, memoryConfigFilePath.getText());
-		configuration.setAttribute( PreferenceConstants.J_PN_ResetTarget, resetTarget.getSelection());
-		
-		if (autoButton.getSelection())
-			configuration.setAttribute( PreferenceConstants.J_PN_DefaultInstructionSet, PreferenceConstants.J_PV_DefaultInstructionSet_Auto);
-		else if (armButton.getSelection())
-			configuration.setAttribute( PreferenceConstants.J_PN_DefaultInstructionSet, PreferenceConstants.J_PV_DefaultInstructionSet_Arm);
-		else if (thumbButton.getSelection())
-			configuration.setAttribute( PreferenceConstants.J_PN_DefaultInstructionSet, PreferenceConstants.J_PV_DefaultInstructionSet_Thumb);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.getString("StopModeDebuggerTab.23"); //$NON-NLS-1$
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return LaunchImages.get(LaunchImages.IMG_VIEW_DEBUGGER_TAB);
-	}
-
-	protected void checkControlState()
-	{
-		mainBreakSymbol.setEnabled(breakAtMain.getSelection());
-		startAddress.setEnabled(!softAttachButton.getSelection());
-		resetTarget.setEnabled(!softAttachButton.getSelection());
-		targetInitFilePath.setEnabled(targetInitFile.getSelection());
-		memoryConfigFilePath.setEnabled(memoryConfigFile.getSelection());
-	}
-
-	public boolean isValid(ILaunchConfiguration config) {
-		
-		setErrorMessage(null);
-		setMessage(null);
-		
-		boolean result = super.isValid(config);
-		if (result) {
-		
-			if (!softAttachButton.getSelection())
-			{
-				String startAddressText = startAddress.getText().trim().toLowerCase();
-				if (startAddressText.length() < 3) {
-					setErrorMessage(Messages.getString("StopModeDebuggerTab.38")); //$NON-NLS-1$
-					result = false;
-				} else {
-					try {
-						
-						int index = startAddressText.indexOf('x');
-						if (index > 0)
-						{
-							startAddressText = startAddressText.substring(2); //ignore 0x or 0X.
-						}
-						Long longValue = Long.parseLong(startAddressText, 16);
-						int startAddressValue = longValue.intValue();
-					}
-					catch (NumberFormatException e) {
-						setErrorMessage(Messages.getString("StopModeDebuggerTab.38")); //$NON-NLS-1$
-						result = false;
-						return result;
-					}
-				}
-			}
-			
-			if (targetInitFile.getSelection()) {
-				// check if init file is specified, if specified, check if it exists or not.
-				String initFilePath = targetInitFilePath.getText().trim();
-				if (initFilePath.length() < 1) {
-					setErrorMessage(Messages.getString("StopModeDebuggerTab.24")); //$NON-NLS-1$
-					result = false;
-				} else {
-					if (!new File(initFilePath).exists()) {
-						setErrorMessage(Messages.getString("StopModeDebuggerTab.25")); //$NON-NLS-1$
-						result = false;
-					}
-				} 			
-			}
-
-			if (memoryConfigFile.getSelection()) {
-				// check if memory config file is specified, if specified, check if it exists or not.
-				String memConfigFile = memoryConfigFilePath.getText().trim();
-				if (memConfigFile.length() < 1) {
-					setErrorMessage(Messages.getString("StopModeDebuggerTab.26")); //$NON-NLS-1$
-					result = false;
-				} else {
-					if (!new File(memConfigFile).exists()) {
-						setErrorMessage(Messages.getString("StopModeDebuggerTab.27")); //$NON-NLS-1$
-						result = false;
-					}
-				} 			
-			}
-
-		}
-
-		return result;
-	}
-
-	@Override
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		super.activated(workingCopy);
-		
-		// forces page to get focus so that help works without having to select some control first.
-		getControl().setFocus();
-	}
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/T32ConfigFileReader.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.ui;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-
-public class T32ConfigFileReader {
-	
-	private String portNumber;
-	private boolean isValid;
-	private String t32Path;
-	
-	public T32ConfigFileReader(String t32ConfigFilePath) {
-		
-		//set the port from the config file
-		try {
-		        BufferedReader in = new BufferedReader(new FileReader(t32ConfigFilePath));
-		        String str;
-		        while ((str = in.readLine()) != null) {
-		        	// looking for SYS setting
-		        	int index = str.indexOf("SYS="); //$NON-NLS-1$
-		            if (index>=0) {
-		            	t32Path = str.substring(4);
-		            	continue;
-		            }
-		        	// looking for PORT setting
-		            index = str.indexOf("PORT="); //$NON-NLS-1$
-		            if (index >= 0) {
-		            	portNumber = str.substring(5);
-		            }		            
-		        }
-		        in.close();
-		 	} catch (IOException e) {
-		 		// If we are here, then it could be that port number is not specified in the config file.
-		 		isValid = false;		    	
-		 }
-		 isValid = true;
-		 
-	}
-	
-	public boolean isValid() { return isValid; }
-	
-	public String getPortNumber() { return portNumber; }
-	
-	public String getT32Path() { return t32Path; }
-	
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/T32StopModeConfigurationTabGroup.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.ui;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.*;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-
-public class T32StopModeConfigurationTabGroup extends
-		AbstractLaunchConfigurationTabGroup {
-
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-				new StopModeMainTab(),				
-				new Trace32ConnectionTab(),
-				new StopModeDebuggerTab(),
-				new SymbianExceptionsTab(),
-				new RomImageTab(),	
-				new ExecutablesTab(false),
-				new SourceLookupTab(),
-				new CommonTab() 
-			};
-			setTabs(tabs);
-	}
-	
-	
-	/**
-	 * Set default for all preferences related to this launch configuration.
-	 * 
-	 * @see ILaunchConfigurationTabGroup#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		// Call this to make sure options on those CDT common tabs such as "Common"
-		// and "Source" have correct default.
-		super.setDefaults(config);
-
-		// Get the current selected project in C project view.
-		IProject project = LaunchPlugin.getSelectedProject();
-
-		SettingsData.setDefaults(config, SettingsData.LaunchConfig_Trace32, project);
-	}
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/Trace32ConnectionTab.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,360 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.ui;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-
-import org.eclipse.cdt.launch.ui.CLaunchConfigurationTab;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-
-import java.io.File;
-
-public class Trace32ConnectionTab extends CLaunchConfigurationTab {
-
-	private Label t32ExeLabel;
-	private Text t32ExePath;
-	private Button t32ExeBrowse;
-	
-	private Label t32ConfigLabel;
-	private Text t32ConfigFilePath;
-	private Button t32ConfigFileBrowse;
-	
-	private Label t32BootConfigLabel;
-	private Text t32BootConfigFilePath;
-	private Button t32BootConfigFileBrowse;
-
-	//private Label t32PortLabel;
-	//private Text t32Port;
-
-	private Button viewT32Messages;
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), LaunchTabHelpIds.STOP_MODE_T32_CONNECTION);
-		
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		comp.setLayout(topLayout);
-
-		createVerticalSpacer(comp, 2);
-		createT32TextGroup(comp, 1);
-		createVerticalSpacer(comp, 1);
-
-		Dialog.applyDialogFont(parent);
-		checkControlState();
-	}
-
-	protected void createT32TextGroup(Composite parent, int colSpan) {
-		Composite projComp = new Composite(parent, SWT.NONE);
-		GridLayout projLayout = new GridLayout();
-		projLayout.numColumns = 2;
-		projLayout.marginHeight = 0;
-		projLayout.marginWidth = 0;
-		projComp.setLayout(projLayout);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = colSpan;
-		projComp.setLayoutData(data);
-
-		t32ExeLabel = new Label(projComp, SWT.NONE);
-		t32ExeLabel.setText(Messages.getString("Trace32ConnectionTab.1")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 2;
-		t32ExeLabel.setLayoutData(data);
-		t32ExeLabel.setToolTipText(Messages.getString("Trace32ConnectionTab.2")); //$NON-NLS-1$
-
-		t32ExePath = new Text(projComp, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		t32ExePath.setLayoutData(data);
-		t32ExePath.setToolTipText(Messages.getString("Trace32ConnectionTab.2")); //$NON-NLS-1$
-		t32ExePath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		t32ExeBrowse = createPushButton(projComp, Messages.getString("Trace32ConnectionTab.3"), null); //$NON-NLS-1$
-		t32ExeBrowse.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("Trace32ConnectionTab.4")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.exe*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("Trace32ConnectionTab.23"), Messages.getString("Trace32ConnectionTab.25")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					t32ExePath.setText(result);
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-
-		t32ConfigLabel = new Label(projComp, SWT.NONE);
-		t32ConfigLabel.setText(Messages.getString("Trace32ConnectionTab.5")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 2;
-		t32ConfigLabel.setLayoutData(data);
-		t32ConfigLabel.setToolTipText(Messages.getString("Trace32ConnectionTab.6")); //$NON-NLS-1$
-
-		t32ConfigFilePath = new Text(projComp, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		t32ConfigFilePath.setLayoutData(data);
-		t32ConfigFilePath.setToolTipText(Messages.getString("Trace32ConnectionTab.6")); //$NON-NLS-1$
-		t32ConfigFilePath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		t32ConfigFileBrowse = createPushButton(projComp, Messages.getString("Trace32ConnectionTab.3"), null); //$NON-NLS-1$
-		t32ConfigFileBrowse.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("Trace32ConnectionTab.7")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.t32*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("Trace32ConnectionTab.24"), Messages.getString("Trace32ConnectionTab.25")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					t32ConfigFilePath.setText(result);
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-
-		t32BootConfigLabel = new Label(projComp, SWT.NONE);
-		t32BootConfigLabel.setText(Messages.getString("Trace32ConnectionTab.8")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 2;
-		t32BootConfigLabel.setLayoutData(data);
-		t32BootConfigLabel.setToolTipText(Messages.getString("Trace32ConnectionTab.9")); //$NON-NLS-1$
-
-		t32BootConfigFilePath = new Text(projComp, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		t32BootConfigFilePath.setLayoutData(data);
-		t32BootConfigFilePath.setToolTipText(Messages.getString("Trace32ConnectionTab.9")); //$NON-NLS-1$
-		t32BootConfigFilePath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		t32BootConfigFileBrowse = createPushButton(projComp, Messages.getString("Trace32ConnectionTab.3"), null); //$NON-NLS-1$
-		t32BootConfigFileBrowse.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("Trace32ConnectionTab.10")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.cmm*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("Trace32ConnectionTab.22"), Messages.getString("Trace32ConnectionTab.25")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					t32BootConfigFilePath.setText(result);
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-
-		/*t32PortLabel = new Label(projComp, SWT.NONE);
-		t32PortLabel.setText(Messages.getString("Trace32ConnectionTab.11")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 2;
-		t32PortLabel.setLayoutData(data);
-		t32PortLabel.setToolTipText(Messages.getString("Trace32ConnectionTab.12")); //$NON-NLS-1$
-
-		t32Port = new Text(projComp, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 1;
-		t32Port.setLayoutData(data);
-		t32Port.setToolTipText(Messages.getString("Trace32ConnectionTab.12")); //$NON-NLS-1$
-		t32Port.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});*/
-
-		createVerticalSpacer(projComp, 1);
-
-		viewT32Messages = createCheckButton(projComp, Messages.getString("Trace32ConnectionTab.13")); //$NON-NLS-1$
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		viewT32Messages.setLayoutData(data);
-		viewT32Messages.setToolTipText(Messages.getString("Trace32ConnectionTab.14")); //$NON-NLS-1$
-		viewT32Messages.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		createVerticalSpacer(projComp, 1);
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {			
-			t32ExePath.setText(configuration.getAttribute( SettingsData.spn_Trace32Conn_ExePath, "")); 							
-			t32ConfigFilePath.setText(configuration.getAttribute( SettingsData.spn_Trace32Conn_ConfigFilePath, "")); //$NON-NLS-1$
-			t32BootConfigFilePath.setText(configuration.getAttribute( SettingsData.spn_Trace32Conn_BootScriptFile, "")); //$NON-NLS-1$
-			viewT32Messages.setSelection(configuration.getAttribute( SettingsData.spn_Trace32Conn_LogOption, false));
-			
-			checkControlState();
-		} catch (CoreException e) {
-			LaunchPlugin.log(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute( SettingsData.spn_Trace32Conn_ExePath, t32ExePath.getText());
-		configuration.setAttribute( SettingsData.spn_Trace32Conn_ConfigFilePath, t32ConfigFilePath.getText());
-		configuration.setAttribute( SettingsData.spn_Trace32Conn_BootScriptFile, t32BootConfigFilePath.getText());
-		configuration.setAttribute( SettingsData.spn_Trace32Conn_LogOption, viewT32Messages.getSelection());
-		
-		configuration.setAttribute( SettingsData.spn_Trace32Conn_BootConfigArgs, ""); //$NON-NLS-1$
-		
-		String portNumber = "20000"; //$NON-NLS-1$
-		T32ConfigFileReader configFileReader = new T32ConfigFileReader(t32ConfigFilePath.getText().trim());
-		if (configFileReader.isValid()) {
-			portNumber = configFileReader.getPortNumber();
-		}
-		
-		configuration.setAttribute( SettingsData.spn_Trace32Conn_UdpPort, portNumber);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.getString("Trace32ConnectionTab.21"); //$NON-NLS-1$
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return LaunchImages.get(LaunchImages.IMG_VIEW_CONNECTION_TAB);
-	}
-
-	protected void checkControlState()
-	{
-	}
-
-	public boolean isValid(ILaunchConfiguration config) {
-		
-		setErrorMessage(null);
-		setMessage(null);
-
-		boolean result = super.isValid(config);
-		if (result){
-			String pcPath = t32ExePath.getText().trim();
-			if (pcPath.length() < 1) {
-				setErrorMessage(Messages.getString("Trace32ConnectionTab.15")); //$NON-NLS-1$
-				return false;
-			} else {
-				if (!new File(pcPath).exists()) {
-					setErrorMessage(Messages.getString("Trace32ConnectionTab.16")); //$NON-NLS-1$
-					result = false;
-				}
-			}
-			
-			String configFilePath = t32ConfigFilePath.getText().trim();
-			if (configFilePath.length() < 1) {
-				setErrorMessage(Messages.getString("Trace32ConnectionTab.17")); //$NON-NLS-1$
-				result = false;
-			} else {
-				if (!new File(configFilePath).exists()) {
-					setErrorMessage(Messages.getString("Trace32ConnectionTab.18")); //$NON-NLS-1$
-					result = false;
-				}
-			} 	
-						
-			T32ConfigFileReader configFileReader = new T32ConfigFileReader(t32ConfigFilePath.getText().trim());
-			if (!configFileReader.isValid()) {
-	         	result = false;
-            	setErrorMessage(Messages.getString("Trace32ConnectionTab.26")); //$NON-NLS-1$
-			} else {			
-				// get the t32exe path
-				IPath t32Path = new Path(t32ExePath.getText().trim().toLowerCase());
-				t32Path = t32Path.removeLastSegments(1);
-				
-				if (configFileReader.getT32Path()!= null && configFileReader.getT32Path().length()>0) {
-					IPath t32PathfromConfigFile = new Path(configFileReader.getT32Path().toLowerCase());					
-					if (!t32PathfromConfigFile.equals(t32Path)) {
-						setErrorMessage(Messages.getString("Trace32ConnectionTab.27")); //$NON-NLS-1$
-						result = false;
-					}	
-				}			
-			}
-			
-			String cmmScriptPath = t32BootConfigFilePath.getText().trim();
-			if (cmmScriptPath.length() < 1) {
-				setErrorMessage(Messages.getString("Trace32ConnectionTab.19")); //$NON-NLS-1$
-				result = false;
-			} else {
-				if (!new File(cmmScriptPath).exists()) {
-					setErrorMessage(Messages.getString("Trace32ConnectionTab.20")); //$NON-NLS-1$
-					result = false;
-				}
-			} 			
-		}
-		return result;
-	}
-
-	@Override
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		super.activated(workingCopy);
-		
-		// forces page to get focus so that help works without having to select some control first.
-		getControl().setFocus();
-	}
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Thu May 20 19:05:56 2010 -0500
@@ -99,34 +99,6 @@
 InstallationTab.puHyperlink=Open SIS Builder settings
 InstallationTab.puNotEnabled=Partial upgrade feature not enabled.  Click link below to go to SIS Builder settings.
 InstallationTab.puNotAvailable=No partial upgrade installer currently available.
-RomImageTab.0=ROM Image
-RomImageTab.1=Startup Options
-RomImageTab.10=Specify the Symbian OS image that can be downloaded starting at the specified download address.
-RomImageTab.11=Symbian ROM Image\:
-RomImageTab.12=Specify the Symbian OS image which needs to be downloaded onto the target.
-RomImageTab.13=Browse...
-RomImageTab.14=Select Symbian ROM image
-RomImageTab.15=Symbian ROM Image
-RomImageTab.16=All files
-RomImageTab.17=Download Address (hex)\:
-RomImageTab.18=Specify the download address where the OS image can be downloaded to.
-RomImageTab.19=Ask for download at the start of each debug session
-RomImageTab.2=Specify the options such as start address and whether to stop the target at the start address during the start of debug session or not.
-RomImageTab.20=This option will allows the user to specify whether to ask for download or not at the start of the debug session.
-RomImageTab.21=Invalid start address, start address should be specified in hex like "0x10000000".
-RomImageTab.22=Invalid download address, download address should be specified in hex like "0x10000000".
-RomImageTab.23=Symbian ROM image file not specified
-RomImageTab.24=Specified Symbian ROM image file does not exist
-RomImageTab.25=Same as start address
-RomImageTab.26=This option allows the user to specify whether to make the download address same as the start address or not.
-RomImageTab.27=Soft attach option is chosen in the debugger tab, download rom image option will be ignored.
-RomImageTab.3=Start Address (hex)\:
-RomImageTab.4=Specify the start address from where the OS can be started.
-RomImageTab.5=Debug from start address.
-RomImageTab.6=This radio button will stop the target at start of the debug session so the user can debug from the start address.
-RomImageTab.7=Run from start address.
-RomImageTab.8=This radio button will start the OS without stopping the target at the start address of the debug session. 
-RomImageTab.9=Download ROM Image 
 RomLogFileTab.0=ROM Log
 RomLogFileTab.1=Parse Rom Log File
 RomLogFileTab.10=Specify the Symbian OS kit Epoc32 directory to resolve the full paths for the various modules in the ROM log file
@@ -174,75 +146,9 @@
 RunModeMainTab.6=Remote process to launch not specified.
 RunModeMainTab.7=Remote process to launch must be an absolute path.
 RunModeMainTab.8=The project associated with this launch configuration.
-StopModeDebuggerTab.0=Break at entry point\:
-StopModeDebuggerTab.1=When enabled the debugger will automatically set a breakpoint at the function specified.
-StopModeDebuggerTab.10=Target Initialization files (*.cfg)
-StopModeDebuggerTab.11=All files
-StopModeDebuggerTab.12=Memory Configuration File\:
-StopModeDebuggerTab.13=Specify the file which defines the memory configuration for the target.
-StopModeDebuggerTab.14=Select Memory Configuration file
-StopModeDebuggerTab.15=Memory Configuration files (*.mem)
-StopModeDebuggerTab.16=Reset target at the start of each debug session
-StopModeDebuggerTab.17=This check box allows the user to specify whether to reset the target at beginning of each debug session or not.
-StopModeDebuggerTab.18=Default instruction set
-StopModeDebuggerTab.19=When viewing memory or setting breakpoints in a range of memory\r\nfor which there are no symbolics there is no way for the debugger to\r\ndetermine the processor mode.  Please choose the default instruction set for these cases.
-StopModeDebuggerTab.2=Target Options
-StopModeDebuggerTab.20=ARM (32 bit)
-StopModeDebuggerTab.21=Thumb (16 bit)
-StopModeDebuggerTab.22=Auto (examine code at current PC location)
-StopModeDebuggerTab.23=Debugger
-StopModeDebuggerTab.24=Initialization file not specified.
-StopModeDebuggerTab.25=Specified initialization file does not exist.
-StopModeDebuggerTab.26=Memory configuration file not specified.
-StopModeDebuggerTab.27=Specified Memory configuration file does not exist.
-StopModeDebuggerTab.28=Startup Options
-StopModeDebuggerTab.29=Specify the options such as start address and whether to stop the target at the start address during the start of debug session or not.
-StopModeDebuggerTab.3=Specify the target options such as target initialization file, memory configuration file etc...
-StopModeDebuggerTab.30=Debug from start address
-StopModeDebuggerTab.31=This radio button will stop the target at start of the debug session so the user can debug from the start address.
-StopModeDebuggerTab.32=Run from start address
-StopModeDebuggerTab.33=This radio button will start the OS without stopping the target at the start address of the debug session. 
-StopModeDebuggerTab.34=Soft attach
-StopModeDebuggerTab.35=This radio button will attach to the target without restarting the target. 
-StopModeDebuggerTab.36=Start Address (hex)\:
-StopModeDebuggerTab.37=Specify the start address from where the OS can be started.
-StopModeDebuggerTab.38=Invalid start address, start address should be specified in hex like "0x10000000".
-StopModeDebuggerTab.4=Target Processor\:
-StopModeDebuggerTab.5=Choose the processor for your reference board.
-StopModeDebuggerTab.6=Target Initialization File\:
-StopModeDebuggerTab.7=Specify the initialization file which is run after connecting to the target
-StopModeDebuggerTab.8=Browse...
-StopModeDebuggerTab.9=Select Target Initialization file
 StopModeMainTab.0=Executable\:
 StopModeMainTab.1=The symbolics file (.sym) generated when the project was built
 StopModeMainTab.2=The project associated with this launch configuration.
-Trace32ConnectionTab.1=Trace32 Executable\:
-Trace32ConnectionTab.10=Select Trace32 Initialization Script
-Trace32ConnectionTab.11=Trace32 Port\:
-Trace32ConnectionTab.12=Port number for connecting to T32. This should be same as the port number in the config file.
-Trace32ConnectionTab.13=View messages between Carbide and Trace32.
-Trace32ConnectionTab.14=This lets you see the debug command messages between the Carbide debugger and Trace32.
-Trace32ConnectionTab.15=Trace32 executable not specified.
-Trace32ConnectionTab.16=Trace32 executable specified does not exist.
-Trace32ConnectionTab.17=Trace32 config file not specified.
-Trace32ConnectionTab.18=Trace32 config file specified does not exist.
-Trace32ConnectionTab.19=Trace32 initialization script not specified.
-Trace32ConnectionTab.2=The absolute path on your PC of the Trace32 executable file (t32marm.exe).
-Trace32ConnectionTab.20=Trace32 initialization script specified does not exist.
-Trace32ConnectionTab.21=Connection
-Trace32ConnectionTab.22=Trace32 Initialization Script
-Trace32ConnectionTab.23=Trace32 Executable
-Trace32ConnectionTab.24=Trace32 Config Files
-Trace32ConnectionTab.25=All Files
-Trace32ConnectionTab.26=Specified Trace32 configuration file is invalid.
-Trace32ConnectionTab.27=T32 path in the config file is different from specified T32 executable path. Please modify the T32 path in the config file to match the T32 executable path. 
-Trace32ConnectionTab.3=Browse...
-Trace32ConnectionTab.4=Select Trace32 Executable file
-Trace32ConnectionTab.5=Trace32 Configuration File\:
-Trace32ConnectionTab.6=The absolute path on your PC of the Trace32 config file (like config.t32).
-Trace32ConnectionTab.7=Select Trace32 Config file
-Trace32ConnectionTab.8=Trace32 Initialization Script\:
-Trace32ConnectionTab.9=The absolute path on your PC of the Trace32 cmm file.
 PartialUpgradeAlertDialog.title=Information
 PartialUpgradeAlertDialog.text=The sis/sisx file you're downloading is rather large.  There is a builder option which will build\na partial upgrade sis/sisx file containing only the files that have changed since the last install.\nThis can potentially greatly reduce download and hence debugging time.\nClick the link below to go to the SIS Builder settings if you'd like to enable this feature.
 PartialUpgradeAlertDialog.dontAskAgain=Don't ask me again
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AbstractLaunchWizard.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AbstractLaunchWizard.java	Thu May 20 19:05:56 2010 -0500
@@ -30,7 +30,6 @@
 public abstract class AbstractLaunchWizard extends Wizard implements ILaunchWizard {
 
 	public static final String PHONE_CATEGORY_ID = "com.nokia.cdt.debug.launch.phoneCategory"; //$NON-NLS-1$
-	public static final String BOARD_CATEGORY_ID = "com.nokia.cdt.debug.launch.boardCategory"; //$NON-NLS-1$
 	
 	private LaunchWizardSummaryPage summaryPage;
 	private String configName = ""; //$NON-NLS-1$
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCategorySelectionPage.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCategorySelectionPage.java	Thu May 20 19:05:56 2010 -0500
@@ -114,12 +114,6 @@
 					Messages.getString("LaunchCategorySelectionPage.phoneDesc"))); //$NON-NLS-1$));
 		}
 
-		if (wizard.getWizardsForCategory(AbstractLaunchWizard.BOARD_CATEGORY_ID).size() > 0) {
-			categories.add(new LaunchCategory(AbstractLaunchWizard.BOARD_CATEGORY_ID,
-					Messages.getString("LaunchCategorySelectionPage.board"), //$NON-NLS-1$));
-					Messages.getString("LaunchCategorySelectionPage.boardDesc"))); //$NON-NLS-1$));
-		}
-		
 		loadCategoryExtensions();
 	}
 
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java	Thu May 20 19:05:56 2010 -0500
@@ -185,12 +185,6 @@
 	}
 	
 	private void loadWizards(List<IPath> mmps, List<IPath> exes, IPath defaultExecutable, String mode) {
-		Trace32LaunchWizard trace32Wizard = new Trace32LaunchWizard(mmps, exes, defaultExecutable, project, configurationName); 
-		if (trace32Wizard.supportsMode(mode)) {
-			trace32Wizard.addPages();
-			wizards.add(trace32Wizard);
-		}
-
 		// load any wizard extensions
 		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
 		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(LaunchPlugin.PLUGIN_ID + ".launchWizardExtension"); //$NON-NLS-1$
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardHelpIds.java	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardHelpIds.java	Thu May 20 19:05:56 2010 -0500
@@ -34,8 +34,6 @@
 
 	public static final String WIZARD_SUMMARY_PAGE = HelpID_Prefix + "wizard_summary_page"; //$NON-NLS-1$
 
-	public static final String WIZARD_TRACE32_PAGE = HelpID_Prefix + "wizard_trace32_page"; //$NON-NLS-1$
-
 	public static final String WIZARD_STOP_MODE_ROM_IMG_PAGE = HelpID_Prefix + "wizard_stop_mode_rom_img_page"; //$NON-NLS-1$
 
 	public static final String WIZARD_TRK_CONNECTION_PAGE = HelpID_Prefix + "wizard_trk_connection_page"; //$NON-NLS-1$
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/StopModeRomImageWizardPage.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,327 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import com.nokia.cpp.internal.api.utils.core.Check;
-import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
-
-import cwdbg.PreferenceConstants;
-
-import org.eclipse.cdt.utils.ui.controls.ControlFactory;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-public class StopModeRomImageWizardPage extends WizardPage {
-    		
-    private boolean isDisposed = false;
-    
-    private boolean softAttachOption = false;
-    private Long startAddressValue;
-    private String romLogFile;
-	private String romImageFile;	
-	
-	private Button softAttachButton;
-	private Button debugFromStartButton;
-	
-	private Label startAddressLabel;
-	private Text startAddress; 
-	private Label romLogFileLabel;
-	private Text romLogFilePath;
-	private Button romLogFileBrowse;
-	private Label romImageLabel;
-	private Text romImagePath;
-	private Button romImageBrowse;
-
-	private final ISummaryTextItemContainer summaryTextItemContainer;
-
-	
-    public StopModeRomImageWizardPage(ISummaryTextItemContainer summaryTextItemContainer) {
-        super(Messages.getString("StopModeRomImageWizardPage.0")); //$NON-NLS-1$
-		Check.checkArg(summaryTextItemContainer);
-		this.summaryTextItemContainer = summaryTextItemContainer;
-        setPageComplete(false);
-        setTitle(Messages.getString("StopModeRomImageWizardPage.0")); //$NON-NLS-1$
-        setDescription(Messages.getString("StopModeRomImageWizardPage.1")); //$NON-NLS-1$
-    }
-    public void dispose() {
-    	isDisposed = true;
-    	
-    	softAttachOption = softAttachButton.getSelection();
-    	
-		String startAddressText = startAddress.getText().trim().toLowerCase();
-		
-		int index = startAddressText.indexOf('x');
-		if (index > 0)
-		{
-			startAddressText = startAddressText.substring(2); //ignore 0x or 0X.
-		}
-		startAddressValue = Long.parseLong(startAddressText, 16);
-		
-    	romLogFile = romLogFilePath.getText().trim();
-    	romImageFile = romImagePath.getText().trim();
-    	super.dispose();
-    }
-    
-	/*
-     * @see IDialogPage#createControl(Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 3;
-        composite.setLayout(layout);
-        
-        GridData data = new GridData();
-        composite.setLayoutData(data);
-
-    	softAttachButton = new Button(composite, SWT.RADIO);
-		softAttachButton.setText(Messages.getString("StopModeRomImageWizardPage.15")); //$NON-NLS-1$
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 3;
-		softAttachButton.setLayoutData(data);
-		softAttachButton.setToolTipText(Messages.getString("StopModeRomImageWizardPage.16")); //$NON-NLS-1$
-		softAttachButton.setSelection(false);
-		softAttachButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				checkControlState();
-			}
-		});
-		softAttachButton.setData(".uid", "StopModeRunImageWizard.softAttachButton");
-        
-		debugFromStartButton = new Button(composite, SWT.RADIO);
-		debugFromStartButton.setText(Messages.getString("StopModeRomImageWizardPage.17")); //$NON-NLS-1$
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 3;
-		debugFromStartButton.setLayoutData(data);
-		debugFromStartButton.setToolTipText(Messages.getString("StopModeRomImageWizardPage.18")); //$NON-NLS-1$
-		debugFromStartButton.setSelection(true);
-		debugFromStartButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				checkControlState();
-			}
-		});
-		debugFromStartButton.setData(".uid", "StopModeRunImageWizard.debugFromStartButton");
-
-		startAddressLabel = new Label(composite, SWT.NONE);
-		startAddressLabel.setText(Messages.getString("StopModeRomImageWizardPage.3")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		startAddressLabel.setLayoutData(data);
-		startAddressLabel.setToolTipText(Messages.getString("StopModeRomImageWizardPage.4")); //$NON-NLS-1$
-		startAddressLabel.setData(".uid", "StopModeRunImageWizard.startAddressLabel");
-
-		startAddress = new Text(composite, SWT.BORDER);
-		startAddress.setText("0x0"); //$NON-NLS-1$
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 1;
-		startAddress.setLayoutData(data);
-		startAddress.setToolTipText(Messages.getString("StopModeRomImageWizardPage.4")); //$NON-NLS-1$
-		startAddress.setData(".uid", "StopModeRunImageWizard.startAddress");
-
-		romImageLabel = new Label(composite, SWT.NONE);
-		romImageLabel.setText(Messages.getString("StopModeRomImageWizardPage.11")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		romImageLabel.setLayoutData(data);
-		romImageLabel.setToolTipText(Messages.getString("StopModeRomImageWizardPage.12")); //$NON-NLS-1$
-		romImageLabel.setData(".uid", "StopModeRunImageWizard.romImageLabel");
-
-		romImagePath = new Text(composite, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		romImagePath.setLayoutData(data);
-		romImagePath.setToolTipText(Messages.getString("StopModeRomImageWizardPage.12")); //$NON-NLS-1$
-		romImagePath.setData(".uid", "StopModeRunImageWizard.romImagePath");
-	
-		romImageBrowse = ControlFactory.createPushButton(composite, Messages.getString("StopModeRomImageWizardPage.7")); //$NON-NLS-1$
-		romImageBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("StopModeRomImageWizardPage.13")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.img*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("StopModeRomImageWizardPage.14"), Messages.getString("StopModeRomImageWizardPage.10")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				BrowseDialogUtils.initializeFrom(dialog, romImagePath);
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					romImagePath.setText(result);					
-				}
-			}
-		});
-		romImageBrowse.setData(".uid", "StopModeRunImageWizard.romImageBrowse");
-		
-		romLogFileLabel = new Label(composite, SWT.NONE);
-		romLogFileLabel.setText(Messages.getString("StopModeRomImageWizardPage.5")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		romLogFileLabel.setLayoutData(data);
-		romLogFileLabel.setToolTipText(Messages.getString("StopModeRomImageWizardPage.6")); //$NON-NLS-1$
-		romLogFileLabel.setData(".uid", "StopModeRunImageWizard.romLogFileLabel");
-
-		romLogFilePath = new Text(composite, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		romLogFilePath.setLayoutData(data);
-		romLogFilePath.setToolTipText(Messages.getString("StopModeRomImageWizardPage.6")); //$NON-NLS-1$		
-		romLogFilePath.setData(".uid", "StopModeRunImageWizard.romLogFilePath");
-
-		romLogFileBrowse = ControlFactory.createPushButton(composite, Messages.getString("StopModeRomImageWizardPage.7")); //$NON-NLS-1$
-		romLogFileBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("StopModeRomImageWizardPage.8")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.log*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("StopModeRomImageWizardPage.9"), Messages.getString("StopModeRomImageWizardPage.10")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				BrowseDialogUtils.initializeFrom(dialog, romLogFilePath);
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					romLogFilePath.setText(result);					
-				}
-			}
-		});
-		romLogFileBrowse.setData(".uid", "StopModeRunImageWizard.romLogFileBrowse");
-	
-		setControl(composite);
-        Dialog.applyDialogFont(parent);
-        setPageComplete(true);
-    }
-    
-    void updateConfiguration(ILaunchConfigurationWorkingCopy config) {
-    	if (isDisposed) {
-    		if (softAttachOption)
-    			config.setAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Attach);
-    		else
-    			config.setAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Debug);
-
-    		config.setAttribute( PreferenceConstants.J_PN_RomImgStartAddress , startAddressValue.intValue());
-    		config.setAttribute( PreferenceConstants.J_PN_DownloadAddress , startAddressValue.intValue());
-    		config.setAttribute(PreferenceConstants.J_PN_RomLogFilePath, romLogFile);
-    		if (romLogFile.length()>0 && new File(romLogFile).exists()) {
-    			config.setAttribute(PreferenceConstants.J_PN_ParseRomLogFile, true);
-    			setEpoc32DirFromLogFile(config, romLogFile);    		
-    		}
-    		
-    		config.setAttribute(PreferenceConstants.J_PN_RomImagePath, romImageFile);
-     		if (romImageFile.length()>0 && new File(romImageFile).exists()) {
-    			config.setAttribute(PreferenceConstants.J_PN_DownloadRomImage, true);
-    		}
-
-    	} else {     		
-    		if (softAttachButton.getSelection())
-    			config.setAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Attach);
-    		else
-    			config.setAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Debug);
-
-    		String startAddressText = startAddress.getText().trim().toLowerCase();
-			
-    		int index = startAddressText.indexOf('x');
-    		if (index > 0)
-    		{
-    			startAddressText = startAddressText.substring(2); //ignore 0x or 0X.
-    		}
-    		Long longValue = Long.parseLong(startAddressText, 16);
-    		config.setAttribute( PreferenceConstants.J_PN_RomImgStartAddress , longValue.intValue());
-    		config.setAttribute( PreferenceConstants.J_PN_DownloadAddress , longValue.intValue());
-
-    		config.setAttribute(PreferenceConstants.J_PN_RomLogFilePath, romLogFilePath.getText().trim());    		
-    		if ((romLogFilePath.getText().trim().length()>0) && (new File(romLogFilePath.getText().trim()).exists())) {
-    			config.setAttribute(PreferenceConstants.J_PN_ParseRomLogFile, true);
-    			setEpoc32DirFromLogFile(config, romLogFilePath.getText().trim());
-    		}
-    		
-    		config.setAttribute(PreferenceConstants.J_PN_RomImagePath, romImagePath.getText());
-    		if ( (romImagePath.getText().trim().length()>0) && (new File(romImagePath.getText().trim()).exists()) ) {
-    			config.setAttribute(PreferenceConstants.J_PN_DownloadRomImage, true);
-    		}
-    	}
-    }
-    
-    // This function sets the epoc32 dir only if its not already set by default
-    void setEpoc32DirFromLogFile(ILaunchConfigurationWorkingCopy config, String romLogFile) {
-    	// now check to see if the epoc32 directory is set from the project
-		// If not, try to set it from log file path.
-		try {
-			String epoc32Dir = config.getAttribute( PreferenceConstants.J_PN_SymbianKitEpoc32Dir , "" ); //$NON-NLS-1$
-			if (epoc32Dir.length() <= 0) {
-				
-				int epoc32Index = romLogFile.toLowerCase().indexOf("\\epoc32"); //$NON-NLS-1$
-				if (epoc32Index > 0) {
-					epoc32Dir = romLogFile.substring(0, epoc32Index) + "\\epoc32\\"; //$NON-NLS-1$
-					config.setAttribute(PreferenceConstants.J_PN_SymbianKitEpoc32Dir, epoc32Dir);
-				}    					    					
-			}
-			
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-    }
-
-    public void setVisible(boolean visible) {
-    	super.setVisible(visible);
-    	if (!visible) {
-    		if (softAttachButton.getSelection()) {
-	    		summaryTextItemContainer.putSummaryTextItem("SoftAttach",  //$NON-NLS-1$
-	    				MessageFormat.format("{0}", new Object[] { //$NON-NLS-1$
-	    						Messages.getString("StopModeRomImageWizardPage.15") } )); //$NON-NLS-1$
-	    		summaryTextItemContainer.putSummaryTextItem("StartAddress", null);  //$NON-NLS-1$
-	    		summaryTextItemContainer.putSummaryTextItem("RomImage", null); //$NON-NLS-1$
-    		}
-    		else {
-    			summaryTextItemContainer.putSummaryTextItem("SoftAttach", null); //$NON-NLS-1$
-	    		summaryTextItemContainer.putSummaryTextItem("StartAddress",  //$NON-NLS-1$
-	    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-	    						Messages.getString("StopModeRomImageWizardPage.17"), //$NON-NLS-1$
-	    						startAddress.getText() } ));
-	    		summaryTextItemContainer.putSummaryTextItem("RomImage",  //$NON-NLS-1$
-	    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-	    						Messages.getString("StopModeRomImageWizardPage.11"), //$NON-NLS-1$
-	    						romImagePath.getText() } ));
-    		}
-    		summaryTextItemContainer.putSummaryTextItem("RomLogFile",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("StopModeRomImageWizardPage.5"), //$NON-NLS-1$
-    						romLogFilePath.getText() } ));
-    	}
-    }
-    
-    @Override
-    public void performHelp() {
-		PlatformUI.getWorkbench().getHelpSystem().displayHelp(LaunchWizardHelpIds.WIZARD_STOP_MODE_ROM_IMG_PAGE);
-    }
-    
-    private void checkControlState() {    	
-    	startAddress.setEnabled(!softAttachButton.getSelection());
-    	romImagePath.setEnabled(!softAttachButton.getSelection());    	    	
-    }
-}
\ No newline at end of file
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32LaunchWizard.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-import java.util.List;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-
-public class Trace32LaunchWizard extends AbstractLaunchWizard {
-
-    	private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
-	    private Trace32WizardPage fTrace32Page;
-	    private StopModeRomImageWizardPage fRomImgPage;
-	    
-		private boolean hasFinished = false;
-
-		public Trace32LaunchWizard(List<IPath> mmps, List<IPath> exes, IPath defaultExecutable, IProject project, String configurationName) {
-			super(project, configurationName, mmps, exes, defaultExecutable, true, false);
-			setWindowTitle(Messages.getString("Trace32LaunchWizard.1")); //$NON-NLS-1$
-	    }
-
-		@Override
-		public String getLaunchTypeID() {
-			return SettingsData.T32_LAUNCH_TYPE_ID;
-		}
-
-		@Override
-		public boolean supportsCategory(String categoryId) {
-			return categoryId.equals(BOARD_CATEGORY_ID);
-		}
-
-	    public boolean performFinish() {
-	    	hasFinished = true;
-	    	return true;
-	    }
-	 
-	    public void addPages() {
-	    	super.addPages();
-	    	fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
-	    	fTrace32Page = new Trace32WizardPage(this);
-	    	fRomImgPage = new StopModeRomImageWizardPage(this);
-	        addPage(fBuildOptionsSelectionPage);
-	        addPage(fTrace32Page);
-	        addPage(fRomImgPage);
-	        addPage(getSummaryPage());
-	    }
-
-	    public String toString() {
-	    	return Messages.getString("Trace32LaunchWizard.2"); //$NON-NLS-1$
-	    }
-	    
-	    public String getDescription() {
-	    	return Messages.getString("Trace32LaunchWizard.3"); //$NON-NLS-1$
-	    }
-	    
-	    public ILaunchConfigurationWorkingCopy createLaunchConfiguration(IPath mmpPath, IPath exePath, IPath processToLaunchTargetPath) {
-	    	// if we haven't finished then don't create anything
-	    	if (!hasFinished) {
-	    		return null;
-	    	}
-
-	    	ILaunchConfigurationWorkingCopy config = null;
-	    	try {
-	    		// create our config
-	    		config = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(SettingsData.T32_LAUNCH_TYPE_ID).newInstance(null, getConfigName());
-	    		
-	    		// set the default values
-	    		SettingsData.setDefaults(config, SettingsData.LaunchConfig_Trace32, getProject(), mmpPath, exePath);
-	    		
-	    		// now let the wizard pages update values 
-	    		fBuildOptionsSelectionPage.updateConfiguration(config);
-	    		fTrace32Page.updateConfiguration(config);
-	    		fRomImgPage.updateConfiguration(config);
-	    		
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-			return config;
-	    }
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32WizardPage.java	Thu May 20 18:40:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.cdt.utils.ui.controls.ControlFactory;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cpp.internal.api.utils.core.Check;
-import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
-
-import cwdbg.PreferenceConstants;
-
-public class Trace32WizardPage extends WizardPage {
-    		
-    private boolean isDisposed = false;
-    
-	private Label t32BootConfigLabel;
-	private Text t32BootConfigFilePath;
-	private Button t32BootConfigFileBrowse;
-	private String t32CMMScript;
-	
-	private Combo processorsList;
-	private int selectedProcIndex;
-
-	private final ISummaryTextItemContainer summaryTextItemContainer;
-	
-    public Trace32WizardPage(ISummaryTextItemContainer summaryTextItemContainer) {
-        super(Messages.getString("Trace32WizardPage.0")); //$NON-NLS-1$
-		Check.checkArg(summaryTextItemContainer);
-		this.summaryTextItemContainer = summaryTextItemContainer;
-        setPageComplete(false);
-        setTitle(Messages.getString("Trace32WizardPage.0")); //$NON-NLS-1$
-        setDescription(Messages.getString("Trace32WizardPage.1")); //$NON-NLS-1$
-    }
-    
-    public void dispose() {
-    	isDisposed = true;
-    	t32CMMScript = t32BootConfigFilePath.getText().trim();
-    	selectedProcIndex = processorsList.getSelectionIndex();
-    	super.dispose();
-    }
-
-	/*
-     * @see IDialogPage#createControl(Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 3;
-        composite.setLayout(layout);
-        
-        GridData data = new GridData();
-        composite.setLayoutData(data);
-
-		t32BootConfigLabel = new Label(composite, SWT.NONE);
-		t32BootConfigLabel.setText(Messages.getString("Trace32WizardPage.2")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		t32BootConfigLabel.setLayoutData(data);
-		t32BootConfigLabel.setToolTipText(Messages.getString("Trace32WizardPage.3")); //$NON-NLS-1$
-		t32BootConfigLabel.setData(".uid", "Trace32WizardPage.t32BootConfigLabel");
-
-		t32BootConfigFilePath = new Text(composite, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);	
-		data.horizontalSpan = 2;
-		t32BootConfigFilePath.setLayoutData(data);
-		t32BootConfigFilePath.setToolTipText(Messages.getString("Trace32WizardPage.3")); //$NON-NLS-1$
-		t32BootConfigFilePath.setData(".uid", "Trace32WizardPage.t32BootConfigFilePath");
-		
-		t32BootConfigFileBrowse = ControlFactory.createPushButton(composite, Messages.getString("Trace32WizardPage.9")); //$NON-NLS-1$
-		t32BootConfigFileBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("Trace32WizardPage.4")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.cmm*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("Trace32WizardPage.5"), Messages.getString("Trace32WizardPage.6")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				BrowseDialogUtils.initializeFrom(dialog, t32BootConfigFilePath);
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					t32BootConfigFilePath.setText(result);					
-				}
-			}
-		});
-		t32BootConfigFileBrowse.setData(".uid", "Trace32WizardPage.t32BootConfigFileBrowse");
-		
-		final Label processorsLabel = new Label(composite, SWT.NONE);
-		processorsLabel.setText(Messages.getString("Trace32WizardPage.7")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		processorsLabel.setLayoutData(data);
-		processorsLabel.setToolTipText(Messages.getString("Trace32WizardPage.8")); //$NON-NLS-1$
-		processorsLabel.setData(".uid", "Trace32WizardPage.processorsLabel");
-
-		processorsList = new Combo(composite, SWT.READ_ONLY);
-		processorsList.setItems(new String[] { "ARM920T", "ARM926TEJ", "ARM1136EJ-S", "OMAP3xx", "OMAP15xx", "OMAP16xx", "OMAP24xx", "OMAP34xx", "Generic" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-		processorsList.select(8); //by default, select the generic 
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 3;
-		processorsList.setLayoutData(data);
-		processorsList.setToolTipText(Messages.getString("Trace32WizardPage.8")); //$NON-NLS-1$
-		processorsList.setData(".uid", "Trace32WizardPage.processorsList");
-
-		setControl(composite);
-        Dialog.applyDialogFont(parent);
-        setPageComplete(true);
-    }
-    
-    void updateConfiguration(ILaunchConfigurationWorkingCopy config) {
-    	if (isDisposed) {
-    		if (t32CMMScript.length()>0 && new File(t32CMMScript).exists()) {
-    			config.setAttribute(SettingsData.spn_Trace32Conn_BootScriptFile, t32CMMScript);
-    		}    		
-    		config.setAttribute(PreferenceConstants.J_PN_TargetProcessor, selectedProcIndex);
-    	} else {    		
-    		if ((t32BootConfigFilePath.getText().trim().length()>0) && (new File(t32BootConfigFilePath.getText().trim()).exists())) {
-    			config.setAttribute(SettingsData.spn_Trace32Conn_BootScriptFile, t32BootConfigFilePath.getText());
-    		}
-    		config.setAttribute( PreferenceConstants.J_PN_TargetProcessor, processorsList.getSelectionIndex());
-    	}
-    }
-    
-    public void setVisible(boolean visible) {
-    	super.setVisible(visible);
-    	if (!visible) {
-			summaryTextItemContainer.putSummaryTextItem("T32InitScript",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("Trace32WizardPage.2"), //$NON-NLS-1$
-    						t32BootConfigFilePath.getText() } ));
-    		summaryTextItemContainer.putSummaryTextItem("TargetProcessor",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("Trace32WizardPage.7"), //$NON-NLS-1$
-    						processorsList.getItem(processorsList.getSelectionIndex()) } ));
-    	}
-    }
-    
-    @Override
-    public void performHelp() {
-		PlatformUI.getWorkbench().getHelpSystem().displayHelp(LaunchWizardHelpIds.WIZARD_TRACE32_PAGE);
-    }
-}
\ No newline at end of file
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Thu May 20 18:40:28 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Thu May 20 19:05:56 2010 -0500
@@ -19,9 +19,7 @@
 LaunchCategorySelectionPage.title=Launch Categories
 LaunchCategorySelectionPage.description=Select a launch category.
 LaunchCategorySelectionPage.phone=Phone
-LaunchCategorySelectionPage.board=Board
 LaunchCategorySelectionPage.phoneDesc=Launches on a phone using System TRK or Application TRK.
-LaunchCategorySelectionPage.boardDesc=Launches on a development board or reference hardware using a JTAG connection.
 LaunchCategorySelectionPage.categoryLabel=Select where you want to launch
 LaunchWizardSelectionPage.0=Launch Wizard
 LaunchWizardSelectionPage.1=Launch Types
@@ -48,24 +46,6 @@
 MainExecutableSelectionWizardPage.SelectExectuableTitle=Select Exectuable To Launch
 MainExecutableSelectionWizardPage.UsePathLabel.device=Specify device path of remote process to launch
 MainExecutableSelectionWizardPage.UsePathLabel.device.ToolTip=The specified process will be launched on the phone
-StopModeRomImageWizardPage.0=Symbian ROM Image Settings
-StopModeRomImageWizardPage.1=Choose either soft attach or debug from start option. With soft attach option, you can start debugging without changing the state of the target. Specify the ROM log file for debugging Symbian OS components.
-StopModeRomImageWizardPage.10=All Files
-StopModeRomImageWizardPage.11=Symbian ROM Image\:
-StopModeRomImageWizardPage.12=Specify Symbian OS ROM image that needs to be downloaded to RAM on the target.
-StopModeRomImageWizardPage.13=Choose Symbian ROM image file 
-StopModeRomImageWizardPage.14=Symbian ROM Image (*.img) Files (.img)
-StopModeRomImageWizardPage.15=Soft attach 
-StopModeRomImageWizardPage.16=Choose the soft attach option to debug the target just by attaching without downloading the Symbian OS image.
-StopModeRomImageWizardPage.17=Debug from start address 
-StopModeRomImageWizardPage.18=Choose the debug from start option to debug the target from the start address. 
-StopModeRomImageWizardPage.3=Start Address (in hex)\:
-StopModeRomImageWizardPage.4=Specify the target start address in hex, typically this is the start address of the ROM image.
-StopModeRomImageWizardPage.5=Symbian ROM Log File\:
-StopModeRomImageWizardPage.6=Specify the ROM log file for the ROM image that is going to be debugged. The ROM log file is generated when the ROM image is created.
-StopModeRomImageWizardPage.7=Browse...
-StopModeRomImageWizardPage.8=Choose Symbian ROM log file
-StopModeRomImageWizardPage.9=Symbian ROM Log Files
 SystemTRKLaunchWizard.1=New System TRK Launch Configuration
 SystemTRKLaunchWizard.2=System TRK Launch Configuration
 SystemTRKLaunchWizard.3=System TRK is a debug agent that runs on reference boards and prototype phones and allows you to debug your executables. The debugger downloads the executable files to the phone prior to launching. With System TRK, you can also debug the binaries included in the ROM image.
@@ -86,16 +66,3 @@
 TRKSISSelectionWizardPage.7=Installation Files
 TRKSISSelectionWizardPage.8=All Files
 TRKSISSelectionWizardPage.9=Browse...
-Trace32LaunchWizard.1=New Trace32 Launch Configuration
-Trace32LaunchWizard.2=Trace32 Launch Configuration
-Trace32LaunchWizard.3=Trace32 is an external debugger that Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.
-Trace32WizardPage.0=Trace32 Initialization Settings
-Trace32WizardPage.1=Choose the cmm script file and the processor for initializing the target through Trace32.
-Trace32WizardPage.2=Trace32 Initialization Script (.cmm file)\:
-Trace32WizardPage.3=Choose the cmm script file for initializing the target
-Trace32WizardPage.4=Choose Trace32 CMM initialization script
-Trace32WizardPage.5=T32 CMM script (*.cmm) files 
-Trace32WizardPage.6=All files
-Trace32WizardPage.7=Target Processor\:
-Trace32WizardPage.8=Choose the target processor from the list
-Trace32WizardPage.9=Browse...