# HG changeset patch # User fturovic # Date 1264538177 21600 # Node ID ba25abd590600d5586d1207fe2cfad016f506ea9 # Parent 71752005db5f0839edead319273d1b971104a26c# Parent c4cef82722d0d088f2799cd04cd292152e72c2ae daily head merge diff -r 71752005db5f -r ba25abd59060 core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java --- a/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java Tue Jan 26 14:24:10 2010 -0600 +++ b/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java Tue Jan 26 14:36:17 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 diff -r 71752005db5f -r ba25abd59060 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/STICommLogConsoleFactory.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/STICommLogConsoleFactory.java Tue Jan 26 14:24:10 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); - } -} diff -r 71752005db5f -r ba25abd59060 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Tue Jan 26 14:24:10 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Tue Jan 26 14:36:17 2010 -0600 @@ -79,7 +79,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$ @@ -98,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 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 ================================= @@ -136,14 +134,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$ @@ -612,7 +602,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 ); } @@ -760,8 +750,7 @@ setFileTransferTab(configuration, project); } - if (settingsGroup.equals(LaunchConfig_Trace32) || - settingsGroup.equals(LaunchConfig_SophiaSTI)) + if (settingsGroup.equals(LaunchConfig_Trace32)) { setStopModeMainTab(configuration, project); setStopModeDebuggerTab(configuration, project); @@ -839,26 +828,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); @@ -988,8 +957,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) { } diff -r 71752005db5f -r ba25abd59060 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java Tue Jan 26 14:24:10 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java Tue Jan 26 14:36:17 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); } diff -r 71752005db5f -r ba25abd59060 debuggercdi/com.nokia.cdt.debug.launch/plugin.xml --- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml Tue Jan 26 14:24:10 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml Tue Jan 26 14:36:17 2010 -0600 @@ -60,17 +60,6 @@ sourcePathComputerId="com.nokia.cdt.debug.cw.symbian.CarbideSourcePathComputer"> - - - - - - - - - - - - - - - mmps, List 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; - } -} diff -r 71752005db5f -r ba25abd59060 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaWizardPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaWizardPage.java Tue Jan 26 14:24:10 2010 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,231 +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 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$ - - BrowseDialogUtils.initializeFrom(dialog, sophiaSTIDLLPath); - - 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$ - - BrowseDialogUtils.initializeFrom(dialog, targetInitFilePath); - - 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 diff -r 71752005db5f -r ba25abd59060 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties Tue Jan 26 14:24:10 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties Tue Jan 26 14:36:17 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