Rename status for find/replace from IStatus to IFindReplaceStatus

To avoid confusion with the existing IStatus interface for representing Eclipse operation results, this change renames the specific status interface for find/replace action results from IStatus to IFindReplaceStatus. It also adapts the IStatusVisitor to IFindReplaceStatusVisitor accordingly.
eobrienPilz · Jan 15, 2024 · 8463a66 · 8463a66
1 parent 4a2074e
commit 8463a66
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 25 deletions.
diff --git a/....ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java b/....ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java
@@ -37,7 +37,7 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.findandreplace.status.FindAllStatus;
 import org.eclipse.ui.internal.findandreplace.status.FindStatus;
-import org.eclipse.ui.internal.findandreplace.status.IStatus;
+import org.eclipse.ui.internal.findandreplace.status.IFindReplaceStatus;
 import org.eclipse.ui.internal.findandreplace.status.InvalidRegExStatus;
 import org.eclipse.ui.internal.findandreplace.status.NoStatus;
 import org.eclipse.ui.internal.findandreplace.status.ReplaceAllStatus;
@@ -47,7 +47,7 @@
 import org.eclipse.ui.texteditor.IFindReplaceTargetExtension2;
 
 public class FindReplaceLogic implements IFindReplaceLogic {
-	private IStatus status;
+	private IFindReplaceStatus status;
 	private IFindReplaceTarget target;
 	private IRegion oldScope;
 	private Point incrementalBaseLocation;
@@ -99,7 +99,7 @@ public boolean isActive(SearchOptions searchOption) {
 	}
 
 	@Override
-	public IStatus getStatus() {
+	public IFindReplaceStatus getStatus() {
 		if (status == null) {
 			return new NoStatus();
 		}

diff --git a/...xteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogicMessageGenerator.java b/...xteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogicMessageGenerator.java
@@ -15,17 +15,17 @@
 
 import org.eclipse.ui.internal.findandreplace.status.FindAllStatus;
 import org.eclipse.ui.internal.findandreplace.status.FindStatus;
-import org.eclipse.ui.internal.findandreplace.status.IStatus;
-import org.eclipse.ui.internal.findandreplace.status.IStatusVisitor;
+import org.eclipse.ui.internal.findandreplace.status.IFindReplaceStatus;
+import org.eclipse.ui.internal.findandreplace.status.IFindReplaceStatusVisitor;
 import org.eclipse.ui.internal.findandreplace.status.InvalidRegExStatus;
 import org.eclipse.ui.internal.findandreplace.status.NoStatus;
 import org.eclipse.ui.internal.findandreplace.status.ReplaceAllStatus;
 import org.eclipse.ui.internal.texteditor.NLSUtility;
 
-public class FindReplaceLogicMessageGenerator implements IStatusVisitor<String> {
+public class FindReplaceLogicMessageGenerator implements IFindReplaceStatusVisitor<String> {
 
 	@Override
-	public String visit(IStatus status) {
+	public String visit(IFindReplaceStatus status) {
 		throw new UnsupportedOperationException();
 	}
 

diff --git a/...ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/IFindReplaceLogic.java b/...ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/IFindReplaceLogic.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jface.text.IFindReplaceTarget;
 
-import org.eclipse.ui.internal.findandreplace.status.IStatus;
+import org.eclipse.ui.internal.findandreplace.status.IFindReplaceStatus;
 
 /**
  * Implements a generalized logic operator for in-file Find/Replace-Operations.
@@ -55,7 +55,7 @@ public interface IFindReplaceLogic {
 	 *
 	 * @return FindAndReplaceMessageStatus
 	 */
-	public IStatus getStatus();
+	public IFindReplaceStatus getStatus();
 
 	/**
 	 * RegEx-Search is not possible on every target. Hence, even after {code

diff --git a/...workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/FindAllStatus.java b/...workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/FindAllStatus.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.findandreplace.status;
 
-public class FindAllStatus implements IStatus {
+public class FindAllStatus implements IFindReplaceStatus {
 	private int selectCount;
 
 	public FindAllStatus(int selectCount) {
@@ -25,7 +25,7 @@ public int getSelectCount() {
 	}
 
 	@Override
-	public <T> T accept(IStatusVisitor<T> visitor) {
+	public <T> T accept(IFindReplaceStatusVisitor<T> visitor) {
 		return visitor.visit(this);
 	}
 

diff --git a/...ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/FindStatus.java b/...ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/FindStatus.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.findandreplace.status;
 
-public class FindStatus implements IStatus {
+public class FindStatus implements IFindReplaceStatus {
 
 	public enum StatusCode {
 		NO_MATCH,
@@ -31,7 +31,7 @@ public StatusCode getMessageCode() {
 	}
 
 	@Override
-	public <T> T accept(IStatusVisitor<T> visitor) {
+	public <T> T accept(IFindReplaceStatusVisitor<T> visitor) {
 		return visitor.visit(this);
 	}
 

diff --git a/...ternal/findandreplace/status/IStatus.java → ...andreplace/status/IFindReplaceStatus.java b/...ternal/findandreplace/status/IStatus.java → ...andreplace/status/IFindReplaceStatus.java
@@ -17,8 +17,8 @@
  * Interface for statuses that can occur while performing
  * Find/Replace-operations.
  */
-public interface IStatus {
-	public <T> T accept(IStatusVisitor<T> visitor);
+public interface IFindReplaceStatus {
+	public <T> T accept(IFindReplaceStatusVisitor<T> visitor);
 
 	/**
 	 * {@return whether the input is valid, e.g., that the find string is valid and

diff --git a/...findandreplace/status/IStatusVisitor.java → ...ace/status/IFindReplaceStatusVisitor.java b/...findandreplace/status/IStatusVisitor.java → ...ace/status/IFindReplaceStatusVisitor.java
@@ -13,8 +13,8 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.findandreplace.status;
 
-public interface IStatusVisitor<T> {
-	public T visit(IStatus status);
+public interface IFindReplaceStatusVisitor<T> {
+	public T visit(IFindReplaceStatus status);
 
 	public T visit(ReplaceAllStatus status);
 

diff --git a/...ench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/InvalidRegExStatus.java b/...ench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/InvalidRegExStatus.java
@@ -19,7 +19,7 @@
  * This class is used as glue to correctly map to the error messages generated
  * by RegEx-Errors which are directly displayed in plain text.
  */
-public class InvalidRegExStatus implements IStatus {
+public class InvalidRegExStatus implements IFindReplaceStatus {
 
 	private PatternSyntaxException regExException;
 
@@ -32,7 +32,7 @@ public String getMessage() {
 	}
 
 	@Override
-	public <T> T accept(IStatusVisitor<T> visitor) {
+	public <T> T accept(IFindReplaceStatusVisitor<T> visitor) {
 		return visitor.visit(this);
 	}
 

diff --git a/...e.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/NoStatus.java b/...e.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/NoStatus.java
@@ -16,14 +16,14 @@
 /**
  * Represents an "everything worked fine, nothing to display"-status.
  */
-public class NoStatus implements IStatus {
+public class NoStatus implements IFindReplaceStatus {
 
 	public NoStatus() {
 		// do nothing
 	}
 
 	@Override
-	public <T> T accept(IStatusVisitor<T> visitor) {
+	public <T> T accept(IFindReplaceStatusVisitor<T> visitor) {
 		return visitor.visit(this);
 	}
 

diff --git a/...kbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/ReplaceAllStatus.java b/...kbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/ReplaceAllStatus.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.findandreplace.status;
 
-public class ReplaceAllStatus implements IStatus {
+public class ReplaceAllStatus implements IFindReplaceStatus {
 	private int replaceCount;
 
 	public ReplaceAllStatus(int replaceCount) {
@@ -25,7 +25,7 @@ public int getReplaceCount() {
 	}
 
 	@Override
-	public <T> T accept(IStatusVisitor<T> visitor) {
+	public <T> T accept(IFindReplaceStatusVisitor<T> visitor) {
 		return visitor.visit(this);
 	}
 

diff --git a/.../org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java b/.../org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java
@@ -70,7 +70,7 @@
 import org.eclipse.ui.internal.findandreplace.SearchOptions;
 import org.eclipse.ui.internal.findandreplace.status.FindAllStatus;
 import org.eclipse.ui.internal.findandreplace.status.FindStatus;
-import org.eclipse.ui.internal.findandreplace.status.IStatus;
+import org.eclipse.ui.internal.findandreplace.status.IFindReplaceStatus;
 import org.eclipse.ui.internal.findandreplace.status.InvalidRegExStatus;
 import org.eclipse.ui.internal.findandreplace.status.ReplaceAllStatus;
 import org.eclipse.ui.internal.texteditor.SWTUtil;
@@ -1299,7 +1299,7 @@ private void evaluateFindReplaceStatus() {
 	 * @param allowBeep Whether the evaluation should beep on some codes.
 	 */
 	private void evaluateFindReplaceStatus(boolean allowBeep) {
-		IStatus status = findReplaceLogic.getStatus();
+		IFindReplaceStatus status = findReplaceLogic.getStatus();
 
 		String dialogMessage = status.accept(new FindReplaceLogicMessageGenerator());
 		fStatusLabel.setText(dialogMessage);