Delete internal abstract classes AbstractCleanUpCore and AbstractMult…

…iFixCore Signed-off-by: Rob Stryker <stryker@redhat.com>
eclipse-jdt · Feb 9, 2024 · c61554b · c61554b
1 parent ba75582
commit c61554b
Show file tree

Hide file tree

Showing 36 changed files with 60 additions and 296 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
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
@@ -34,7 +34,7 @@
  *
  * @param <T> The type of the cleanup this class forwards to.
  */
-public class AbstractCleanUpCoreWrapper<T extends AbstractCleanUpCore> extends AbstractCleanUp {
+public class AbstractCleanUpCoreWrapper<T extends AbstractCleanUp> extends AbstractCleanUp {
 	protected final T cleanUpCore;
 
 	protected AbstractCleanUpCoreWrapper(Map<String, String> settings, T wrapped) {

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
diff --git a/...core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFixCoreWrapper.java b/...core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFixCoreWrapper.java
@@ -22,11 +22,11 @@
 
 /**
  * An extension of {@link AbstractCleanUpCoreWrapper} for cases where the wrapped
- * cleanup extends {@link AbstractMultiFixCore}
+ * cleanup extends {@link AbstractMultiFix}
  *
  * @param <T> The type of the cleanup this class forwards to.
  */
-public class AbstractMultiFixCoreWrapper<T extends AbstractMultiFixCore> extends AbstractCleanUpCoreWrapper<T> implements IMultiFix {
+public class AbstractMultiFixCoreWrapper<T extends AbstractMultiFix> extends AbstractCleanUpCoreWrapper<T> implements IMultiFix {
 
 	protected AbstractMultiFixCoreWrapper(Map<String, String> settings, T wrapped) {
 		super(settings, wrapped);

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
@@ -28,7 +28,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class ArrayWithCurlyCleanUpCore extends AbstractCleanUpCore {
+public class ArrayWithCurlyCleanUpCore extends AbstractCleanUp {
 	public ArrayWithCurlyCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}

diff --git a/...n/common/org/eclipse/jdt/internal/ui/fix/BooleanValueRatherThanComparisonCleanUpCore.java b/...n/common/org/eclipse/jdt/internal/ui/fix/BooleanValueRatherThanComparisonCleanUpCore.java
@@ -26,7 +26,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class BooleanValueRatherThanComparisonCleanUpCore extends AbstractCleanUpCore {
+public class BooleanValueRatherThanComparisonCleanUpCore extends AbstractCleanUp {
 	public BooleanValueRatherThanComparisonCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}

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
@@ -37,7 +37,7 @@
  * Creates fixes which can resolve code style issues
  * @see org.eclipse.jdt.internal.corext.fix.CodeStyleFixCore
  */
-public class CodeStyleCleanUpCore extends AbstractMultiFixCore {
+public class CodeStyleCleanUpCore extends AbstractMultiFix {
 
 	public CodeStyleCleanUpCore() {
 	}

diff --git a/...ation/common/org/eclipse/jdt/internal/ui/fix/ConstantsForSystemPropertiesCleanUpCore.java b/...ation/common/org/eclipse/jdt/internal/ui/fix/ConstantsForSystemPropertiesCleanUpCore.java
@@ -52,7 +52,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class ConstantsForSystemPropertiesCleanUpCore extends AbstractCleanUpCore {
+public class ConstantsForSystemPropertiesCleanUpCore extends AbstractCleanUp {
 	public ConstantsForSystemPropertiesCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}

diff --git a/...anipulation/common/org/eclipse/jdt/internal/ui/fix/DoWhileRatherThanWhileCleanUpCore.java b/...anipulation/common/org/eclipse/jdt/internal/ui/fix/DoWhileRatherThanWhileCleanUpCore.java
@@ -26,7 +26,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class DoWhileRatherThanWhileCleanUpCore extends AbstractCleanUpCore {
+public class DoWhileRatherThanWhileCleanUpCore extends AbstractCleanUp {
 	public DoWhileRatherThanWhileCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}

diff --git a/...anipulation/common/org/eclipse/jdt/internal/ui/fix/InlineDeprecatedMethodCleanUpCore.java b/...anipulation/common/org/eclipse/jdt/internal/ui/fix/InlineDeprecatedMethodCleanUpCore.java
@@ -34,7 +34,7 @@
 
 import org.eclipse.jdt.internal.ui.text.correction.QuickAssistProcessorUtil;
 
-public class InlineDeprecatedMethodCleanUpCore extends AbstractMultiFixCore {
+public class InlineDeprecatedMethodCleanUpCore extends AbstractMultiFix {
 
 	public InlineDeprecatedMethodCleanUpCore() {
 		this(Collections.emptyMap());

diff --git a/...jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/InvertEqualsCleanUpCore.java b/...jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/InvertEqualsCleanUpCore.java
@@ -28,7 +28,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class InvertEqualsCleanUpCore extends AbstractCleanUpCore {
+public class InvertEqualsCleanUpCore extends AbstractCleanUp {
 	public InvertEqualsCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}

diff --git a/...ore.manipulation/common/org/eclipse/jdt/internal/ui/fix/LambdaExpressionsCleanUpCore.java b/...ore.manipulation/common/org/eclipse/jdt/internal/ui/fix/LambdaExpressionsCleanUpCore.java
@@ -28,7 +28,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class LambdaExpressionsCleanUpCore extends AbstractCleanUpCore {
+public class LambdaExpressionsCleanUpCore extends AbstractCleanUp {
 
 	public LambdaExpressionsCleanUpCore(Map<String, String> options) {
 		super(options);

diff --git a/...core.manipulation/common/org/eclipse/jdt/internal/ui/fix/NoStringCreationCleanUpCore.java b/...core.manipulation/common/org/eclipse/jdt/internal/ui/fix/NoStringCreationCleanUpCore.java
@@ -55,7 +55,7 @@
 /**
  * A fix that removes a String instance from a String literal.
  */
-public class NoStringCreationCleanUpCore extends AbstractMultiFixCore {
+public class NoStringCreationCleanUpCore extends AbstractMultiFix {
 	public NoStringCreationCleanUpCore() {
 		this(Collections.emptyMap());
 	}

diff --git a/...eclipse/jdt/internal/ui/fix/OneIfRatherThanDuplicateBlocksThatFallThroughCleanUpCore.java b/...eclipse/jdt/internal/ui/fix/OneIfRatherThanDuplicateBlocksThatFallThroughCleanUpCore.java
@@ -26,7 +26,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class OneIfRatherThanDuplicateBlocksThatFallThroughCleanUpCore extends AbstractCleanUpCore {
+public class OneIfRatherThanDuplicateBlocksThatFallThroughCleanUpCore extends AbstractCleanUp {
 	public OneIfRatherThanDuplicateBlocksThatFallThroughCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}

diff --git a/...ation/common/org/eclipse/jdt/internal/ui/fix/PatternMatchingForInstanceofCleanUpCore.java b/...ation/common/org/eclipse/jdt/internal/ui/fix/PatternMatchingForInstanceofCleanUpCore.java
@@ -29,7 +29,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class PatternMatchingForInstanceofCleanUpCore extends AbstractCleanUpCore {
+public class PatternMatchingForInstanceofCleanUpCore extends AbstractCleanUp {
 	public PatternMatchingForInstanceofCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}

diff --git a/...core.manipulation/common/org/eclipse/jdt/internal/ui/fix/PlainReplacementCleanUpCore.java b/...core.manipulation/common/org/eclipse/jdt/internal/ui/fix/PlainReplacementCleanUpCore.java
@@ -28,7 +28,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class PlainReplacementCleanUpCore extends AbstractCleanUpCore {
+public class PlainReplacementCleanUpCore extends AbstractCleanUp {
 	public PlainReplacementCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}

diff --git a/...ation/common/org/eclipse/jdt/internal/ui/fix/PotentialProgrammingProblemsCleanUpCore.java b/...ation/common/org/eclipse/jdt/internal/ui/fix/PotentialProgrammingProblemsCleanUpCore.java
@@ -37,7 +37,7 @@
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
-public class PotentialProgrammingProblemsCleanUpCore extends AbstractMultiFixCore {
+public class PotentialProgrammingProblemsCleanUpCore extends AbstractMultiFix {
 
 	public PotentialProgrammingProblemsCleanUpCore(Map<String, String> options) {
 		super(options);

diff --git a/...e.manipulation/common/org/eclipse/jdt/internal/ui/fix/PrimitiveComparisonCleanUpCore.java b/...e.manipulation/common/org/eclipse/jdt/internal/ui/fix/PrimitiveComparisonCleanUpCore.java
@@ -28,7 +28,7 @@
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
-public class PrimitiveComparisonCleanUpCore extends AbstractCleanUpCore {
+public class PrimitiveComparisonCleanUpCore extends AbstractCleanUp {
 	public PrimitiveComparisonCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}