Revert "Bug 507400 - Search dialog should not be modal"
This reverts commit 472c98851d01b36a7c0d02726019bf98849fc522.
Change-Id: Ie66aa254e6b40a55fe86c4f31c3c8e06d2929c31
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
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 90aa71d..bc93e11 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 @@
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 c01c028..fcd9e97 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 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());
