# HG changeset patch # User john.dean.3@nokia.com # Date 1257533747 21600 # Node ID 369485fbe634f327aff072d4bdf8f61cbdc44100 # Parent f3a460c2cbae122d9e505ec3e69653247af40636 merged from RCL_2_4 diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Fri Nov 06 12:55:47 2009 -0600 @@ -48,6 +48,7 @@ import com.nokia.carbide.remoteconnections.interfaces.IService; import com.nokia.cdt.debug.cw.symbian.*; import com.nokia.cdt.internal.debug.launch.wizard.LaunchCreationWizard; +import com.nokia.cdt.internal.debug.launch.wizard.LaunchCreationWizardInstance; import com.nokia.cpp.internal.api.utils.core.Logging; /** @@ -293,11 +294,11 @@ // or both try { final LaunchCreationWizard wizard = - new LaunchCreationWizard(project, defaultConfigName, mmpPaths, exePaths, defaultExecutable, isX86, useEmulatorByDefault, mode); + LaunchCreationWizardInstance.getInstance().create(project, defaultConfigName, mmpPaths, exePaths, defaultExecutable, isX86, useEmulatorByDefault, mode); Display.getDefault().syncExec(new Runnable() { public void run() { wizard.init(PlatformUI.getWorkbench(), null); - LaunchCreationWizard.openWizard(CUIPlugin.getActiveWorkbenchShell(), wizard); + wizard.openWizard(CUIPlugin.getActiveWorkbenchShell()); } }); config = wizard.getLaunchConfiguration(); diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/BuildOptionsSelectionPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/BuildOptionsSelectionPage.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/BuildOptionsSelectionPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -72,18 +72,24 @@ optionsGroup.setLayoutData(gridData); optionsGroup.setLayout(gridLayout); optionsGroup.setText(Messages.getString("BuildOptionsSelectionPage.OptionsGroupLabel")); + optionsGroup.setData(".uid", "BuildOptionsSelectionPage.optionsGroup"); fDisableBuildButton = new Button(optionsGroup, SWT.RADIO); fDisableBuildButton.setText(Messages.getString("BuildOptionsSelectionPage.DisableButtonLabel")); //$NON-NLS-1$ fDisableBuildButton.setToolTipText(Messages.getString("BuildOptionsSelectionPage.DisableButtonToolTip")); //$NON-NLS-1$ + fDisableBuildButton.setData(".uid", "BuildOptionsSelectionPage.disableBuildButton"); + new Label(optionsGroup, SWT.NONE); fEnableBuildButton = new Button(optionsGroup, SWT.RADIO); fEnableBuildButton.setText(Messages.getString("BuildOptionsSelectionPage.EnableButtonLabel")); //$NON-NLS-1$ fEnableBuildButton.setToolTipText(Messages.getString("BuildOptionsSelectionPage.EnableButtonToolTip")); //$NON-NLS-1$ + fEnableBuildButton.setData(".uid", "BuildOptionsSelectionPage.enableBuildButon"); + new Label(optionsGroup, SWT.NONE); fWorkspaceSettingsButton = new Button(optionsGroup, SWT.RADIO); fWorkspaceSettingsButton.setText(Messages.getString("BuildOptionsSelectionPage.WorkspaceSettingsButtonLabel")); //$NON-NLS-1$ fWorkspaceSettingsButton.setToolTipText(Messages.getString("BuildOptionsSelectionPage.WorkspaceSettingsButtonToolTip")); //$NON-NLS-1$ + fWorkspaceSettingsButton.setData(".uid", "BuildOptionsSelectionPage.workspaceSettingsButton"); fWorkpsaceSettingsLink = new Link(optionsGroup, SWT.NONE); fWorkpsaceSettingsLink.setText(Messages.getString("BuildOptionsSelectionPage.WorkspaceSettingsLinkLabel")); //$NON-NLS-1$ @@ -96,6 +102,7 @@ null).open(); } }); + fWorkpsaceSettingsLink.setData(".uid", "BuildOptionsSelectionPage.workspaceSettingsLink"); setDefaults(); } diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/FormBrowser.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/FormBrowser.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/FormBrowser.java Fri Nov 06 12:55:47 2009 -0600 @@ -44,6 +44,7 @@ flayout.marginHeight = 1; container.setLayout(flayout); formText = new ScrolledFormText(container, SWT.V_SCROLL | SWT.H_SCROLL, false); + formText.setData(".uid", "FormBrowser.formText"); if (borderStyle == SWT.NULL) { formText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER); toolkit.paintBordersFor(container); diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/ILaunchCreationWizardFactory.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/ILaunchCreationWizardFactory.java Fri Nov 06 12:55:47 2009 -0600 @@ -0,0 +1,28 @@ +/* +* 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.IPath; + +public interface ILaunchCreationWizardFactory { + public LaunchCreationWizard create(IProject project, String configurationName, + List mmps, List exes, IPath defaultExecutable, + boolean isEmulation, boolean emulatorOnly, String mode) throws Exception; +} diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCategorySelectionPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCategorySelectionPage.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCategorySelectionPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -126,6 +126,7 @@ public void createDescriptionIn(Composite composite) { descriptionBrowser.createControl(composite); Control c = descriptionBrowser.getControl(); + c.setData(".uid", "LaunchCatagorySelection.descriptionBrowser"); GridData gd = new GridData(GridData.FILL_BOTH); gd.widthHint = 200; c.setLayoutData(gd); @@ -150,6 +151,7 @@ label.setText(Messages.getString("LaunchCategorySelectionPage.categoryLabel")); //$NON-NLS-1$ GridData gd = new GridData(); label.setLayoutData(gd); + label.setData(".uid", "LaunchCategorySelectionPage.label"); SashForm sashForm = new SashForm(container, SWT.VERTICAL); gd = new GridData(GridData.FILL_BOTH); @@ -181,6 +183,10 @@ PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), LaunchWizardHelpIds.CATEGORY_SELECTION_PAGE); } + public TableViewer getViewer() { + return categorySelectionTableViewer; + } + public void selectionChanged(SelectionChangedEvent event) { String description = null; IStructuredSelection selection = (IStructuredSelection) event.getSelection(); diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java Fri Nov 06 12:55:47 2009 -0600 @@ -134,8 +134,8 @@ return launchConfig; } - public static int openWizard(Shell shell, LaunchCreationWizard wizard) { - WizardDialog dialog = new WizardDialog(shell, wizard); + public int openWizard(Shell shell) { + WizardDialog dialog = new WizardDialog(shell, this); dialog.create(); return dialog.open(); } diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizardInstance.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizardInstance.java Fri Nov 06 12:55:47 2009 -0600 @@ -0,0 +1,84 @@ +/* +* 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.IPath; + +/** + * Created for purposes of dependency injection on the LaunchCreationWizard. + * This instance allows for other factories to be substituted at runtime, for + * purposes of injecting at runtime LaunchCreationWizard sub-classes created by + * the automated tests + * + */ +public class LaunchCreationWizardInstance { + + // The delegate factory + ILaunchCreationWizardFactory factory; + + static private LaunchCreationWizardInstance instance = null; + + /** + * Returns the singleton + * @return + */ + public static LaunchCreationWizardInstance getInstance() { + if (instance == null) { + instance = new LaunchCreationWizardInstance(); + } + return instance; + } + + private LaunchCreationWizardInstance() { + setDefault(); + } + + /** + * Returns the LaunchCreationWizard generated by the factory. + */ + public LaunchCreationWizard create(IProject project, String configurationName, + List mmps, List exes, IPath defaultExecutable, + boolean isEmulation, boolean emulatorOnly, String mode) throws Exception { + return factory.create(project, configurationName, mmps, exes, defaultExecutable, isEmulation, emulatorOnly, mode); + } + + /** + * Sets the factory to the default product implementation. Used by the default initializer and to clear a dependency previously set + */ + public void setDefault() { + set(new ILaunchCreationWizardFactory() { + + public LaunchCreationWizard create(IProject project, String configurationName, + List mmps, List exes, IPath defaultExecutable, + boolean isEmulation, boolean emulatorOnly, String mode) + throws Exception { + return new LaunchCreationWizard(project, configurationName, mmps, exes, defaultExecutable, isEmulation, emulatorOnly, mode); + + } + }); + } + + /** + * Intended to be used by tests to inject a custom factory + */ + public void set(ILaunchCreationWizardFactory factory) { + this.factory = factory; + } +} diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSelectionPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSelectionPage.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSelectionPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -62,6 +62,7 @@ public void createDescriptionIn(Composite composite) { descriptionBrowser.createControl(composite); Control c = descriptionBrowser.getControl(); + c.setData(".uid", "LaunchWizardSelection.descriptionBrowser"); GridData gd = new GridData(GridData.FILL_BOTH); gd.widthHint = 200; c.setLayoutData(gd); @@ -90,6 +91,7 @@ label.setText(getLabel()); GridData gd = new GridData(); label.setLayoutData(gd); + label.setData(".uid", "LaunchWizardSelectionPage.label"); SashForm sashForm = new SashForm(container, SWT.VERTICAL); gd = new GridData(GridData.FILL_BOTH); @@ -117,6 +119,10 @@ PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), LaunchWizardHelpIds.WIZARD_SELECTION_PAGE); } + public TableViewer getViewer() { + return wizardSelectionTableViewer; + } + public void selectionChanged(SelectionChangedEvent event) { selectedWizard = null; setErrorMessage(null); diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSummaryPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSummaryPage.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSummaryPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -73,9 +73,11 @@ youCanChangeText.setEditable(false); youCanChangeText.setText(Messages.getString("LaunchWizardSummaryPage.3")); //$NON-NLS-1$ youCanChangeText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true)); + youCanChangeText.setData(".uid", "LaunchWizardSummaryPage.youCanChangeText"); showSettingsButton = new Button(container, SWT.CHECK); showSettingsButton.setText(Messages.getString("LaunchWizardSummaryPage.4")); //$NON-NLS-1$ + showSettingsButton.setData(".uid", "LaunchWizardSummaryPage.showSettingsButton"); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), LaunchWizardHelpIds.WIZARD_SUMMARY_PAGE); } diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/MainExecutableSelectionWizardPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/MainExecutableSelectionWizardPage.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/MainExecutableSelectionWizardPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -145,6 +145,7 @@ exeLabel.setText(getAltString("MainExecutableSelectionWizardPage.ExeLabel")); //$NON-NLS-1$ exeLabel.setToolTipText(getAltString("MainExecutableSelectionWizardPage.ExeToolTip")); //$NON-NLS-1$ exeLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false)); + exeLabel.setData(".uid", "MainExecutableSelectionWizardPage.exeLabel"); viewer = new ComboViewer(composite, SWT.READ_ONLY); Combo combo = viewer.getCombo(); @@ -152,6 +153,7 @@ combo.setToolTipText(getAltString("MainExecutableSelectionWizardPage.ExeToolTip")); //$NON-NLS-1$ combo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); combo.setVisibleItemCount(20); + combo.setData(".uid", "MainExecutableSelectionWizardPage.combo"); viewer.setContentProvider(new ArrayContentProvider()); viewer.setLabelProvider(new LabelProvider()); @@ -189,6 +191,7 @@ label.setVisible(false); exePathLabel = new Text(composite, SWT.BORDER | SWT.WRAP | SWT.READ_ONLY); exePathLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); + exePathLabel.setData(".uid", "MainExecutableSelectionWizardPage.exePathLabel"); if (emulatorPath == null) { exePathLabel.setVisible(false); @@ -196,6 +199,7 @@ usePathCheck.setSelection(false); usePathCheck.setText(Messages.getString("MainExecutableSelectionWizardPage.UsePathLabel.device")); //$NON-NLS-1$ usePathCheck.setToolTipText(Messages.getString("MainExecutableSelectionWizardPage.UsePathLabel.device.ToolTip")); //$NON-NLS-1$ + usePathCheck.setData(".uid", "MainExecutableSelectionWizardPage.usePathCheck"); GridData gd = new GridData(SWT.FILL, SWT.CENTER, false, false); gd.verticalIndent = 30; @@ -218,6 +222,7 @@ validatePage(); } }); + pathText.setData(".uid", "MainExecutableSelectionWizardPage.pathText"); if (input.isEmpty()) { usePathCheck.setSelection(true); diff -r f3a460c2cbae -r 369485fbe634 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 Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaWizardPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -95,16 +95,17 @@ 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); @@ -118,6 +119,7 @@ } } }); + sophiaSTIDLLBrowse.setData(".uid", "SophiaWizardPage.sophiaSTIDLLBrowse"); targetInitFileLabel = new Label(composite, SWT.NONE); targetInitFileLabel.setText(Messages.getString("SophiaWizardPage.7")); //$NON-NLS-1$ @@ -125,16 +127,17 @@ 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); @@ -148,6 +151,7 @@ } } }); + targetInitFileBrowse.setData(".uid", "SophiaWizardPage.targetInitFileBrowse"); final Label processorsLabel = new Label(composite, SWT.NONE); processorsLabel.setText(Messages.getString("SophiaWizardPage.11")); //$NON-NLS-1$ @@ -155,6 +159,7 @@ 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$ @@ -163,6 +168,7 @@ 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); diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/StopModeRomImageWizardPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/StopModeRomImageWizardPage.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/StopModeRomImageWizardPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -111,6 +111,7 @@ checkControlState(); } }); + softAttachButton.setData(".uid", "StopModeRunImageWizard.softAttachButton"); debugFromStartButton = new Button(composite, SWT.RADIO); debugFromStartButton.setText(Messages.getString("StopModeRomImageWizardPage.17")); //$NON-NLS-1$ @@ -124,6 +125,7 @@ checkControlState(); } }); + debugFromStartButton.setData(".uid", "StopModeRunImageWizard.debugFromStartButton"); startAddressLabel = new Label(composite, SWT.NONE); startAddressLabel.setText(Messages.getString("StopModeRomImageWizardPage.3")); //$NON-NLS-1$ @@ -131,6 +133,7 @@ data.horizontalSpan = 3; startAddressLabel.setLayoutData(data); startAddressLabel.setToolTipText(Messages.getString("StopModeRomImageWizardPage.4")); //$NON-NLS-1$ + startAddressLabel.setData(".uid", "StopModeRunImageWizard.startAddressLabel"); startAddress = new Text(composite, SWT.BORDER); startAddress.setText("0x0"); //$NON-NLS-1$ @@ -138,6 +141,7 @@ data.horizontalSpan = 1; startAddress.setLayoutData(data); startAddress.setToolTipText(Messages.getString("StopModeRomImageWizardPage.4")); //$NON-NLS-1$ + startAddress.setData(".uid", "StopModeRunImageWizard.startAddress"); romImageLabel = new Label(composite, SWT.NONE); romImageLabel.setText(Messages.getString("StopModeRomImageWizardPage.11")); //$NON-NLS-1$ @@ -145,12 +149,14 @@ data.horizontalSpan = 3; romImageLabel.setLayoutData(data); romImageLabel.setToolTipText(Messages.getString("StopModeRomImageWizardPage.12")); //$NON-NLS-1$ + romImageLabel.setData(".uid", "StopModeRunImageWizard.romImageLabel"); romImagePath = new Text(composite, SWT.BORDER); data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; romImagePath.setLayoutData(data); romImagePath.setToolTipText(Messages.getString("StopModeRomImageWizardPage.12")); //$NON-NLS-1$ + romImagePath.setData(".uid", "StopModeRunImageWizard.romImagePath"); romImageBrowse = ControlFactory.createPushButton(composite, Messages.getString("StopModeRomImageWizardPage.7")); //$NON-NLS-1$ romImageBrowse.addSelectionListener(new SelectionAdapter() { @@ -167,6 +173,7 @@ } } }); + romImageBrowse.setData(".uid", "StopModeRunImageWizard.romImageBrowse"); romLogFileLabel = new Label(composite, SWT.NONE); romLogFileLabel.setText(Messages.getString("StopModeRomImageWizardPage.5")); //$NON-NLS-1$ @@ -174,16 +181,17 @@ data.horizontalSpan = 3; romLogFileLabel.setLayoutData(data); romLogFileLabel.setToolTipText(Messages.getString("StopModeRomImageWizardPage.6")); //$NON-NLS-1$ + romLogFileLabel.setData(".uid", "StopModeRunImageWizard.romLogFileLabel"); romLogFilePath = new Text(composite, SWT.BORDER); data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; romLogFilePath.setLayoutData(data); romLogFilePath.setToolTipText(Messages.getString("StopModeRomImageWizardPage.6")); //$NON-NLS-1$ + romLogFilePath.setData(".uid", "StopModeRunImageWizard.romLogFilePath"); romLogFileBrowse = ControlFactory.createPushButton(composite, Messages.getString("StopModeRomImageWizardPage.7")); //$NON-NLS-1$ romLogFileBrowse.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent evt) { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); @@ -197,7 +205,7 @@ } } }); - + romLogFileBrowse.setData(".uid", "StopModeRunImageWizard.romLogFileBrowse"); setControl(composite); Dialog.applyDialogFont(parent); diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKSISSelectionWizardPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKSISSelectionWizardPage.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKSISSelectionWizardPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -91,6 +91,7 @@ data.horizontalSpan = 1; sisLabel.setLayoutData(data); sisLabel.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$ + sisLabel.setData(".uid", "TRKSISSelectionWizard.sisLabel"); sisFile = new Combo(composite, SWT.READ_ONLY); data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); @@ -98,6 +99,7 @@ sisFile.setLayoutData(data); sisFile.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$ sisFile.add(Messages.getString("TRKSISSelectionWizardPage.5")); //$NON-NLS-1$ + sisFile.setData(".uid", "TRKSISSelectionWizard.sisFile"); ICarbideBuildConfiguration config = cpi.getDefaultConfiguration(); for (ISISBuilderInfo info : config.getSISBuilderInfoList()) { @@ -123,6 +125,7 @@ PreferencesUtil.createPropertyDialogOn(getShell(), project, "com.nokia.carbide.cdt.internal.builder.ui.CarbideBuildConfigurationsPage", null, null).open(); //$NON-NLS-1$ } }); + link.setData(".uid", "TRKSISSelectionWizard.link"); } else { // not a Carbide project, just an executable. show a browse/edit combo // to let them select a sis file if they want to. @@ -132,6 +135,7 @@ data.horizontalSpan = 2; sisLabel.setLayoutData(data); sisLabel.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$ + sisLabel.setData(".uid", "TRKSISSelectionWizard.sisLabel"); sisEdit = new Text(composite, SWT.BORDER); sisEdit.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); @@ -141,12 +145,12 @@ checkValid(); } }); + sisEdit.setData(".uid", "TRKSISSelectionWizard.sisEdit"); sisBrowse = new Button(composite, SWT.NONE); sisBrowse.setText(Messages.getString("TRKSISSelectionWizardPage.9")); //$NON-NLS-1$ sisBrowse.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); sisBrowse.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent evt) { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); @@ -161,6 +165,7 @@ } } }); + sisBrowse.setData(".uid", "TRKSISSelectionWizard.sisBrowse"); } setControl(composite); diff -r f3a460c2cbae -r 369485fbe634 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32WizardPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32WizardPage.java Tue Nov 03 08:22:17 2009 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32WizardPage.java Fri Nov 06 12:55:47 2009 -0600 @@ -89,16 +89,17 @@ data.horizontalSpan = 3; t32BootConfigLabel.setLayoutData(data); t32BootConfigLabel.setToolTipText(Messages.getString("Trace32WizardPage.3")); //$NON-NLS-1$ + t32BootConfigLabel.setData(".uid", "Trace32WizardPage.t32BootConfigLabel"); t32BootConfigFilePath = new Text(composite, SWT.BORDER); data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; t32BootConfigFilePath.setLayoutData(data); t32BootConfigFilePath.setToolTipText(Messages.getString("Trace32WizardPage.3")); //$NON-NLS-1$ + t32BootConfigFilePath.setData(".uid", "Trace32WizardPage.t32BootConfigFilePath"); t32BootConfigFileBrowse = ControlFactory.createPushButton(composite, Messages.getString("Trace32WizardPage.9")); //$NON-NLS-1$ t32BootConfigFileBrowse.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent evt) { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); @@ -112,7 +113,7 @@ } } }); - + t32BootConfigFileBrowse.setData(".uid", "Trace32WizardPage.t32BootConfigFileBrowse"); final Label processorsLabel = new Label(composite, SWT.NONE); processorsLabel.setText(Messages.getString("Trace32WizardPage.7")); //$NON-NLS-1$ @@ -120,6 +121,7 @@ data.horizontalSpan = 3; processorsLabel.setLayoutData(data); processorsLabel.setToolTipText(Messages.getString("Trace32WizardPage.8")); //$NON-NLS-1$ + processorsLabel.setData(".uid", "Trace32WizardPage.processorsLabel"); processorsList = new Combo(composite, SWT.READ_ONLY); processorsList.setItems(new String[] { "ARM920T", "ARM926TEJ", "ARM1136EJ-S", "OMAP3xx", "OMAP15xx", "OMAP16xx", "OMAP24xx", "OMAP34xx", "Generic" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ @@ -128,6 +130,7 @@ data.horizontalSpan = 3; processorsList.setLayoutData(data); processorsList.setToolTipText(Messages.getString("Trace32WizardPage.8")); //$NON-NLS-1$ + processorsList.setData(".uid", "Trace32WizardPage.processorsList"); setControl(composite); Dialog.applyDialogFont(parent);