Incremental delete of duplicate interfaces (Delete ICleanUpCore)

- Remove internal interface ICleanUpCore - Remove CleanUpFixWrapper, as it is no longer necessary - Remove unused CleanUpCoreWrapper Signed-off-by: Rob Stryker <stryker@redhat.com>
eclipse-jdt · Feb 9, 2024 · ba75582 · ba75582
1 parent 999668a
commit ba75582
Show file tree

Hide file tree

Showing 87 changed files with 413 additions and 815 deletions.
diff --git a/...pse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractCleanUpCore.java b/...pse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractCleanUpCore.java
@@ -24,29 +24,30 @@
 
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
 import org.eclipse.jdt.core.manipulation.CleanUpOptionsCore;
-import org.eclipse.jdt.core.manipulation.CleanUpRequirementsCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
-import org.eclipse.jdt.internal.corext.fix.ICleanUpCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.CleanUpOptions;
+import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
+import org.eclipse.jdt.ui.cleanup.ICleanUp;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public abstract class AbstractCleanUpCore implements ICleanUpCore {
+public abstract class AbstractCleanUpCore implements ICleanUp {
 
 	private CleanUpOptionsCore fOptions;
 
 	public AbstractCleanUpCore() {
 	}
 
 	public AbstractCleanUpCore(Map<String, String> settings) {
-		setOptions(new MapCleanUpOptionsCore(settings));
+		setOptions(new MapCleanUpOptions(settings));
 	}
 
 	/*
-	 * @see org.eclipse.jdt.internal.corext.fix.ICleanUpCore#setOptions(org.eclipse.jdt.ui.cleanup.CleanUpOptions)
+	 * @see org.eclipse.jdt.internal.corext.fix.ICleanUp#setOptions(org.eclipse.jdt.ui.cleanup.CleanUpOptions)
 	 */
 	@Override
-	public void setOptions(CleanUpOptionsCore options) {
+	public void setOptions(CleanUpOptions options) {
 		Assert.isLegal(options != null);
 		fOptions= options;
 	}
@@ -71,8 +72,8 @@ public String getPreview() {
 	 * @see org.eclipse.jdt.internal.corext.fix.ICleanUpCore#getRequirementsCore()
 	 */
 	@Override
-	public CleanUpRequirementsCore getRequirementsCore() {
-		return new CleanUpRequirementsCore(false, false, false, null);
+	public CleanUpRequirements getRequirements() {
+		return new CleanUpRequirements(false, false, false, null);
 	}
 
 	/*
@@ -84,10 +85,10 @@ public RefactoringStatus checkPreConditions(IJavaProject project, ICompilationUn
 	}
 
 	/*
-	 * @see org.eclipse.jdt.internal.corext.fix.ICleanUpCore#createFixCore(org.eclipse.jdt.ui.cleanup.CleanUpContext)
+	 * @see org.eclipse.jdt.internal.corext.fix.ICleanUp#createFixCore(org.eclipse.jdt.ui.cleanup.CleanUpContext)
 	 */
 	@Override
-	public ICleanUpFixCore createFixCore(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		return null;
 	}
 

diff --git a/....core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractCleanUpCoreWrapper.java b/....core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractCleanUpCoreWrapper.java
@@ -22,7 +22,6 @@
 
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
 import org.eclipse.jdt.ui.cleanup.CleanUpContext;
 import org.eclipse.jdt.ui.cleanup.CleanUpOptions;
@@ -50,8 +49,7 @@ public RefactoringStatus checkPreConditions(IJavaProject project, ICompilationUn
 
 	@Override
 	public final ICleanUpFix createFix(CleanUpContext context) throws CoreException {
-		ICleanUpFixCore fix= cleanUpCore.createFixCore(context);
-		return fix != null ? new CleanUpFixWrapper(fix) : null;
+		return cleanUpCore.createFix(context);
 	}
 
 	@Override
@@ -66,7 +64,7 @@ public void setOptions(CleanUpOptions options) {
 
 	@Override
 	public CleanUpRequirements getRequirements() {
-		return new CleanUpRequirements(cleanUpCore.getRequirementsCore());
+		return cleanUpCore.getRequirements();
 	}
 
 	@Override

diff --git a/...se.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFixCore.java b/...se.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFixCore.java
@@ -21,9 +21,9 @@
 
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
@@ -39,7 +39,7 @@ protected AbstractMultiFixCore(Map<String, String> settings) {
 	}
 
 	@Override
-	public final ICleanUpFixCore createFixCore(CleanUpContextCore context) throws CoreException {
+	public final ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit= context.getAST();
 		if (unit == null)
 			return null;
@@ -51,9 +51,9 @@ public final ICleanUpFixCore createFixCore(CleanUpContextCore context) throws Co
 		}
 	}
 
-	protected abstract ICleanUpFixCore createFix(CompilationUnit unit) throws CoreException;
+	protected abstract ICleanUpFix createFix(CompilationUnit unit) throws CoreException;
 
-	protected abstract ICleanUpFixCore createFix(CompilationUnit unit, IProblemLocation[] problems) throws CoreException;
+	protected abstract ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problems) throws CoreException;
 
 	@Override
 	public int computeNumberOfFixes(CompilationUnit compilationUnit) {

diff --git a/...t.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/ArrayWithCurlyCleanUpCore.java b/...t.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/ArrayWithCurlyCleanUpCore.java
@@ -20,13 +20,14 @@
 import org.eclipse.core.runtime.CoreException;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.CleanUpRequirementsCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
 import org.eclipse.jdt.internal.corext.fix.ArrayWithCurlyFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
+
 public class ArrayWithCurlyCleanUpCore extends AbstractCleanUpCore {
 	public ArrayWithCurlyCleanUpCore(final Map<String, String> options) {
 		super(options);
@@ -36,16 +37,16 @@ public ArrayWithCurlyCleanUpCore() {
 	}
 
 	@Override
-	public CleanUpRequirementsCore getRequirementsCore() {
-		return new CleanUpRequirementsCore(requireAST(), false, false, null);
+	public CleanUpRequirements getRequirements() {
+		return new CleanUpRequirements(requireAST(), false, false, null);
 	}
 
 	public boolean requireAST() {
 		return isEnabled(CleanUpConstants.ARRAY_WITH_CURLY);
 	}
 
 	@Override
-	public ICleanUpFixCore createFixCore(final CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(final CleanUpContext context) throws CoreException {
 		CompilationUnit compilationUnit= context.getAST();
 
 		if (compilationUnit == null || !isEnabled(CleanUpConstants.ARRAY_WITH_CURLY)) {

diff --git a/...n/common/org/eclipse/jdt/internal/ui/fix/BooleanValueRatherThanComparisonCleanUpCore.java b/...n/common/org/eclipse/jdt/internal/ui/fix/BooleanValueRatherThanComparisonCleanUpCore.java
@@ -18,13 +18,14 @@
 import org.eclipse.core.runtime.CoreException;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.CleanUpRequirementsCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
 import org.eclipse.jdt.internal.corext.fix.BooleanValueRatherThanComparisonFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
+
 public class BooleanValueRatherThanComparisonCleanUpCore extends AbstractCleanUpCore {
 	public BooleanValueRatherThanComparisonCleanUpCore(final Map<String, String> options) {
 		super(options);
@@ -34,16 +35,16 @@ public BooleanValueRatherThanComparisonCleanUpCore() {
 	}
 
 	@Override
-	public CleanUpRequirementsCore getRequirementsCore() {
-		return new CleanUpRequirementsCore(requireAST(), false, false, null);
+	public CleanUpRequirements getRequirements() {
+		return new CleanUpRequirements(requireAST(), false, false, null);
 	}
 
 	public boolean requireAST() {
 		return isEnabled(CleanUpConstants.BOOLEAN_VALUE_RATHER_THAN_COMPARISON);
 	}
 
 	@Override
-	public ICleanUpFixCore createFixCore(final CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(final CleanUpContext context) throws CoreException {
 		CompilationUnit compilationUnit= context.getAST();
 
 		if (compilationUnit == null || !isEnabled(CleanUpConstants.BOOLEAN_VALUE_RATHER_THAN_COMPARISON)) {

diff --git a/...lipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CleanUpFixWrapper.java b/...lipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CleanUpFixWrapper.java
diff --git a/...se.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CodeStyleCleanUpCore.java b/...se.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CodeStyleCleanUpCore.java
@@ -25,12 +25,12 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpRequirementsCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.CodeStyleFixCore;
 
+import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 /**
@@ -47,10 +47,10 @@ public CodeStyleCleanUpCore(Map<String, String> options) {
 	}
 
 	@Override
-	public CleanUpRequirementsCore getRequirementsCore() {
+	public CleanUpRequirements getRequirements() {
 		boolean requireAST= requireAST();
 		Map<String, String> requiredOptions= requireAST ? getRequiredOptions() : null;
-		return new CleanUpRequirementsCore(requireAST, false, false, requiredOptions);
+		return new CleanUpRequirements(requireAST, false, false, requiredOptions);
 	}
 
 	private boolean requireAST() {
@@ -69,7 +69,7 @@ nonStaticFields && isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_U
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CompilationUnit compilationUnit) throws CoreException {
+	public org.eclipse.jdt.ui.cleanup.ICleanUpFix createFix(CompilationUnit compilationUnit) throws CoreException {
 		if (compilationUnit == null)
 			return null;
 
@@ -91,7 +91,7 @@ nonStaticMethods && isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_METHOD
 
 
 	@Override
-	public ICleanUpFixCore createFix(CompilationUnit compilationUnit, IProblemLocation[] problems) throws CoreException {
+	public ICleanUpFix createFix(CompilationUnit compilationUnit, IProblemLocation[] problems) throws CoreException {
 		return CodeStyleFixCore.createCleanUp(compilationUnit, problems,
 				isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_USE_THIS) && isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_USE_THIS_ALWAYS),
 				isEnabled(CleanUpConstants.MEMBER_ACCESSES_STATIC_QUALIFY_WITH_DECLARING_CLASS) && isEnabled(CleanUpConstants.MEMBER_ACCESSES_STATIC_QUALIFY_WITH_DECLARING_CLASS_INSTANCE_ACCESS),

diff --git a/...ation/common/org/eclipse/jdt/internal/ui/fix/ConstantsForSystemPropertiesCleanUpCore.java b/...ation/common/org/eclipse/jdt/internal/ui/fix/ConstantsForSystemPropertiesCleanUpCore.java
@@ -42,15 +42,16 @@
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.CleanUpRequirementsCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
 import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore;
 import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperation;
 import org.eclipse.jdt.internal.corext.fix.UpdateProperty;
 import org.eclipse.jdt.internal.corext.util.Messages;
 
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
+
 public class ConstantsForSystemPropertiesCleanUpCore extends AbstractCleanUpCore {
 	public ConstantsForSystemPropertiesCleanUpCore(final Map<String, String> options) {
 		super(options);
@@ -60,16 +61,16 @@ public ConstantsForSystemPropertiesCleanUpCore() {
 	}
 
 	@Override
-	public CleanUpRequirementsCore getRequirementsCore() {
-		return new CleanUpRequirementsCore(requireAST(), false, false, null);
+	public CleanUpRequirements getRequirements() {
+		return new CleanUpRequirements(requireAST(), false, false, null);
 	}
 
 	public boolean requireAST() {
 		return isEnabled(CONSTANTS_FOR_SYSTEM_PROPERTY) && !computeFixSet().isEmpty();
 	}
 
 	@Override
-	public ICleanUpFixCore createFixCore(final CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(final CleanUpContext context) throws CoreException {
 		CompilationUnit compilationUnit= context.getAST();
 
 		if (compilationUnit == null) {

diff --git a/...anipulation/common/org/eclipse/jdt/internal/ui/fix/DoWhileRatherThanWhileCleanUpCore.java b/...anipulation/common/org/eclipse/jdt/internal/ui/fix/DoWhileRatherThanWhileCleanUpCore.java
@@ -18,13 +18,14 @@
 import org.eclipse.core.runtime.CoreException;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.CleanUpRequirementsCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.DoWhileRatherThanWhileFixCore;
 
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
+
 public class DoWhileRatherThanWhileCleanUpCore extends AbstractCleanUpCore {
 	public DoWhileRatherThanWhileCleanUpCore(final Map<String, String> options) {
 		super(options);
@@ -34,16 +35,16 @@ public DoWhileRatherThanWhileCleanUpCore() {
 	}
 
 	@Override
-	public CleanUpRequirementsCore getRequirementsCore() {
-		return new CleanUpRequirementsCore(requireAST(), false, false, null);
+	public CleanUpRequirements getRequirements() {
+		return new CleanUpRequirements(requireAST(), false, false, null);
 	}
 
 	public boolean requireAST() {
 		return isEnabled(CleanUpConstants.DO_WHILE_RATHER_THAN_WHILE);
 	}
 
 	@Override
-	public ICleanUpFixCore createFixCore(final CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(final CleanUpContext context) throws CoreException {
 		CompilationUnit compilationUnit= context.getAST();
 
 		if (compilationUnit == null || !isEnabled(CleanUpConstants.DO_WHILE_RATHER_THAN_WHILE)) {