Incremental delete of duplicate interfaces (IMultiFixCore & ILinkedFi…

…xCore) - Delete internal interface IMultiFixCore & ILinkedFixCore, plus small cleanup Signed-off-by: Rob Stryker <stryker@redhat.com>
eclipse-jdt · Feb 9, 2024 · 8133c17 · 8133c17
1 parent dc8daea
commit 8133c17
Show file tree

Hide file tree

Showing 20 changed files with 342 additions and 496 deletions.
diff --git a/...se.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/CleanUpContextCore.java b/...se.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/CleanUpContextCore.java
@@ -24,7 +24,9 @@
  * The context that contains all information required by a clean up to create a fix.
  *
  * @since 1.12
+ * @deprecated Please use CleanUpContext in the future
  */
+@Deprecated
 public class CleanUpContextCore {
 
 	private final ICompilationUnit fUnit;

diff --git a/...se.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/CleanUpOptionsCore.java b/...se.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/CleanUpOptionsCore.java
@@ -28,8 +28,10 @@
  * Allows to set and retrieve clean up settings for given options keys.
  *
  * @since 1.12
+ * @deprecated Please use CleanUpOptions in the future
  * This class is not intended to be subclassed by clients.
  */
+@Deprecated
 public class CleanUpOptionsCore {
 
 	private final Map<String, String> fOptions;

diff --git a/...t.core.manipulation/common/org/eclipse/jdt/core/manipulation/CleanUpRequirementsCore.java b/...t.core.manipulation/common/org/eclipse/jdt/core/manipulation/CleanUpRequirementsCore.java
@@ -25,7 +25,9 @@
  * Specifies the requirements of a clean up.
  *
  * @since 1.12
+ * @deprecated Please use CleanUpRequirements in the future
  */
+@Deprecated
 final public class CleanUpRequirementsCore {
 
 	protected final boolean fRequiresAST;

diff --git a/...lipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/ICleanUpFixCore.java b/...lipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/ICleanUpFixCore.java
@@ -25,7 +25,9 @@
  * fix one or more problems in a compilation unit.
  *
  * @since 1.12
+ * @deprecated Please use ICleanUpFix in the future
  */
+@Deprecated
 public interface ICleanUpFixCore {
 
 	/**

diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/IMultiFixCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/IMultiFixCore.java
diff --git a/...e.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MapCleanUpOptionsCore.java b/...e.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MapCleanUpOptionsCore.java
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/ui/cleanup/CleanUpContext.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/ui/cleanup/CleanUpContext.java
@@ -25,6 +25,7 @@
  *
  * @since 1.21
  */
+@SuppressWarnings("deprecation")
 public class CleanUpContext extends CleanUpContextCore {
 
 	/**

diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/ui/cleanup/CleanUpOptions.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/ui/cleanup/CleanUpOptions.java
@@ -27,6 +27,7 @@
  * @since 1.21
  * @noextend This class is not intended to be subclassed by clients.
  */
+@SuppressWarnings("deprecation")
 public class CleanUpOptions extends CleanUpOptionsCore {
 
 	/**

diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/ui/cleanup/ICleanUpFix.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/ui/cleanup/ICleanUpFix.java
@@ -26,6 +26,7 @@
  *
  * @since 1.21
  */
+@SuppressWarnings("deprecation")
 public interface ICleanUpFix extends ICleanUpFixCore {
 
 	/**

diff --git a/...core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/AbstractFixCore.java b/...core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/AbstractFixCore.java
@@ -17,7 +17,7 @@
 import org.eclipse.core.runtime.IStatus;
 
 
-public abstract class AbstractFixCore implements IProposableFix, ILinkedFixCore {
+public abstract class AbstractFixCore implements IProposableFix, ILinkedFix {
 
 	private final String fDisplayString;
 
@@ -36,7 +36,7 @@ public String getDisplayString() {
 	}
 
 	@Override
-	public LinkedProposalModelCore getLinkedPositionsCore() {
+	public LinkedProposalModelCore getLinkedPositions() {
 		return null;
 	}