From 4459b9a31778745fd08b464495062117c92461fb Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Mon, 20 Jul 2015 20:37:20 -0400 Subject: [PATCH] Bug 460953 - SetCrossCommandWizardPage does not check for 'null' in result for dialog.open() Change-Id: I8bc947e5f72891138cd41fd781d5839d09381c51 --- .../internal/build/crossgcc/SetCrossCommandWizardPage.java | 5 +++-- .../managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java index 1448e5057dc..be36a18d15d 100644 --- a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java +++ b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java @@ -125,8 +125,9 @@ public class SetCrossCommandWizardPage extends MBSCustomPage { public void widgetSelected(SelectionEvent e) { DirectoryDialog dirDialog = new DirectoryDialog(composite.getShell(), SWT.APPLICATION_MODAL); String browsedDirectory = dirDialog.open(); - pathTxt.setText(browsedDirectory); - + if (browsedDirectory != null) { + pathTxt.setText(browsedDirectory); + } } }); layoutData = new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1); diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java index e1a41720c55..7e5fb789e26 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java @@ -60,8 +60,9 @@ public class XLCSettingsWizardPage extends MBSCustomPage { // open a browse dialog DirectoryDialog dirDialog = new DirectoryDialog(composite.getShell(), SWT.APPLICATION_MODAL); String browsedDirectory = dirDialog.open(); - fDirTextBox.setText(browsedDirectory); - + if (browsedDirectory != null) { + fDirTextBox.setText(browsedDirectory); + } } }