--- a/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java	Tue Jan 26 14:21:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java	Tue Jan 26 16:31:29 2010 -0600
@@ -25,7 +25,6 @@
 	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_SOPHIAWTI = "Carbide_SophiaWTI";
 	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/src/com/nokia/cdt/debug/cw/symbian/STICommLogConsoleFactory.java	Tue Jan 26 14:21:35 2010 -0600
+++ /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 STICommLogConsoleFactory implements IConsoleFactory {
-
-	public STICommLogConsoleFactory() {
-	}
-	
-	public void openConsole() {
-		SymbianPlugin.getDefault().openSTICommLogConsole(true);
-	}
-}

--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Tue Jan 26 14:21:35 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Tue Jan 26 16:31:29 2010 -0600
@@ -78,7 +78,6 @@
 	public static final String LaunchConfig_SysTRK = PREFIX + ".LaunchConfig_SysTRK"; //$NON-NLS-1$
 	public static final String LaunchConfig_CrashDebugger = PREFIX + ".LaunchConfig_CrashDebugger"; //$NON-NLS-1$
 	public static final String LaunchConfig_Trace32 = PREFIX + ".LaunchConfig_Trace32"; //$NON-NLS-1$
-	public static final String LaunchConfig_SophiaSTI = PREFIX + ".LaunchConfig_SophiaSTI"; //$NON-NLS-1$
 
 	public static final String ATTR_originalName = "originalName"; //$NON-NLS-1$
 
@@ -97,7 +96,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 STI_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "stiLaunch"; //$NON-NLS-1$
 	public static final String T32_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "t32Launch"; //$NON-NLS-1$
 
 	//================ Shadowed CW Preference Panels =================================
@@ -135,14 +133,6 @@
 	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$
 	
-	//	---< STI Connection Panel> -------------------
-	public static final String spn_SophiaSTIConn= "Sophia Target Interface Connection"; //$NON-NLS-1$
-	
-	public static final String spn_SophiaSTIConn_DllPath= SPN(spn_SophiaSTIConn, "SophiaTargetInterfaceDllPath"); //$NON-NLS-1$
-	public static final String spn_SophiaSTIConn_LogOption= SPN(spn_SophiaSTIConn, "STILogOption"); //$NON-NLS-1
-	public static final String spn_SophiaSTIConn_JtagClock= SPN(spn_SophiaSTIConn,	"STIJTAGClock"); //$NON-NLS-1
-	public static final String spn_SophiaSTIConn_StiEmulatorType= SPN(spn_SophiaSTIConn,	"STIJTAGType"); //$NON-NLS-1
-
 	//================= End of Shadowed panels ===========================================
 
 	public static final String TARGET_PATH_INCLUDES_FILENAME = "TARGET_PATH_INCLUDES_FILENAME"; //$NON-NLS-1$
@@ -611,7 +601,7 @@
 		{
 			configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, false );
 		}
-		else // others like T32, Sophia and crash debugger.
+		else // others like T32 and crash debugger.
 			configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, true );	
 	}
 
@@ -758,8 +748,7 @@
 			setFileTransferTab(configuration, project);
 		}
 
-		if (settingsGroup.equals(LaunchConfig_Trace32) ||
-				settingsGroup.equals(LaunchConfig_SophiaSTI))
+		if (settingsGroup.equals(LaunchConfig_Trace32))
 		{
 			setStopModeMainTab(configuration, project);
 			setStopModeDebuggerTab(configuration, project);
@@ -837,26 +826,6 @@
 					""); //$NON-NLS-1$
 		}
 	
-		if (settingsGroup.equals(LaunchConfig_SophiaSTI)) {
-			configuration.setAttribute( SettingsData.spn_SophiaSTIConn_DllPath, "C:\\CarbideIF_ARM\\WTI.dll"); //$NON-NLS-1$
-			configuration.setAttribute( SettingsData.spn_SophiaSTIConn_JtagClock, "Auto"); //$NON-NLS-1$
-			configuration.setAttribute( SettingsData.spn_SophiaSTIConn_LogOption, false);
-			configuration.setAttribute( SettingsData.spn_SophiaSTIConn_StiEmulatorType, "Auto"); //$NON-NLS-1$
-			
-			// Stop mode debugging using STI : specify Sophia STI debugger protocol plugin.
-			//
-			ConnectionTypeInfo connTI = new ConnectionTypeInfo(
-					"Carbide Sophia STI", // Internal ID //$NON-NLS-1$
-					"Sophia STI Configuration", // Display name. //$NON-NLS-1$
-					"Sophia Target Interface Connection"); // Pref panel name
-
-			DebuggerCommonData.setLaunchConfigConnSettings(
-					configuration,
-					connTI, 
-					"Sophia Target Interface Plugin", //$NON-NLS-1$
-					""); //$NON-NLS-1$
-		}
-		
 		// Add the Symbian OS SDK Mapping.
 		addSymbianSDKMapping(project, configuration);
 
@@ -986,8 +955,7 @@
 			ILaunchConfigurationType configurationType = configuration.getType();
 			String id = configurationType.getIdentifier();
 			return id.equals(T32_LAUNCH_TYPE_ID) ||
-			id.endsWith("T32Launch")||//$NON-NLS-1$
-			id.equals(STI_LAUNCH_TYPE_ID);
+			id.endsWith("T32Launch"); //$NON-NLS-1$
 		} catch (CoreException e) {
 		}
 		

--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java	Tue Jan 26 14:21:35 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java	Tue Jan 26 16:31:29 2010 -0600
@@ -45,7 +45,6 @@
 	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";
-	private final String STICommMessagesConsoleName = "Sophia Target Interface Console"; //$NON-NLS-1$
 	public static final String DebugTraceMessagesConsoleName = "Emulator Output"; //$NON-NLS-1$
 	
 	public static final String DebugTraceLaunchSetting = "DebugTraceLaunchSetting"; //$NON-NLS-1$
@@ -154,10 +153,6 @@
 		openConsole(symbianRomLogMessagesConsoleName, clearConsole);
 	}
 	
-	public void openSTICommLogConsole(boolean clearConsole) {
-		openConsole(STICommMessagesConsoleName, clearConsole);
-	}
-	
 	public void openDebugTraceConsole(boolean clearConsole) {
 		openConsole(DebugTraceMessagesConsoleName, clearConsole);
 	}

--- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Tue Jan 26 14:21:35 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Tue Jan 26 16:31:29 2010 -0600
@@ -60,17 +60,6 @@
             sourcePathComputerId="com.nokia.cdt.debug.cw.symbian.CarbideSourcePathComputer">
       </launchDelegate>
       
-      <launchDelegate
-            name="Symbian OS Sophia"
-            delegate="com.nokia.cdt.internal.debug.launch.SophiaSTILaunchDelegate"
-            delegateDescription="Launch a classic Symbian OS Trace32 debug session."          
-            modes="debug"
-            type="com.nokia.cdt.debug.launch.stiLaunch"
-            id="com.nokia.cdt.debug.launch.stiLaunchDelegate"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="com.nokia.cdt.debug.cw.symbian.CarbideSourcePathComputer">
-      </launchDelegate>
-  
    </extension>
 
    <extension
@@ -106,12 +95,6 @@
             id="com.nokia.cdt.debug.launch.t32Launch">
       </launchConfigurationType>
       
-      <launchConfigurationType
-            name="Symbian OS Sophia"
-            public="true"
-            id="com.nokia.cdt.debug.launch.stiLaunch">
-      </launchConfigurationType>
-  
    </extension>
    
   <extension
@@ -142,12 +125,6 @@
             configTypeID="com.nokia.cdt.debug.launch.t32Launch"
             id="com.nokia.cdt.debug.launch.t32LaunchImage">
       </launchConfigurationTypeImage>
-      
-      <launchConfigurationTypeImage
-            icon="icons/launch_config_file_16x16.png"
-            configTypeID="com.nokia.cdt.debug.launch.stiLaunch"
-            id="com.nokia.cdt.debug.launch.stiLaunchImage">
-      </launchConfigurationTypeImage>
     </extension>
 
    <extension
@@ -195,15 +172,6 @@
       </launchConfigurationTabGroup>
     </extension>
     
-    <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="com.nokia.cdt.debug.launch.stiLaunch"
-            class="com.nokia.cdt.internal.debug.launch.ui.SophiaConfigurationTabGroup"
-            id="com.nokia.cdt.debug.launch.SophiaLaunchTabGroup">
-      </launchConfigurationTabGroup>
-    </extension>
-
  
     <extension
          point="org.eclipse.debug.ui.launchShortcuts">

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/SophiaSTILaunchDelegate.java	Tue Jan 26 14:21:35 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +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 SophiaSTILaunchDelegate 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 {
-	            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_SophiaSTI);
-	            			
-	            // 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_SophiaSTIConn_LogOption, false)) {
-									SymbianPlugin.getDefault().openSTICommLogConsole(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);
-								this.abort(e.getLocalizedMessage(), 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();
-	        }
-		} // end of synchronized.
-	}
-}
\ No newline at end of file

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/LaunchTabHelpIds.java	Tue Jan 26 14:21:35 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/LaunchTabHelpIds.java	Tue Jan 26 16:31:29 2010 -0600
@@ -60,8 +60,6 @@
 	
 	public static final String STOP_MODE_T32_CONNECTION = HelpID_Prefix + "stopmode_t32connection"; //$NON-NLS-1$
 	
-	public static final String STOP_MODE_SOPHIA_CONNECTION = HelpID_Prefix + "stopmode_sophiaconnection"; //$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$

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/SophiaConfigurationTabGroup.java	Tue Jan 26 14:21:35 2010 -0600
+++ /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 SophiaConfigurationTabGroup extends
-		AbstractLaunchConfigurationTabGroup {
-
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-				new StopModeMainTab(),				
-				new SophiaTargetInterfaceTab(),
-				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_SophiaSTI, project);
-	}
-}

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/SophiaTargetInterfaceTab.java	Tue Jan 26 14:21:35 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +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.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 SophiaTargetInterfaceTab extends CLaunchConfigurationTab {
-
-	// Radio Buttons
-
-	// Boolean widgets
-	private Button viewMessages;
-	private Combo jtagClockCombo;
-	private Text text;
-	private Combo emulatorTypeCombo;
-
-	/* (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_SOPHIA_CONNECTION);
-		
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		comp.setLayout(topLayout);
-
-		//createVerticalSpacer(comp, 2);
-		//createSymbolicsLoadingGroup(comp, 2);
-		//createVerticalSpacer(comp, 2);
-		//createBooleanGroup(comp, 2);
-
-		final Label sophiaTargetInterfaceLabel = new Label(comp, SWT.NONE);
-		sophiaTargetInterfaceLabel.setText(Messages.getString("SophiaTargetInterfaceTab.0")); //$NON-NLS-1$
-		
-		sophiaTargetInterfaceLabel.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.10")); //$NON-NLS-1$
-		new Label(comp, SWT.NONE);
-
-		text = new Text(comp, SWT.BORDER);
-		text.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		text.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.10")); //$NON-NLS-1$
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		final Button browseButton = new Button(comp, SWT.NONE);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-
-				public void widgetSelected(SelectionEvent evt) {
-					FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-					dialog.setText(Messages.getString("SophiaTargetInterfaceTab.7")); //$NON-NLS-1$
-					dialog.setFilterExtensions(new String[] {"*.dll*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-					dialog.setFilterNames(new String[] {Messages.getString("SophiaTargetInterfaceTab.8"), Messages.getString("SophiaTargetInterfaceTab.9")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-					String result = dialog.open();
-					if (result != null && new File(result).exists()) {
-						text.setText(result);
-						updateLaunchConfigurationDialog();
-					}
-				}
-			});
-	
-		browseButton.setText(Messages.getString("SophiaTargetInterfaceTab.1")); //$NON-NLS-1$
-		
-		final Label jtagTypeLabel = new Label(comp, SWT.NONE);
-		jtagTypeLabel.setText(Messages.getString("SophiaTargetInterfaceTab.11")); //$NON-NLS-1$
-		jtagTypeLabel.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.12")); //$NON-NLS-1$
-		new Label(comp, SWT.NONE);
-
-		emulatorTypeCombo = new Combo(comp, SWT.READ_ONLY);
-		emulatorTypeCombo.setItems(new String[] {Messages.getString("SophiaTargetInterfaceTab.13"), Messages.getString("SophiaTargetInterfaceTab.14"), Messages.getString("SophiaTargetInterfaceTab.15"), Messages.getString("SophiaTargetInterfaceTab.16"), Messages.getString("SophiaTargetInterfaceTab.17")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		emulatorTypeCombo.setText(Messages.getString("SophiaTargetInterfaceTab.13")); //$NON-NLS-1$
-		emulatorTypeCombo.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false));
-		emulatorTypeCombo.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.12")); //$NON-NLS-1$
-		
-		emulatorTypeCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		new Label(comp, SWT.NONE);
-		
-		final Label jtagRtckLabel = new Label(comp, SWT.NONE);
-		jtagRtckLabel.setText(Messages.getString("SophiaTargetInterfaceTab.19")); //$NON-NLS-1$
-		jtagRtckLabel.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.20")); //$NON-NLS-1$
-		new Label(comp, SWT.NONE);
-
-		jtagClockCombo = new Combo(comp, SWT.READ_ONLY);
-		jtagClockCombo.setItems(new String[] {Messages.getString("SophiaTargetInterfaceTab.13"), Messages.getString("SophiaTargetInterfaceTab.22"), Messages.getString("SophiaTargetInterfaceTab.23"), Messages.getString("SophiaTargetInterfaceTab.24"), Messages.getString("SophiaTargetInterfaceTab.25")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		jtagClockCombo.setText(Messages.getString("SophiaTargetInterfaceTab.13")); //$NON-NLS-1$
-		jtagClockCombo.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false));
-		jtagClockCombo.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.20")); //$NON-NLS-1$
-		
-		jtagClockCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		new Label(comp, SWT.NONE);
-
-		viewMessages = new Button(comp, SWT.CHECK);
-		viewMessages.setLayoutData(new GridData());
-		viewMessages.setText(Messages.getString("SophiaTargetInterfaceTab.27")); //$NON-NLS-1$
-		viewMessages.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.18")); //$NON-NLS-1$
-		
-		viewMessages.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		new Label(comp, SWT.NONE);
-
-		Dialog.applyDialogFont(parent);
-		checkControlState();
-	}
-
-
-	/* (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 {
-			text.setText(configuration.getAttribute( SettingsData.spn_SophiaSTIConn_DllPath, "C:\\CarbideIF_ARM\\WTI.dll")); //$NON-NLS-1$
-			jtagClockCombo.setText(configuration.getAttribute( SettingsData.spn_SophiaSTIConn_JtagClock, "Auto")); //$NON-NLS-1$
-			viewMessages.setSelection(configuration.getAttribute( SettingsData.spn_SophiaSTIConn_LogOption, false));
-			emulatorTypeCombo.setText(configuration.getAttribute(SettingsData.spn_SophiaSTIConn_StiEmulatorType, Messages.getString("SophiaTargetInterfaceTab.13"))); //$NON-NLS-1$
-			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_SophiaSTIConn_DllPath, text.getText());
-		configuration.setAttribute( SettingsData.spn_SophiaSTIConn_JtagClock, jtagClockCombo.getText());
-		configuration.setAttribute( SettingsData.spn_SophiaSTIConn_LogOption, viewMessages.getSelection());
-		configuration.setAttribute( SettingsData.spn_SophiaSTIConn_StiEmulatorType, emulatorTypeCombo.getText());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.getString("SophiaTargetInterfaceTab.4"); //$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 = text.getText().trim();
-			if (pcPath.length() < 1) {
-				setErrorMessage(Messages.getString("SophiaTargetInterfaceTab.5")); //$NON-NLS-1$
-				return false;
-			} else {
-				if (!new File(pcPath).exists()) {
-					setErrorMessage(Messages.getString("SophiaTargetInterfaceTab.6")); //$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();
-	}
-}
\ No newline at end of file

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Tue Jan 26 14:21:35 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Tue Jan 26 16:31:29 2010 -0600
@@ -176,32 +176,6 @@
 RunModeMainTab.7=Remote process to launch must be an absolute path.
 RunModeMainTab.8=The project associated with this launch configuration.
 RunModeMainTab.NoConnectionError=A valid remote connection must be selected. If none exist, create a new one.
-SophiaTargetInterfaceTab.0=Sophia Target Interface (WTI.dll) location
-SophiaTargetInterfaceTab.1=Browse
-SophiaTargetInterfaceTab.10=The absolute path on your PC of the Carbide C++ interface to Sophia JTAG emulator (wti.dll)
-SophiaTargetInterfaceTab.11=EJ_Debug Type
-SophiaTargetInterfaceTab.12=Select the type of your Sophia JTAG emulator
-SophiaTargetInterfaceTab.13=Auto
-SophiaTargetInterfaceTab.14=ARM9
-SophiaTargetInterfaceTab.15=ARM11
-SophiaTargetInterfaceTab.16=ARM9_11
-SophiaTargetInterfaceTab.17=ARM7_9_11
-SophiaTargetInterfaceTab.18=This lets you see the debug command messages between the Carbide debugger and Sophia JTAG emulator
-SophiaTargetInterfaceTab.19=JTAG TCLK Frequency
-SophiaTargetInterfaceTab.2=STI Target Configuration File
-SophiaTargetInterfaceTab.20=Select desired JTAG TCLK Frequency (Some boards don't support highest or 'Auto' settings)
-SophiaTargetInterfaceTab.22=33 MHz
-SophiaTargetInterfaceTab.23=16 MHz
-SophiaTargetInterfaceTab.24=8 MHz
-SophiaTargetInterfaceTab.25=500 KHz
-SophiaTargetInterfaceTab.27=View messages between Carbide and STI
-SophiaTargetInterfaceTab.3=Browse
-SophiaTargetInterfaceTab.4=Connection
-SophiaTargetInterfaceTab.5=STI DLL not specified
-SophiaTargetInterfaceTab.6=STI DLL specified does not exist
-SophiaTargetInterfaceTab.7=Select Sophia Target Interface library (WTI.dll)
-SophiaTargetInterfaceTab.8=Dynamic Link Libraries
-SophiaTargetInterfaceTab.9=All Files
 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)

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java	Tue Jan 26 14:21:35 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java	Tue Jan 26 16:31:29 2010 -0600
@@ -188,12 +188,6 @@
 			wizards.add(trace32Wizard);
 		}
 
-		SophiaLaunchWizard sophiaWizard = new SophiaLaunchWizard(mmps, exes, defaultExecutable, project, configurationName);
-		if (sophiaWizard.supportsMode(mode)) {
-			sophiaWizard.addPages();
-			wizards.add(sophiaWizard);
-		}
-
 		AttachTRKLaunchWizard attachTRKWizard = new AttachTRKLaunchWizard(mmps, exes, defaultExecutable, project, configurationName);
 		if (attachTRKWizard.supportsMode(mode)) {
 			attachTRKWizard.addPages();

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardHelpIds.java	Tue Jan 26 14:21:35 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardHelpIds.java	Tue Jan 26 16:31:29 2010 -0600
@@ -34,8 +34,6 @@
 
 	public static final String WIZARD_SUMMARY_PAGE = HelpID_Prefix + "wizard_summary_page"; //$NON-NLS-1$
 
-	public static final String WIZARD_SOPHIA_PAGE = HelpID_Prefix + "wizard_sophia_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$

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaLaunchWizard.java	Tue Jan 26 14:21:35 2010 -0600
+++ /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 java.util.List;
-
-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 com.nokia.cdt.debug.cw.symbian.SettingsData;
-
-public class SophiaLaunchWizard extends AbstractLaunchWizard {
-
-    private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
-    private SophiaWizardPage fSophiaPage;
-    private StopModeRomImageWizardPage fRomImgPage;
-    
-	private boolean hasFinished = false;
-
-	public SophiaLaunchWizard(List<IPath> mmps, List<IPath> exes, IPath defaultExecutable, IProject project, String configurationName) {
-		super(project, configurationName, mmps, exes, defaultExecutable, true, false);
-		setWindowTitle(Messages.getString("SophiaLaunchWizard.1")); //$NON-NLS-1$
-    }
-
-	@Override
-	public String getLaunchTypeID() {
-		return SettingsData.STI_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();
-    	fSophiaPage = new SophiaWizardPage(this);
-    	fRomImgPage = new StopModeRomImageWizardPage(this);
-        addPage(fBuildOptionsSelectionPage);
-        addPage(fSophiaPage);
-        addPage(fRomImgPage);
-        addPage(getSummaryPage());
-    }
-
-    public String toString() {
-    	return Messages.getString("SophiaLaunchWizard.2"); //$NON-NLS-1$
-    }
-    
-    public String getDescription() {
-    	return Messages.getString("SophiaLaunchWizard.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.STI_LAUNCH_TYPE_ID).newInstance(null, getConfigName());
-    		
-    		// set the default values
-    		SettingsData.setDefaults(config, SettingsData.LaunchConfig_SophiaSTI, getProject(), mmpPath, exePath);
-    		
-    		// now let the wizard pages update values 
-    		fBuildOptionsSelectionPage.updateConfiguration(config);
-    		fSophiaPage.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/SophiaWizardPage.java	Tue Jan 26 14:21:35 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,226 +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 cwdbg.PreferenceConstants;
-
-public class SophiaWizardPage extends WizardPage {
-    		
-    private boolean isDisposed = false;
-    
-	private Label sophiaSTIDLLLabel;
-	private Text sophiaSTIDLLPath;
-	private Button sophiaSTIDLLBrowse;
-	private String sophiaSTIDLL;
-
-	private Label targetInitFileLabel;
-	private Text targetInitFilePath;
-	private Button targetInitFileBrowse;
-	private String targetInitFile;
-
-	private Combo processorsList;
-	private int selectedProcIndex;
-
-	private final ISummaryTextItemContainer summaryTextItemContainer;
-	
-    public SophiaWizardPage(ISummaryTextItemContainer summaryTextItemContainer) {
-        super(Messages.getString("SophiaWizardPage.0")); //$NON-NLS-1$
-		Check.checkArg(summaryTextItemContainer);
-		this.summaryTextItemContainer = summaryTextItemContainer;
-        setPageComplete(false);
-        setTitle(Messages.getString("SophiaWizardPage.0")); //$NON-NLS-1$
-        setDescription(Messages.getString("SophiaWizardPage.1")); //$NON-NLS-1$
-    }
-    public void dispose() {
-    	isDisposed = true;
-    	sophiaSTIDLL = sophiaSTIDLLPath.getText().trim();
-    	targetInitFile = targetInitFilePath.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);
-
-        sophiaSTIDLLLabel = new Label(composite, SWT.NONE);
-		sophiaSTIDLLLabel.setText(Messages.getString("SophiaWizardPage.2")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		sophiaSTIDLLLabel.setLayoutData(data);
-		sophiaSTIDLLLabel.setToolTipText(Messages.getString("SophiaWizardPage.3")); //$NON-NLS-1$
-		sophiaSTIDLLLabel.setData(".uid", "SophiaWizardPage.sophiaSTIDLLLabel");
-
-		sophiaSTIDLLPath = new Text(composite, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);	
-		data.horizontalSpan = 2;
-		sophiaSTIDLLPath.setLayoutData(data);
-		sophiaSTIDLLPath.setToolTipText(Messages.getString("SophiaWizardPage.3")); //$NON-NLS-1$
-		sophiaSTIDLLPath.setData(".uid", "SophiaWizardPage.sophiaSTIDLLPath");
-		
-		sophiaSTIDLLBrowse = ControlFactory.createPushButton(composite, Messages.getString("SophiaWizardPage.13")); //$NON-NLS-1$
-		sophiaSTIDLLBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("SophiaWizardPage.4")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.dll*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("SophiaWizardPage.5"), Messages.getString("SophiaWizardPage.6")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					sophiaSTIDLLPath.setText(result);					
-				}
-			}
-		});
-		sophiaSTIDLLBrowse.setData(".uid", "SophiaWizardPage.sophiaSTIDLLBrowse");
-
-		targetInitFileLabel = new Label(composite, SWT.NONE);
-		targetInitFileLabel.setText(Messages.getString("SophiaWizardPage.7")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		targetInitFileLabel.setLayoutData(data);
-		targetInitFileLabel.setToolTipText(Messages.getString("SophiaWizardPage.8")); //$NON-NLS-1$
-		targetInitFileLabel.setData(".uid", "SophiaWizardPage.targetInitFileLabel");
-
-		targetInitFilePath = new Text(composite, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);	
-		data.horizontalSpan = 2;
-		targetInitFilePath.setLayoutData(data);
-		targetInitFilePath.setToolTipText(Messages.getString("SophiaWizardPage.8")); //$NON-NLS-1$
-		targetInitFilePath.setData(".uid", "SophiaWizardPage.targetInitFilePath");
-		
-		targetInitFileBrowse = ControlFactory.createPushButton(composite, Messages.getString("SophiaWizardPage.13")); //$NON-NLS-1$
-		targetInitFileBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("SophiaWizardPage.9")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.cfg*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("SophiaWizardPage.10"), Messages.getString("SophiaWizardPage.6")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					targetInitFilePath.setText(result);					
-				}
-			}
-		});
-		targetInitFileBrowse.setData(".uid", "SophiaWizardPage.targetInitFileBrowse");
-
-		final Label processorsLabel = new Label(composite, SWT.NONE);
-		processorsLabel.setText(Messages.getString("SophiaWizardPage.11")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		processorsLabel.setLayoutData(data);
-		processorsLabel.setToolTipText(Messages.getString("SophiaWizardPage.12")); //$NON-NLS-1$
-		processorsLabel.setData(".uid", "SophiaWizardPage.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("SophiaWizardPage.12")); //$NON-NLS-1$
-		processorsList.setData(".uid", "SophiaWizardPage.processorsList");
-		
-		setControl(composite);
-        Dialog.applyDialogFont(parent);
-        setPageComplete(true);
-    }
-    
-    void updateConfiguration(ILaunchConfigurationWorkingCopy config) {
-    	if (isDisposed) {
-    		if (sophiaSTIDLL.length()>0 && new File(sophiaSTIDLL).exists()) {
-    			config.setAttribute(SettingsData.spn_SophiaSTIConn_DllPath, sophiaSTIDLL);
-    		} 
-    		
-    		if (targetInitFile.length()>0 && new File(targetInitFile).exists()) {
-    			config.setAttribute(PreferenceConstants.J_PN_TargetInitFilePath, targetInitFile);
-    			config.setAttribute(PreferenceConstants.J_PN_RunTargetInitFile, true);
-    		} 
-  
-    		config.setAttribute(PreferenceConstants.J_PN_TargetProcessor, selectedProcIndex);
-    	} else {    		
-    		if ((sophiaSTIDLLPath.getText().trim().length()>0) && (new File(sophiaSTIDLLPath.getText().trim()).exists())) {
-    			config.setAttribute(SettingsData.spn_SophiaSTIConn_DllPath, sophiaSTIDLLPath.getText());
-    		}
-    		
-      		if (targetInitFilePath.getText().trim().length()>0 && new File(targetInitFilePath.getText().trim()).exists()) {
-    			config.setAttribute(PreferenceConstants.J_PN_TargetInitFilePath, targetInitFilePath.getText().trim());
-    			config.setAttribute(PreferenceConstants.J_PN_RunTargetInitFile, true);
-    		}    
-
-    		config.setAttribute( PreferenceConstants.J_PN_TargetProcessor, processorsList.getSelectionIndex());
-    	}
-    }
-
-    public void setVisible(boolean visible) {
-    	super.setVisible(visible);
-    	if (!visible) {
-    		summaryTextItemContainer.putSummaryTextItem("SophiaTargetInterface",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("SophiaWizardPage.2"), //$NON-NLS-1$
-    						sophiaSTIDLLPath.getText() } ));
-    		summaryTextItemContainer.putSummaryTextItem("TargetInitFile",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("SophiaWizardPage.7"), //$NON-NLS-1$
-    						targetInitFilePath.getText() } ));
-    		summaryTextItemContainer.putSummaryTextItem("TargetProcessor",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("SophiaWizardPage.11"), //$NON-NLS-1$
-    						processorsList.getItem(processorsList.getSelectionIndex()) } ));
-    	}
-    }
-    
-    @Override
-    public void performHelp() {
-		PlatformUI.getWorkbench().getHelpSystem().displayHelp(LaunchWizardHelpIds.WIZARD_SOPHIA_PAGE);
-    }
-}
\ No newline at end of file

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Tue Jan 26 14:21:35 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Tue Jan 26 16:31:29 2010 -0600
@@ -48,23 +48,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
-SophiaLaunchWizard.1=New Sophia STI Launch Configuration
-SophiaLaunchWizard.2=Sophia STI Launch Configuration
-SophiaLaunchWizard.3=Sophia STI is an external debugger that Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.
-SophiaWizardPage.0=Sophia Initialization Settings
-SophiaWizardPage.1=Choose the Sophia WTI DLL, the target initialization file and the processor for initializing the target through Sophia STI.
-SophiaWizardPage.10=Initialization Files (*.cfg) 
-SophiaWizardPage.11=Target Processor\:
-SophiaWizardPage.12=Choose the target processor from the list
-SophiaWizardPage.13=Browse...
-SophiaWizardPage.2=Sophia Target Interface (WTI.DLL)\:
-SophiaWizardPage.3=Choose the Sophia's WTI.DLL which is used by the Carbide debugger to connect to the target through Sophia target interface.
-SophiaWizardPage.4=Choose the Sophia Target Interface (WTI.DLL) library 
-SophiaWizardPage.5=DLL files (.dll)
-SophiaWizardPage.6=All files
-SophiaWizardPage.7=Target Initialization File\:
-SophiaWizardPage.8=Choose the target initialization file which is run by the Carbide debugger after connecting to the target.
-SophiaWizardPage.9=Choose the target initialization file 
 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