diff options
| author | Lars Vogel | 2016-12-06 17:45:30 +0000 |
|---|---|---|
| committer | Lars Vogel | 2016-12-06 17:45:41 +0000 |
| commit | 91e194154d4d889d69484f9799b01077d1ebd22d (patch) | |
| tree | 9da22763f76dc04d6c272a1a4c9b4b9459a68647 | |
| parent | 355eaf9dfbaa1035a9dc8e17f2ceb92b5f620ff7 (diff) | |
| download | eclipse.platform.text-91e194154d4d889d69484f9799b01077d1ebd22d.tar.gz eclipse.platform.text-91e194154d4d889d69484f9799b01077d1ebd22d.tar.xz eclipse.platform.text-91e194154d4d889d69484f9799b01077d1ebd22d.zip | |
Revert "Bug 507400 - Search dialog should not be modal"Y20161215-1200Y20161208-1000S4_7_0_M4I20161219-0145I20161218-2000I20161217-2000I20161216-2000I20161215-2000I20161215-0915I20161215-0830I20161215-0730I20161215-0130I20161214-2000I20161214-1005I20161213-2000I20161213-0600I20161213-0300I20161212-2000I20161211-2000I20161210-2000I20161208-0830I20161208-0730I20161207-2000I20161207-1340I20161207-0800I20161207-0515I20161206-2000
This reverts commit 472c98851d01b36a7c0d02726019bf98849fc522.
Change-Id: Ie66aa254e6b40a55fe86c4f31c3c8e06d2929c31
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
| -rw-r--r-- | org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java | 14 | ||||
| -rw-r--r-- | org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java index 90aa71ded39..bc93e11ef68 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java @@ -10,9 +10,6 @@ *******************************************************************************/ package org.eclipse.search.internal.ui; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; - import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; @@ -56,17 +53,6 @@ public class OpenSearchDialogAction extends Action implements IWorkbenchWindowAc SearchPlugin.beep(); return; } - // search dialog already open? - Shell[] shells = Display.getCurrent().getShells(); - for (Shell shell : shells) { - Object data = shell.getData(); - if (data instanceof SearchDialog) { - shell.setActive(); - shell.setFocus(); - return; - } - } - SearchDialog dialog= new SearchDialog(getWorkbenchWindow(), fPageId); dialog.open(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java index c01c0283154..fcd9e975652 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java @@ -160,8 +160,6 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon public SearchDialog(IWorkbenchWindow window, String pageId) { super(window.getShell()); - setShellStyle(SWT.RESIZE | SWT.CLOSE | SWT.MODELESS | SWT.BORDER | SWT.TITLE); - setBlockOnOpen(false); fWorkbenchWindow= window; fCurrentSelection= window.getSelectionService().getSelection(); fCurrentEnclosingProject= evaluateEnclosingProject(fCurrentSelection, getActiveEditor()); |