Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2001-10-25 06:30:07 -0400
committerDani Megert2001-10-25 06:30:07 -0400
commitb80ac8ce3bcba7ca6aeb6c41da649a3c686569ee (patch)
treec36d1dc4c46369f5de74b43bed3199b6193dcec6
parente93a9676d8bf42c0320212597b7772d80ec1e1dc (diff)
downloadeclipse.platform.text-b80ac8ce3bcba7ca6aeb6c41da649a3c686569ee.tar.gz
eclipse.platform.text-b80ac8ce3bcba7ca6aeb6c41da649a3c686569ee.tar.xz
eclipse.platform.text-b80ac8ce3bcba7ca6aeb6c41da649a3c686569ee.zip
Fixed 5232: Java Search page not initialized correctly from Navigator
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java18
1 files changed, 9 insertions, 9 deletions
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 6748bbead..2764f0683 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
@@ -6,6 +6,8 @@ package org.eclipse.search.internal.ui;
import java.util.List;
+import org.eclipse.core.resources.IWorkspace;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
@@ -29,17 +31,18 @@ import org.eclipse.jface.util.Assert;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.core.resources.IWorkspace;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.search.internal.ui.util.ExtendedDialogWindow;
import org.eclipse.search.ui.ISearchPage;
import org.eclipse.search.ui.ISearchPageContainer;
import org.eclipse.search.ui.ISearchPageScoreComputer;
import org.eclipse.search.ui.IWorkingSet;
import org.eclipse.search.ui.SearchUI;
+import org.eclipse.search.internal.ui.util.ExtendedDialogWindow;
+
class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer {
private class TabFolderLayout extends Layout {
@@ -156,8 +159,9 @@ class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer
layout.marginWidth= 7;
layout.marginHeight= 7;
border.setLayout(layout);
-
- CTabFolder folder= new CTabFolder(border, SWT.NONE);
+
+ CTabFolder folder= new CTabFolder(border, SWT.BORDER | SWT.FLAT);
+// folder.setBackground(folder.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
folder.setLayoutData(new GridData(GridData.FILL_BOTH));
folder.setLayout(new TabFolderLayout());
@@ -191,12 +195,8 @@ class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer
folder.setSelection(pageIndex);
// Search scope
- Composite spacer= new Composite(border, SWT.NONE);
- GridLayout spacerLayout= new GridLayout();
- spacer.setLayout(spacerLayout);
- spacer.setLayoutData(new GridData(GridData.FILL_BOTH));
fScopePart= new ScopePart();
- fScopePart.createPart(spacer);
+ fScopePart.createPart(border);
return border;
}

Back to the top