From 12530617a7911d243fe83c70deacadb7b0e054ae Mon Sep 17 00:00:00 2001 From: Maximilian Wittmer Date: Mon, 1 Jul 2024 12:40:23 +0200 Subject: [PATCH 1/2] Find/Replace overlay: move components into internal package moves helper classes for the find/replace overlay into an internal package. --- .../META-INF/MANIFEST.MF | 1 + .../findandreplace/overlay}/AccessibleToolBar.java | 2 +- .../overlay}/AccessibleToolItemBuilder.java | 2 +- .../findandreplace/overlay}/FindReplaceOverlay.java | 13 ++++++++----- .../overlay}/FindReplaceOverlayFirstTimePopup.java | 4 ++-- .../overlay}/FindReplaceOverlayImages.java | 2 +- .../eclipse/ui/texteditor/FindReplaceAction.java | 2 ++ .../texteditor/tests/FindReplaceOverlayTest.java | 2 +- 8 files changed, 17 insertions(+), 11 deletions(-) rename bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/{texteditor => internal/findandreplace/overlay}/AccessibleToolBar.java (97%) rename bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/{texteditor => internal/findandreplace/overlay}/AccessibleToolItemBuilder.java (97%) rename bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/{texteditor => internal/findandreplace/overlay}/FindReplaceOverlay.java (98%) rename bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/{texteditor => internal/findandreplace/overlay}/FindReplaceOverlayFirstTimePopup.java (97%) rename bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/{texteditor => internal/findandreplace/overlay}/FindReplaceOverlayImages.java (99%) diff --git a/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF index 557cfe4b1a4..072afcac57e 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Export-Package: org.eclipse.ui.contentassist, org.eclipse.ui.internal.findandreplace;x-friends:="org.eclipse.ui.workbench.texteditor.tests", org.eclipse.ui.internal.findandreplace.status;x-friends:="org.eclipse.ui.workbench.texteditor.tests", + org.eclipse.ui.internal.findandreplace.overlay;x-friends:="org.eclipse.ui.workbench.texteditor.tests", org.eclipse.ui.internal.texteditor;texteditor=split;mandatory:=texteditor;x-friends:="org.eclipse.ui.editors", org.eclipse.ui.internal.texteditor.codemining;x-internal:=true, org.eclipse.ui.internal.texteditor.quickdiff;x-internal:=true, diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AccessibleToolBar.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolBar.java similarity index 97% rename from bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AccessibleToolBar.java rename to bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolBar.java index 959aa66f984..5a621c77dbd 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AccessibleToolBar.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolBar.java @@ -11,7 +11,7 @@ * Contributors: * Vector Informatik GmbH - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.texteditor; +package org.eclipse.ui.internal.findandreplace.overlay; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AccessibleToolItemBuilder.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItemBuilder.java similarity index 97% rename from bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AccessibleToolItemBuilder.java rename to bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItemBuilder.java index 45e3c40ef72..b0ea0dbc425 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AccessibleToolItemBuilder.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItemBuilder.java @@ -11,7 +11,7 @@ * Contributors: * Vector Informatik GmbH - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.texteditor; +package org.eclipse.ui.internal.findandreplace.overlay; import java.util.Objects; diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlay.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java similarity index 98% rename from bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlay.java rename to bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java index 42975f9a5eb..55f17c7ad9d 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlay.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java @@ -11,7 +11,7 @@ * Contributors: * Vector Informatik GmbH - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.texteditor; +package org.eclipse.ui.internal.findandreplace.overlay; import org.osgi.framework.FrameworkUtil; @@ -54,6 +54,7 @@ import org.eclipse.jface.text.IFindReplaceTarget; import org.eclipse.jface.text.IFindReplaceTargetExtension; +import org.eclipse.jface.text.ITextViewer; import org.eclipse.ui.IPartListener; import org.eclipse.ui.IWorkbenchPage; @@ -64,10 +65,12 @@ import org.eclipse.ui.internal.findandreplace.SearchOptions; import org.eclipse.ui.internal.findandreplace.status.IFindReplaceStatus; +import org.eclipse.ui.texteditor.StatusTextEditor; + /** * @since 3.17 */ -class FindReplaceOverlay extends Dialog { +public class FindReplaceOverlay extends Dialog { private static final String REPLACE_BAR_OPEN_DIALOG_SETTING = "replaceBarOpen"; //$NON-NLS-1$ private static final double WORST_CASE_RATIO_EDITOR_TO_OVERLAY = 0.95; @@ -371,7 +374,7 @@ private void applyOverlayColors(Color color, boolean tryToColorReplaceBar) { private void unbindListeners() { getShell().removeShellListener(overlayDeactivationListener); if (targetPart != null && targetPart instanceof StatusTextEditor textEditor) { - Control targetWidget = textEditor.getSourceViewer().getTextWidget(); + Control targetWidget = textEditor.getAdapter(ITextViewer.class).getTextWidget(); if (targetWidget != null) { targetWidget.getShell().removeControlListener(shellMovementListener); targetWidget.removePaintListener(widgetMovementListener); @@ -383,7 +386,7 @@ private void unbindListeners() { private void bindListeners() { getShell().addShellListener(overlayDeactivationListener); if (targetPart instanceof StatusTextEditor textEditor) { - Control targetWidget = textEditor.getSourceViewer().getTextWidget(); + Control targetWidget = textEditor.getAdapter(ITextViewer.class).getTextWidget(); targetWidget.getShell().addControlListener(shellMovementListener); targetWidget.addPaintListener(widgetMovementListener); @@ -779,7 +782,7 @@ private void positionToPart() { } StatusTextEditor textEditor = (StatusTextEditor) targetPart; - Control targetWidget = textEditor.getSourceViewer().getTextWidget(); + Control targetWidget = textEditor.getAdapter(ITextViewer.class).getTextWidget(); if (!okayToUse(targetWidget)) { this.close(); return; diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlayFirstTimePopup.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayFirstTimePopup.java similarity index 97% rename from bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlayFirstTimePopup.java rename to bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayFirstTimePopup.java index e274a7db02f..5b8a924b9a9 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlayFirstTimePopup.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayFirstTimePopup.java @@ -11,7 +11,7 @@ * Contributors: * Vector Informatik GmbH - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.texteditor; +package org.eclipse.ui.internal.findandreplace.overlay; import java.time.Duration; import java.util.Objects; @@ -42,7 +42,7 @@ * whether the popup was already shown and will only show the Overlay on the * first time the popup was shown. */ -class FindReplaceOverlayFirstTimePopup { +public class FindReplaceOverlayFirstTimePopup { private FindReplaceOverlayFirstTimePopup() { } diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlayImages.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayImages.java similarity index 99% rename from bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlayImages.java rename to bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayImages.java index 15d034b037a..e6b700d629c 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceOverlayImages.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayImages.java @@ -11,7 +11,7 @@ * Contributors: * Vector Informatik GmbH - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.texteditor; +package org.eclipse.ui.internal.findandreplace.overlay; import java.net.URL; diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceAction.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceAction.java index 71751e69827..7de6e3c2106 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceAction.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceAction.java @@ -37,6 +37,8 @@ import org.eclipse.ui.IWorkbenchPartReference; import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.internal.findandreplace.overlay.FindReplaceOverlay; +import org.eclipse.ui.internal.findandreplace.overlay.FindReplaceOverlayFirstTimePopup; /** diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceOverlayTest.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceOverlayTest.java index d59aee0fee4..86753f98697 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceOverlayTest.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceOverlayTest.java @@ -42,7 +42,7 @@ public OverlayAccess openUIFromTextViewer(TextViewer viewer) { new Object[] { ResourceBundle.getBundle("org.eclipse.ui.texteditor.ConstructedEditorMessages"), "Editor.FindReplace.", viewer.getControl().getShell(), getTextViewer().getFindReplaceTarget() }); fFindReplaceAction.invoke("showOverlayInEditor", null); - Accessor overlayAccessor= new Accessor(fFindReplaceAction.get("overlay"), "org.eclipse.ui.texteditor.FindReplaceOverlay", getClass().getClassLoader()); + Accessor overlayAccessor= new Accessor(fFindReplaceAction.get("overlay"), "org.eclipse.ui.internal.findandreplace.overlay.FindReplaceOverlay", getClass().getClassLoader()); ret= new OverlayAccess(overlayAccessor); return ret; From 4276de485bc7c1c5e1f428def5643cb544fa0ba6 Mon Sep 17 00:00:00 2001 From: Heiko Klare Date: Mon, 1 Jul 2024 17:46:12 +0200 Subject: [PATCH 2/2] Find/Replace: align test class packages with production class packages This moves the test classes for the find/replace functionality, in particular the ones for the find/replace overlay, to the packages according to those of the production classes. --- .../findandreplace}/FindReplaceTestUtil.java | 2 +- .../findandreplace}/FindReplaceUITest.java | 7 ++++--- .../findandreplace}/IFindReplaceUIAccess.java | 7 ++----- .../findandreplace/overlay}/FindReplaceOverlayTest.java | 3 ++- .../findandreplace/overlay}/OverlayAccess.java | 4 +++- .../ui/workbench/texteditor/tests/DialogAccess.java | 3 ++- .../workbench/texteditor/tests/FindReplaceDialogTest.java | 3 ++- .../texteditor/tests/WorkbenchTextEditorTestSuite.java | 1 + 8 files changed, 17 insertions(+), 13 deletions(-) rename tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/{workbench/texteditor/tests => internal/findandreplace}/FindReplaceTestUtil.java (95%) rename tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/{workbench/texteditor/tests => internal/findandreplace}/FindReplaceUITest.java (97%) rename tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/{workbench/texteditor/tests => internal/findandreplace}/IFindReplaceUIAccess.java (87%) rename tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/{workbench/texteditor/tests => internal/findandreplace/overlay}/FindReplaceOverlayTest.java (97%) rename tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/{workbench/texteditor/tests => internal/findandreplace/overlay}/OverlayAccess.java (97%) diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceTestUtil.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceTestUtil.java similarity index 95% rename from tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceTestUtil.java rename to tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceTestUtil.java index a6bfce2d973..77c515c1c0f 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceTestUtil.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceTestUtil.java @@ -11,7 +11,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.workbench.texteditor.tests; +package org.eclipse.ui.internal.findandreplace; import org.eclipse.swt.widgets.Display; diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceUITest.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceUITest.java similarity index 97% rename from tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceUITest.java rename to tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceUITest.java index 65995c7898f..7732051f6d6 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceUITest.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceUITest.java @@ -11,9 +11,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.workbench.texteditor.tests; +package org.eclipse.ui.internal.findandreplace; -import static org.eclipse.ui.workbench.texteditor.tests.FindReplaceTestUtil.runEventQueue; +import static org.eclipse.ui.internal.findandreplace.FindReplaceTestUtil.runEventQueue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; @@ -34,7 +34,8 @@ import org.eclipse.jface.text.TextViewer; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.internal.findandreplace.SearchOptions; + +import org.eclipse.ui.workbench.texteditor.tests.ScreenshotTest; public abstract class FindReplaceUITest { @Rule diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/IFindReplaceUIAccess.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/IFindReplaceUIAccess.java similarity index 87% rename from tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/IFindReplaceUIAccess.java rename to tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/IFindReplaceUIAccess.java index 20fdb2a3866..fc31f0eb647 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/IFindReplaceUIAccess.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/IFindReplaceUIAccess.java @@ -8,20 +8,17 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.ui.workbench.texteditor.tests; +package org.eclipse.ui.internal.findandreplace; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Widget; import org.eclipse.jface.text.IFindReplaceTarget; -import org.eclipse.ui.internal.findandreplace.IFindReplaceLogic; -import org.eclipse.ui.internal.findandreplace.SearchOptions; - /** * Wraps UI access for different find/replace UIs */ -interface IFindReplaceUIAccess { +public interface IFindReplaceUIAccess { IFindReplaceTarget getTarget(); diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceOverlayTest.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayTest.java similarity index 97% rename from tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceOverlayTest.java rename to tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayTest.java index 86753f98697..3eadef64ef3 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceOverlayTest.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayTest.java @@ -11,7 +11,7 @@ * Contributors: * Vector Informatik GmbH - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.workbench.texteditor.tests; +package org.eclipse.ui.internal.findandreplace.overlay; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -28,6 +28,7 @@ import org.eclipse.jface.text.IFindReplaceTarget; import org.eclipse.jface.text.TextViewer; +import org.eclipse.ui.internal.findandreplace.FindReplaceUITest; import org.eclipse.ui.internal.findandreplace.SearchOptions; public class FindReplaceOverlayTest extends FindReplaceUITest { diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/OverlayAccess.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java similarity index 97% rename from tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/OverlayAccess.java rename to tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java index 575d4e67c87..64b764933eb 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/OverlayAccess.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java @@ -11,7 +11,7 @@ * Contributors: * Vector Informatik GmbH - initial API and implementation *******************************************************************************/ -package org.eclipse.ui.workbench.texteditor.tests; +package org.eclipse.ui.internal.findandreplace.overlay; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -36,7 +36,9 @@ import org.eclipse.jface.text.IFindReplaceTargetExtension; import org.eclipse.ui.internal.findandreplace.FindReplaceLogic; +import org.eclipse.ui.internal.findandreplace.FindReplaceTestUtil; import org.eclipse.ui.internal.findandreplace.IFindReplaceLogic; +import org.eclipse.ui.internal.findandreplace.IFindReplaceUIAccess; import org.eclipse.ui.internal.findandreplace.SearchOptions; class OverlayAccess implements IFindReplaceUIAccess { diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java index a875130ecbf..f59e09129cd 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.ui.workbench.texteditor.tests; -import static org.eclipse.ui.workbench.texteditor.tests.FindReplaceTestUtil.runEventQueue; +import static org.eclipse.ui.internal.findandreplace.FindReplaceTestUtil.runEventQueue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.not; @@ -35,6 +35,7 @@ import org.eclipse.ui.internal.findandreplace.FindReplaceLogic; import org.eclipse.ui.internal.findandreplace.IFindReplaceLogic; +import org.eclipse.ui.internal.findandreplace.IFindReplaceUIAccess; import org.eclipse.ui.internal.findandreplace.SearchOptions; class DialogAccess implements IFindReplaceUIAccess { diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java index 93614c7f5d6..03c9d04166b 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.ui.workbench.texteditor.tests; -import static org.eclipse.ui.workbench.texteditor.tests.FindReplaceTestUtil.runEventQueue; +import static org.eclipse.ui.internal.findandreplace.FindReplaceTestUtil.runEventQueue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; @@ -36,6 +36,7 @@ import org.eclipse.jface.text.IFindReplaceTarget; import org.eclipse.jface.text.TextViewer; +import org.eclipse.ui.internal.findandreplace.FindReplaceUITest; import org.eclipse.ui.internal.findandreplace.SearchOptions; public class FindReplaceDialogTest extends FindReplaceUITest { diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java index df7a9d9a56e..7985b36399d 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java @@ -18,6 +18,7 @@ import org.junit.runners.Suite.SuiteClasses; import org.eclipse.ui.internal.findandreplace.FindReplaceLogicTest; +import org.eclipse.ui.internal.findandreplace.overlay.FindReplaceOverlayTest; import org.eclipse.ui.workbench.texteditor.tests.minimap.MinimapPageTest; import org.eclipse.ui.workbench.texteditor.tests.minimap.MinimapWidgetTest;