# HG changeset patch # User wpaul # Date 1284068766 18000 # Node ID 9e45f0e58c6e12d8e0c1de17e0b2eab81a3eb80f # Parent 359f06b54dccd619689fdd23c978867411ac5307 cleaned up old classic TRK/DE-isms: removed TRK Program Output Console, TRK Communications Log Console, Symbian Rom Log Console removed option to log rom log warnings - these are handled in EDC now if a module is not found removed TRK timeout launch setting removed default processor mode setting diff -r 359f06b54dcc -r 9e45f0e58c6e debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml Thu Sep 09 13:57:02 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml Thu Sep 09 16:46:06 2010 -0500 @@ -64,25 +64,6 @@ - - - - - - - - - - diff -r 359f06b54dcc -r 9e45f0e58c6e debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/RomLogConsoleFactory.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/RomLogConsoleFactory.java Thu Sep 09 13:57:02 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 RomLogConsoleFactory implements IConsoleFactory { - - public RomLogConsoleFactory() { - } - - public void openConsole() { - SymbianPlugin.getDefault().openSymbianRomLogConsole(true); - } -} diff -r 359f06b54dcc -r 9e45f0e58c6e debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Thu Sep 09 13:57:02 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Thu Sep 09 16:46:06 2010 -0500 @@ -126,8 +126,6 @@ public static final String TARGET_PATH_INCLUDES_FILENAME = "TARGET_PATH_INCLUDES_FILENAME"; //$NON-NLS-1$ - public static final int J_PN_TrkTimeout_Default = 2000; - private static String[] exceptionPropertyNames = null; private static IPath mainExeTargetPath = null; private static IPath mainExeHostPath = null; @@ -415,8 +413,6 @@ configuration.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, false ); configuration.setAttribute( PreferenceConstants.J_PN_ViewUnframedData, true ); configuration.setAttribute( PreferenceConstants.J_PN_ViewCommMessages, false ); - configuration.setAttribute( PreferenceConstants.J_PN_DefaultInstructionSet, PreferenceConstants.J_PV_DefaultInstructionSet_Auto ); - configuration.setAttribute( PreferenceConstants.J_PN_TRKMessageTimeout, J_PN_TrkTimeout_Default ); } public static void setStopModeDebuggerTab(ILaunchConfigurationWorkingCopy configuration, IProject project) { @@ -430,7 +426,6 @@ configuration.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, false ); configuration.setAttribute( PreferenceConstants.J_PN_RomImgStartAddress , 0); configuration.setAttribute( PreferenceConstants.J_PN_DebugRunFromStart, PreferenceConstants.J_PV_DebugRunFromStart_Debug); - configuration.setAttribute( PreferenceConstants.J_PN_DefaultInstructionSet, PreferenceConstants.J_PV_DefaultInstructionSet_Auto ); configuration.setAttribute( PreferenceConstants.J_PN_TargetProcessor, 8); configuration.setAttribute( PreferenceConstants.J_PN_RunTargetInitFile, false); configuration.setAttribute( PreferenceConstants.J_PN_TargetInitFilePath, ""); //$NON-NLS-1$ @@ -670,7 +665,6 @@ configuration.setAttribute(PreferenceConstants.J_PN_ParseRomLogFile, false); configuration.setAttribute(PreferenceConstants.J_PN_RomLogFilePath, ""); //$NON-NLS-1$ configuration.setAttribute(PreferenceConstants.J_PN_SymbianKitEpoc32Dir, ""); //$NON-NLS-1$ - configuration.setAttribute(PreferenceConstants.J_PN_LogUnresolved, false); configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, SymbianDebugger.DEBUGGER_ID); diff -r 359f06b54dcc -r 9e45f0e58c6e 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 Thu Sep 09 13:57:02 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java Thu Sep 09 16:46:06 2010 -0500 @@ -41,9 +41,6 @@ private final String systemConsoleName = "Windows System Messages"; //$NON-NLS-1$ 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 symbianRomLogMessagesConsoleName = "Rom Log File Messages"; public static final String DebugTraceMessagesConsoleName = "Emulator Output"; //$NON-NLS-1$ public static final String DebugTraceLaunchSetting = "DebugTraceLaunchSetting"; //$NON-NLS-1$ @@ -136,18 +133,6 @@ openConsole(debugConsoleName, clearConsole); } - public void openUnframedDataConsole(boolean clearConsole) { - openConsole(unframedDataConsoleName, clearConsole); - } - - public void openTRKCommLogConsole(boolean clearConsole) { - openConsole(commMessagesConsoleName, clearConsole); - } - - public void openSymbianRomLogConsole(boolean clearConsole) { - openConsole(symbianRomLogMessagesConsoleName, clearConsole); - } - public void openDebugTraceConsole(boolean clearConsole) { openConsole(DebugTraceMessagesConsoleName, clearConsole); } diff -r 359f06b54dcc -r 9e45f0e58c6e debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/TRKCommLogConsoleFactory.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/TRKCommLogConsoleFactory.java Thu Sep 09 13:57:02 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 TRKCommLogConsoleFactory implements IConsoleFactory { - - public TRKCommLogConsoleFactory() { - } - - public void openConsole() { - SymbianPlugin.getDefault().openTRKCommLogConsole(true); - } -} diff -r 359f06b54dcc -r 9e45f0e58c6e debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/UnframedMessagesConsoleFactory.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/UnframedMessagesConsoleFactory.java Thu Sep 09 13:57:02 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 UnframedMessagesConsoleFactory implements IConsoleFactory { - - public UnframedMessagesConsoleFactory() { - } - - public void openConsole() { - SymbianPlugin.getDefault().openUnframedDataConsole(true); - } -} diff -r 359f06b54dcc -r 9e45f0e58c6e debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomLogFileTab.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomLogFileTab.java Thu Sep 09 13:57:02 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomLogFileTab.java Thu Sep 09 16:46:06 2010 -0500 @@ -56,8 +56,6 @@ private Text epoc32DirPath; private Button epoc32DirBrowse; - private Button logUnresolvedModules; - /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ @@ -186,21 +184,6 @@ } }); - createVerticalSpacer(parent, 1); - - logUnresolvedModules = createCheckButton(parseRomLogGroup.getGroup(), Messages.getString("RomLogFileTab.13")); //$NON-NLS-1$ - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - data.horizontalSpan = 2; - logUnresolvedModules.setLayoutData(data); - logUnresolvedModules.setToolTipText(Messages.getString("RomLogFileTab.14")); //$NON-NLS-1$ - logUnresolvedModules.setData(".uid", "RomLogFileTab.logUnresolvedModules"); //$NON-NLS-1$ //$NON-NLS-2$ - logUnresolvedModules.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - updateLaunchConfigurationDialog(); - } - }); - - //createVerticalSpacer(parent, 1); } /* (non-Javadoc) @@ -217,7 +200,6 @@ 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 )); checkControlState(); @@ -239,7 +221,6 @@ epoc32Dir = epoc32Dir.substring(0, epoc32Dir.length()-1); } configuration.setAttribute( PreferenceConstants.J_PN_SymbianKitEpoc32Dir, epoc32Dir); - configuration.setAttribute( PreferenceConstants.J_PN_LogUnresolved, logUnresolvedModules.getSelection()); } /* (non-Javadoc) diff -r 359f06b54dcc -r 9e45f0e58c6e debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeDebuggerTab.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeDebuggerTab.java Thu Sep 09 13:57:02 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeDebuggerTab.java Thu Sep 09 16:46:06 2010 -0500 @@ -32,12 +32,9 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -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.cdt.internal.debug.launch.LaunchPlugin; import cwdbg.PreferenceConstants; @@ -48,11 +45,6 @@ private Text mainBreakSymbol; private Button viewUnframed; private Button viewCommMessages; - private Label trkTimeoutLabel; - private Text trkTimeout; - private Button autoButton; - private Button armButton; - private Button thumbButton; /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) @@ -69,65 +61,11 @@ createVerticalSpacer(comp, 2); createBooleanGroup(comp, 2); - createVerticalSpacer(comp, 2); - createArmModeGroup(comp, 2); Dialog.applyDialogFont(parent); checkControlState(); } - - 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("RunModeDebuggerTab.0")); //$NON-NLS-1$ - group.setFont(parent.getFont()); - group.setToolTipText(Messages.getString("RunModeDebuggerTab.1")); //$NON-NLS-1$ - - autoButton = new Button(group, SWT.RADIO); - autoButton.setText(Messages.getString("RunModeDebuggerTab.17")); //$NON-NLS-1$ - gd = new GridData(); - gd.horizontalSpan = colSpan; - autoButton.setLayoutData(gd); - autoButton.setToolTipText(Messages.getString("RunModeDebuggerTab.1")); //$NON-NLS-1$ - autoButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - updateLaunchConfigurationDialog(); - } - }); - - armButton = new Button(group, SWT.RADIO); - armButton.setText(Messages.getString("RunModeDebuggerTab.2")); //$NON-NLS-1$ - gd = new GridData(); - gd.horizontalSpan = colSpan; - armButton.setLayoutData(gd); - armButton.setToolTipText(Messages.getString("RunModeDebuggerTab.1")); //$NON-NLS-1$ - armButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - updateLaunchConfigurationDialog(); - } - }); - - thumbButton = new Button(group, SWT.RADIO); - thumbButton.setText(Messages.getString("RunModeDebuggerTab.3")); //$NON-NLS-1$ - gd = new GridData(); - gd.horizontalSpan = colSpan; - thumbButton.setLayoutData(gd); - thumbButton.setToolTipText(Messages.getString("RunModeDebuggerTab.1")); //$NON-NLS-1$ - thumbButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - updateLaunchConfigurationDialog(); - } - }); - - } - - protected void createBooleanGroup(Composite parent, int colSpan) { breakAtMain = createCheckButton(parent, Messages.getString("RunModeDebuggerTab.4")); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); @@ -176,25 +114,6 @@ updateLaunchConfigurationDialog(); } }); - - trkTimeoutLabel = new Label(parent, SWT.NONE); - trkTimeoutLabel.setText(Messages.getString("RunModeDebuggerTab.10")); //$NON-NLS-1$ - data = new GridData(); - data.horizontalSpan = 1; - trkTimeoutLabel.setLayoutData(data); - trkTimeoutLabel.setToolTipText(Messages.getString("RunModeDebuggerTab.11")); //$NON-NLS-1$ - - trkTimeout = new Text(parent, SWT.BORDER); - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - data.horizontalSpan = 1; - trkTimeout.setLayoutData(data); - trkTimeout.setToolTipText(Messages.getString("RunModeDebuggerTab.11")); //$NON-NLS-1$ - trkTimeout.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - updateLaunchConfigurationDialog(); - } - }); - } /* (non-Javadoc) @@ -208,19 +127,11 @@ */ public void initializeFrom(ILaunchConfiguration configuration) { try { - 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); - viewUnframed.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_ViewUnframedData, true )); viewCommMessages.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_ViewCommMessages, false )); breakAtMain.setSelection(configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN , true )); mainBreakSymbol.setText(configuration.getAttribute( PreferenceConstants.J_PN_StopAtMainSymbol , "E32Main" )); //$NON-NLS-1$ - - int timeout = configuration.getAttribute( PreferenceConstants.J_PN_TRKMessageTimeout , SettingsData.J_PN_TrkTimeout_Default ); - trkTimeout.setText(Integer.toString(timeout)); checkControlState(); } catch (CoreException e) { @@ -233,19 +144,10 @@ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ public void performApply(ILaunchConfigurationWorkingCopy configuration) { - 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); - configuration.setAttribute( PreferenceConstants.J_PN_ViewUnframedData, viewUnframed.getSelection()); configuration.setAttribute( PreferenceConstants.J_PN_ViewCommMessages, viewCommMessages.getSelection()); configuration.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, breakAtMain.getSelection()); configuration.setAttribute( PreferenceConstants.J_PN_StopAtMainSymbol, mainBreakSymbol.getText()); - configuration.setAttribute( PreferenceConstants.J_PN_TRKMessageTimeout, Integer.parseInt(trkTimeout.getText())); - } /* (non-Javadoc) @@ -281,23 +183,6 @@ return false; } } - - String timeout = trkTimeout.getText().trim(); - if (timeout.length() < 1) { - setErrorMessage(Messages.getString("RunModeDebuggerTab.14")); //$NON-NLS-1$ - result = false; - } else { - try { - int delay = Integer.parseInt(timeout); - if (delay < 100 || delay > 10000) { - setErrorMessage(Messages.getString("RunModeDebuggerTab.15")); //$NON-NLS-1$ - result = false; - } - } catch (NumberFormatException e) { - setErrorMessage(Messages.getString("RunModeDebuggerTab.16")); //$NON-NLS-1$ - result = false; - } - } } return result; } diff -r 359f06b54dcc -r 9e45f0e58c6e debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties Thu Sep 09 13:57:02 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties Thu Sep 09 16:46:06 2010 -0500 @@ -119,18 +119,10 @@ RomLogFileTab.7=Symbian Rom Log files RomLogFileTab.8=All files RomLogFileTab.9=Symbian Epoc32 Directory\: -RunModeDebuggerTab.0=Default instruction set -RunModeDebuggerTab.1=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. RunModeDebuggerTab.10=Message retry delay (ms)\: RunModeDebuggerTab.11=This is the time the debugger will wait for a response from TRK before resending the message. Most users will not need to change this value. RunModeDebuggerTab.12=Debugger RunModeDebuggerTab.13=No break at entry symbol specified. -RunModeDebuggerTab.14=Message retry delay not specified. -RunModeDebuggerTab.15=Message retry delay should be between 100 and 10000 ms. -RunModeDebuggerTab.16=Invalid message retry delay specified. -RunModeDebuggerTab.17=Auto (examine code at current PC location) -RunModeDebuggerTab.2=ARM (32 bit) -RunModeDebuggerTab.3=Thumb (16 bit) RunModeDebuggerTab.4=Break at entry point\: RunModeDebuggerTab.5=When enabled the debugger will automatically set a breakpoint at the function specified. RunModeDebuggerTab.6=View program output