Created access to all runtime LaunchCreationWizard, pages and widgets. Added getTableViewer() to the pages with a TableViewer. LaunchCreationWizard itself is now generated by a factory class whose factory is replacable at runtime allowing the ATF to inject it own LaunchCreationWizard and maintain a runtime instance for testing purposes. Resolves bug 10117.
--- a/debuggercdi/com.nokia.cdt.debug.launch/META-INF/MANIFEST.MF Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/META-INF/MANIFEST.MF Thu Nov 05 13:22:54 2009 -0600
@@ -13,6 +13,7 @@
org.eclipse.debug.ui,
org.eclipse.cdt.core,
org.eclipse.cdt.ui,
+ org.eclipse.help,
com.nokia.cdt.debug.cw.symbian,
com.freescale.cdt.debug.cw.core,
org.eclipse.core.expressions,
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Thu Nov 05 13:22:54 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.LaunchCreationWizardFactory;
import com.nokia.cpp.internal.api.utils.core.Logging;
/**
@@ -292,12 +293,12 @@
// which non-emulator launch type,
// or both
try {
- final LaunchCreationWizard wizard =
- new LaunchCreationWizard(project, defaultConfigName, mmpPaths, exePaths, defaultExecutable, isX86, useEmulatorByDefault, mode);
+ final LaunchCreationWizard wizard =
+ LaunchCreationWizardFactory.getInstance().get(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();
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AbstractLaunchWizard.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AbstractLaunchWizard.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,16 +16,16 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import com.nokia.carbide.cpp.ui.CarbideUIPlugin;
-import com.nokia.carbide.cpp.ui.ICarbideSharedImages;
-import com.nokia.cpp.internal.api.utils.core.Pair;
+import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.jface.wizard.Wizard;
-import java.util.List;
+import com.nokia.carbide.cpp.ui.CarbideUIPlugin;
+import com.nokia.carbide.cpp.ui.ICarbideSharedImages;
+import com.nokia.cpp.internal.api.utils.core.Pair;
public abstract class AbstractLaunchWizard extends Wizard implements ILaunchWizard {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,9 +16,7 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
-import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
+import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -26,7 +24,9 @@
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import java.util.List;
+import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
+import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
public class AppTRKLaunchWizard extends AbstractLaunchWizard {
private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,14 +16,14 @@
*/
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 java.util.List;
-
import com.nokia.cdt.debug.cw.symbian.SettingsData;
public class AttachTRKLaunchWizard extends AbstractLaunchWizard {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/BuildOptionsSelectionPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/BuildOptionsSelectionPage.java Thu Nov 05 13:22:54 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,7 +102,8 @@
null).open();
}
});
-
+ fWorkpsaceSettingsLink.setData(".uid", "BuildOptionsSelectionPage.workspaceSettingsLink");
+
setDefaults();
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/FormBrowser.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/FormBrowser.java Thu Nov 05 13:22:54 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);
--- /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 Thu Nov 05 13:22:54 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 get(IProject project, String configurationName,
+ List<IPath> mmps, List<IPath> exes, IPath defaultExecutable,
+ boolean isEmulation, boolean emulatorOnly, String mode) throws Exception;
+}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCategorySelectionPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCategorySelectionPage.java Thu Nov 05 13:22:54 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();
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,11 +16,8 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import com.nokia.carbide.cpp.ui.CarbideUIPlugin;
-import com.nokia.carbide.cpp.ui.ICarbideSharedImages;
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-import com.nokia.cpp.internal.api.utils.core.*;
+import java.util.ArrayList;
+import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -39,8 +36,13 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
-import java.util.ArrayList;
-import java.util.List;
+import com.nokia.carbide.cpp.ui.CarbideUIPlugin;
+import com.nokia.carbide.cpp.ui.ICarbideSharedImages;
+import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
+import com.nokia.cpp.internal.api.utils.core.Check;
+import com.nokia.cpp.internal.api.utils.core.Logging;
+import com.nokia.cpp.internal.api.utils.core.Pair;
public class LaunchCreationWizard extends Wizard {
@@ -134,8 +136,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();
}
--- /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/LaunchCreationWizardFactory.java Thu Nov 05 13:22:54 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 factory allows for other factories to be substituted at runtime, for
+ * purposes of injecting at runtime LaunchCreationWizard sub-classes created by
+ * the ATF
+ *
+ */
+public class LaunchCreationWizardFactory {
+
+ // This is an abstract factory which maintains here the actual factory
+ ILaunchCreationWizardFactory factory;
+
+ private LaunchCreationWizardFactory() {
+ setDefault();
+ }
+
+ /**
+ * Returns the LaunchCreationWizard generated by the factory.
+ */
+ public LaunchCreationWizard get(IProject project, String configurationName,
+ List<IPath> mmps, List<IPath> exes, IPath defaultExecutable,
+ boolean isEmulation, boolean emulatorOnly, String mode) throws Exception {
+ return factory.get(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 get(IProject project, String configurationName,
+ List<IPath> mmps, List<IPath> 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;
+ }
+
+ static private LaunchCreationWizardFactory abstractFactory = null;
+
+ /**
+ * Returns the singleton
+ * @return
+ */
+ public static LaunchCreationWizardFactory getInstance() {
+ if (abstractFactory == null) {
+ abstractFactory = new LaunchCreationWizardFactory();
+ }
+ return abstractFactory;
+ }
+}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSelectionPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSelectionPage.java Thu Nov 05 13:22:54 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);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSummaryPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardSummaryPage.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,17 +16,19 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
+import java.text.MessageFormat;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import java.text.MessageFormat;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
public class LaunchWizardSummaryPage extends WizardPage implements ISummaryTextItemContainer {
private Text summaryText;
@@ -68,14 +70,17 @@
summaryText = new Text(container, SWT.MULTI | SWT.READ_ONLY | SWT.WRAP);
summaryText.setEditable(false);
summaryText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+ summaryText.setData(".uid", "LaunchWizardSummaryPage.summaryText");
youCanChangeText = new Text(container, SWT.MULTI | SWT.READ_ONLY | SWT.WRAP);
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);
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/MainExecutableSelectionWizardPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/MainExecutableSelectionWizardPage.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,23 +16,44 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import com.nokia.cpp.internal.api.utils.core.*;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+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 java.text.MessageFormat;
-import java.util.*;
-import java.util.List;
+import com.nokia.cpp.internal.api.utils.core.Check;
+import com.nokia.cpp.internal.api.utils.core.Pair;
public class MainExecutableSelectionWizardPage extends WizardPage {
@@ -145,6 +166,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 +174,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 +212,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 +220,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 +243,7 @@
validatePage();
}
});
+ pathText.setData(".uid", "MainExecutableSelectionWizardPage.pathText");
if (input.isEmpty()) {
usePathCheck.setSelection(true);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaLaunchWizard.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaLaunchWizard.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,14 +16,14 @@
*/
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 java.util.List;
-
import com.nokia.cdt.debug.cw.symbian.SettingsData;
public class SophiaLaunchWizard extends AbstractLaunchWizard {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaWizardPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaWizardPage.java Thu Nov 05 13:22:54 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,7 +159,8 @@
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
@@ -163,7 +168,8 @@
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);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/StopModeRomImageWizardPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/StopModeRomImageWizardPage.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,9 +16,8 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import com.nokia.cpp.internal.api.utils.core.Check;
-
-import cwdbg.PreferenceConstants;
+import java.io.File;
+import java.text.MessageFormat;
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.core.runtime.CoreException;
@@ -30,11 +29,16 @@
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+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 java.io.File;
-import java.text.MessageFormat;
+import com.nokia.cpp.internal.api.utils.core.Check;
+
+import cwdbg.PreferenceConstants;
public class StopModeRomImageWizardPage extends WizardPage {
@@ -111,6 +115,7 @@
checkControlState();
}
});
+ softAttachButton.setData(".uid", "StopModeRunImageWizard.softAttachButton");
debugFromStartButton = new Button(composite, SWT.RADIO);
debugFromStartButton.setText(Messages.getString("StopModeRomImageWizardPage.17")); //$NON-NLS-1$
@@ -124,6 +129,7 @@
checkControlState();
}
});
+ debugFromStartButton.setData(".uid", "StopModeRunImageWizard.debugFromStartButton");
startAddressLabel = new Label(composite, SWT.NONE);
startAddressLabel.setText(Messages.getString("StopModeRomImageWizardPage.3")); //$NON-NLS-1$
@@ -131,27 +137,31 @@
data.horizontalSpan = 3;
startAddressLabel.setLayoutData(data);
startAddressLabel.setToolTipText(Messages.getString("StopModeRomImageWizardPage.4")); //$NON-NLS-1$
-
+ startAddressLabel.setData(".uid", "StopModeRunImageWizard.startAddressLabel");
+
startAddress = new Text(composite, SWT.BORDER);
startAddress.setText("0x0"); //$NON-NLS-1$
data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 1;
startAddress.setLayoutData(data);
startAddress.setToolTipText(Messages.getString("StopModeRomImageWizardPage.4")); //$NON-NLS-1$
-
+ startAddress.setData(".uid", "StopModeRunImageWizard.startAddress");
+
romImageLabel = new Label(composite, SWT.NONE);
romImageLabel.setText(Messages.getString("StopModeRomImageWizardPage.11")); //$NON-NLS-1$
data = new GridData();
data.horizontalSpan = 3;
romImageLabel.setLayoutData(data);
romImageLabel.setToolTipText(Messages.getString("StopModeRomImageWizardPage.12")); //$NON-NLS-1$
-
+ romImageLabel.setData(".uid", "StopModeRunImageWizard.romImageLabel");
+
romImagePath = new Text(composite, SWT.BORDER);
data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 2;
romImagePath.setLayoutData(data);
romImagePath.setToolTipText(Messages.getString("StopModeRomImageWizardPage.12")); //$NON-NLS-1$
-
+ romImagePath.setData(".uid", "StopModeRunImageWizard.romImagePath");
+
romImageBrowse = ControlFactory.createPushButton(composite, Messages.getString("StopModeRomImageWizardPage.7")); //$NON-NLS-1$
romImageBrowse.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
@@ -167,6 +177,7 @@
}
}
});
+ romImageBrowse.setData(".uid", "StopModeRunImageWizard.romImageBrowse");
romLogFileLabel = new Label(composite, SWT.NONE);
romLogFileLabel.setText(Messages.getString("StopModeRomImageWizardPage.5")); //$NON-NLS-1$
@@ -174,16 +185,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 +209,7 @@
}
}
});
-
+ romLogFileBrowse.setData(".uid", "StopModeRunImageWizard.romLogFileBrowse");
setControl(composite);
Dialog.applyDialogFont(parent);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,9 +16,7 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
-import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
+import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -26,7 +24,9 @@
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import java.util.List;
+import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
+import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
public class SystemTRKLaunchWizard extends AbstractLaunchWizard {
private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKConnectionWizardPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKConnectionWizardPage.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,13 +16,7 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import com.freescale.cdt.debug.cw.core.RemoteConnectionsTRKHelper;
-import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
-import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI;
-import com.nokia.carbide.remoteconnections.interfaces.IConnection;
-import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI.IListener;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-import com.nokia.cpp.internal.api.utils.core.Check;
+import java.text.MessageFormat;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jface.dialogs.Dialog;
@@ -32,7 +26,13 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.PlatformUI;
-import java.text.MessageFormat;
+import com.freescale.cdt.debug.cw.core.RemoteConnectionsTRKHelper;
+import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
+import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI;
+import com.nokia.carbide.remoteconnections.interfaces.IConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI.IListener;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
+import com.nokia.cpp.internal.api.utils.core.Check;
public class TRKConnectionWizardPage extends WizardPage {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKSISSelectionWizardPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKSISSelectionWizardPage.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,11 +16,8 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
-import com.nokia.carbide.cdt.builder.project.*;
-import com.nokia.cpp.internal.api.utils.core.Check;
-
-import cwdbg.PreferenceConstants;
+import java.io.File;
+import java.text.MessageFormat;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent;
@@ -31,15 +28,29 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+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.Link;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.PreferencesUtil;
-import java.io.File;
-import java.text.MessageFormat;
+import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
+import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
+import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
+import com.nokia.carbide.cdt.builder.project.ISISBuilderInfo;
+import com.nokia.cpp.internal.api.utils.core.Check;
+
+import cwdbg.PreferenceConstants;
public class TRKSISSelectionWizardPage extends WizardPage implements ICProjectDescriptionListener {
@@ -91,13 +102,15 @@
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);
data.horizontalSpan = 1;
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 +136,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,7 +146,8 @@
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));
sisEdit.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$
@@ -141,12 +156,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 +176,7 @@
}
}
});
+ sisBrowse.setData(".uid", "TRKSISSelectionWizard.sisBrowse");
}
setControl(composite);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32LaunchWizard.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32LaunchWizard.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,14 +16,14 @@
*/
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 java.util.List;
-
import com.nokia.cdt.debug.cw.symbian.SettingsData;
public class Trace32LaunchWizard extends AbstractLaunchWizard {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32WizardPage.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/Trace32WizardPage.java Thu Nov 05 13:22:54 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,7 +121,8 @@
data.horizontalSpan = 3;
processorsLabel.setLayoutData(data);
processorsLabel.setToolTipText(Messages.getString("Trace32WizardPage.8")); //$NON-NLS-1$
-
+ processorsLabel.setData(".uid", "Trace32WizardPage.processorsLabel");
+
processorsList = new Combo(composite, SWT.READ_ONLY);
processorsList.setItems(new String[] { "ARM920T", "ARM926TEJ", "ARM1136EJ-S", "OMAP3xx", "OMAP15xx", "OMAP16xx", "OMAP24xx", "OMAP34xx", "Generic" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
processorsList.select(8); //by default, select the generic
@@ -128,7 +130,8 @@
data.horizontalSpan = 3;
processorsList.setLayoutData(data);
processorsList.setToolTipText(Messages.getString("Trace32WizardPage.8")); //$NON-NLS-1$
-
+ processorsList.setData(".uid", "Trace32WizardPage.processorsList");
+
setControl(composite);
Dialog.applyDialogFont(parent);
setPageComplete(true);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/WizardNode.java Wed Nov 04 15:06:41 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/WizardNode.java Thu Nov 05 13:22:54 2009 -0600
@@ -16,7 +16,9 @@
*/
package com.nokia.cdt.internal.debug.launch.wizard;
-import org.eclipse.jface.wizard.*;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.IWizardNode;
+import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.graphics.Point;