diff options
author | Sarika Sinha | 2017-11-15 05:26:51 +0000 |
---|---|---|
committer | Sarika Sinha | 2017-12-20 11:29:53 +0000 |
commit | 615192c39abed12d5fd9699ce80be04b20972519 (patch) | |
tree | dff8063ff3014766f8084a479ed208758aea6ab6 | |
parent | 0d9859483e43e67c6489c56f117e09717eb7c124 (diff) | |
download | eclipse.platform.debug-615192c39abed12d5fd9699ce80be04b20972519.tar.gz eclipse.platform.debug-615192c39abed12d5fd9699ce80be04b20972519.tar.xz eclipse.platform.debug-615192c39abed12d5fd9699ce80be04b20972519.zip |
Bug 527185 - Platform Debug should use SWT.SHEET with File and DirectoryI20171220-2000
Dialog
Change-Id: Ia53d282ed416eb09856af7d3dce2475b8326e048
13 files changed, 28 insertions, 25 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java index 4cbc8648d..edd12b0d6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation and others. + * Copyright (c) 2003, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -213,7 +213,7 @@ public class MultipleInputDialog extends Dialog { button.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - DirectoryDialog dialog = new DirectoryDialog(getShell()); + DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SHEET); dialog.setMessage(DebugUIMessages.MultipleInputDialog_7); String currentWorkingDir = text.getText(); if (!currentWorkingDir.trim().equals(IInternalDebugCoreConstants.EMPTY_STRING)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java index 5a595d853..b3d426333 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2013 IBM Corporation and others. + * Copyright (c) 2006, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -149,7 +149,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener * Open the SaveAsDialog so the user can save the listing of selected breakpoints */ protected void handleDestinationBrowseButtonPressed() { - FileDialog dialog = new FileDialog(getContainer().getShell(), SWT.SAVE); + FileDialog dialog = new FileDialog(getContainer().getShell(), SWT.SAVE | SWT.SHEET); dialog.setFilterExtensions(new String[]{"*."+IImportExportConstants.EXTENSION}); //$NON-NLS-1$ dialog.setText(ImportExportMessages.WizardExportBreakpoints_0); String file = dialog.open(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java index 9b300470c..cb88bbbd1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2013 IBM Corporation and others. + * Copyright (c) 2005, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -91,7 +91,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener * This method handles the fBrowseForFileButton being pressed. */ protected void handleBrowseForFileButtonPressed() { - FileDialog dialog = new FileDialog(getContainer().getShell(), SWT.OPEN); + FileDialog dialog = new FileDialog(getContainer().getShell(), SWT.OPEN | SWT.SHEET); dialog.setFilterExtensions(new String[]{"*."+IImportExportConstants.EXTENSION}); //$NON-NLS-1$ String file = dialog.open(); if(file != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java index e3084a035..e55ada4c9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java @@ -266,7 +266,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { button.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - DirectoryDialog dd = new DirectoryDialog(getContainer().getShell()); + DirectoryDialog dd = new DirectoryDialog(getContainer().getShell(), SWT.SHEET); dd.setText(WizardMessages.ExportLaunchConfigurationsWizard_0); String file = dd.open(); if(file != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java index 61703d169..fd12f1a53 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java @@ -288,7 +288,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa browse.addSelectionListener(new SelectionAdapter () { @Override public void widgetSelected(SelectionEvent e) { - DirectoryDialog dd = new DirectoryDialog(getContainer().getShell()); + DirectoryDialog dd = new DirectoryDialog(getContainer().getShell(), SWT.SHEET); dd.setText(WizardMessages.ImportLaunchConfigurationsWizardPage_0); String filename = dd.open(); if(filename != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java index b66e7003d..497a073df 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 IBM Corporation and others. + * Copyright (c) 2003, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -218,7 +218,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { if (last == null) { last = IInternalDebugCoreConstants.EMPTY_STRING; } - DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SINGLE); + DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SINGLE | SWT.SHEET); dialog.setText(SourceLookupUIMessages.DirectorySourceContainerDialog_0); dialog.setMessage(SourceLookupUIMessages.DirectorySourceContainerDialog_1); dialog.setFilterPath(last); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java index 5d9082110..a098790e7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,7 +35,7 @@ public class ExternalArchiveSourceContainerBrowser extends AbstractSourceContain */ @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { - FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI); + FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI | SWT.SHEET); String rootDir = DebugUIPlugin.getDefault().getDialogSettings().get(ROOT_DIR); dialog.setText(SourceLookupUIMessages.ExternalArchiveSourceContainerBrowser_2); dialog.setFilterExtensions(new String[]{"*.jar;*.zip"}); //$NON-NLS-1$ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java index 32b98f767..2efb508df 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 Matt Conway and others. + * Copyright (c) 2000, 2017 Matt Conway and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.stringsubstitution; +import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.FileDialog; /** @@ -24,7 +25,7 @@ public class FilePrompt extends PromptingResolver { */ @Override public void prompt() { - FileDialog dialog = new FileDialog(getShell()); + FileDialog dialog = new FileDialog(getShell(), SWT.SHEET); dialog.setText(dialogMessage); dialog.setFileName(lastValue == null ? defaultValue : lastValue); dialogResultString = dialog.open(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java index e83a9f354..1c907d588 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 Matt Conway and others. + * Copyright (c) 2000, 2017 Matt Conway and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.stringsubstitution; +import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.DirectoryDialog; /** @@ -24,7 +25,7 @@ public class FolderPrompt extends PromptingResolver { */ @Override public void prompt() { - DirectoryDialog dialog = new DirectoryDialog(getShell()); + DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SHEET); dialog.setText(dialogMessage); dialog.setFilterPath(lastValue == null ? defaultValue : lastValue); dialogResultString = dialog.open(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java index 55800bac4..69cb0ac52 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java @@ -316,7 +316,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { @Override public void widgetSelected(SelectionEvent e) { String filePath = fFileText.getText(); - FileDialog dialog = new FileDialog(getShell(), SWT.SAVE); + FileDialog dialog = new FileDialog(getShell(), SWT.SAVE | SWT.SHEET); filePath = dialog.open(); if (filePath != null) { fFileText.setText(filePath); @@ -426,7 +426,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { @Override public void widgetSelected(SelectionEvent e) { String filePath = fInputFileLocationText.getText(); - FileDialog dialog = new FileDialog(getShell(), SWT.OK); + FileDialog dialog = new FileDialog(getShell(), SWT.OK | SWT.SHEET); filePath = dialog.open(); if (filePath != null) { fInputFileLocationText.setText(filePath); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/WorkingDirectoryBlock.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/WorkingDirectoryBlock.java index 973b5d310..bda0e2fb0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/WorkingDirectoryBlock.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/WorkingDirectoryBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -31,6 +31,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.internal.ui.DebugUIMessages; import org.eclipse.debug.internal.ui.SWTFactory; +import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; @@ -183,7 +184,7 @@ public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationT * Show a dialog that lets the user select a working directory */ private void handleWorkingDirBrowseButtonSelected() { - DirectoryDialog dialog = new DirectoryDialog(getShell()); + DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SHEET); dialog.setMessage(DebugUIMessages.WorkingDirectoryBlock_7); String currentWorkingDir = getWorkingDirectoryText(); if (!currentWorkingDir.trim().equals("")) { //$NON-NLS-1$ diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java index dc1563edc..197a199fd 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -264,7 +264,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { @Override public void widgetSelected(SelectionEvent e) { String filePath = fFileText.getText(); - FileDialog dialog = new FileDialog(getShell(), SWT.SAVE); + FileDialog dialog = new FileDialog(getShell(), SWT.SAVE | SWT.SHEET); filePath = dialog.open(); if (filePath != null) { diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java index a23aa54db..adf157dbf 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -529,7 +529,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa * sets the location as the full path of the selected file. */ protected void handleFileLocationButtonSelected() { - FileDialog fileDialog = new FileDialog(getShell(), SWT.NONE); + FileDialog fileDialog = new FileDialog(getShell(), SWT.NONE | SWT.SHEET); fileDialog.setFileName(locationField.getText()); String text= fileDialog.open(); if (text != null) { @@ -589,7 +589,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa * Prompts the user to choose a working directory from the filesystem. */ protected void handleFileWorkingDirectoryButtonSelected() { - DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SAVE); + DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SAVE | SWT.SHEET); dialog.setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_23); dialog.setFilterPath(workDirectoryField.getText()); String text= dialog.open(); |