Incremental delete of duplicate interfaces (IInvocationContextCore an…

…d IProblemLocationCore) - Removal of internal interfaces IInvocationContextCore and IProblemLocationCore Signed-off-by: Rob Stryker <stryker@redhat.com>
eclipse-jdt · Feb 7, 2024 · 9288f3f · 9288f3f
1 parent 0c8c8cc
commit 9288f3f
Show file tree

Hide file tree

Showing 147 changed files with 975 additions and 1,128 deletions.
diff --git a/...clipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFix.java b/...clipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFix.java
@@ -23,7 +23,7 @@
 
 import org.eclipse.jdt.ui.cleanup.CleanUpContext;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
 
@@ -52,7 +52,7 @@ public final ICleanUpFix createFix(CleanUpContext context) throws CoreException
 
 	protected abstract ICleanUpFix createFix(CompilationUnit unit) throws CoreException;
 
-	protected abstract ICleanUpFix createFix(CompilationUnit unit, IProblemLocationCore[] problems) throws CoreException;
+	protected abstract ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problems) throws CoreException;
 
 	@Override
 	public int computeNumberOfFixes(CompilationUnit compilationUnit) {
@@ -76,12 +76,12 @@ protected static int getNumberOfProblems(IProblem[] problems, int problemId) {
 	}
 
 	/**
-	 * Convert set of IProblems to IProblemLocationCore
+	 * Convert set of IProblems to IProblemLocation
 	 * @param problems the problems to convert
 	 * @return the converted set
 	 */
-	protected static IProblemLocationCore[] convertProblems(IProblem[] problems) {
-		IProblemLocationCore[] result= new IProblemLocationCore[problems.length];
+	protected static IProblemLocation[] convertProblems(IProblem[] problems) {
+		IProblemLocation[] result= new IProblemLocation[problems.length];
 
 		for (int i= 0; i < problems.length; i++) {
 			result[i]= new ProblemLocation(problems[i]);
@@ -98,20 +98,20 @@ protected static IProblemLocationCore[] convertProblems(IProblem[] problems) {
 	 * @param problemIds the ids of the resulting problem locations
 	 * @return problem locations
 	 */
-	protected static IProblemLocationCore[] filter(IProblemLocationCore[] problems, int[] problemIds) {
-		ArrayList<IProblemLocationCore> result= new ArrayList<>();
+	protected static IProblemLocation[] filter(IProblemLocation[] problems, int[] problemIds) {
+		ArrayList<IProblemLocation> result= new ArrayList<>();
 
-		for (IProblemLocationCore problem : problems) {
+		for (IProblemLocation problem : problems) {
 			if (contains(problemIds, problem.getProblemId()) && !contains(result, problem)) {
 				result.add(problem);
 			}
 		}
 
-		return result.toArray(new IProblemLocationCore[result.size()]);
+		return result.toArray(new IProblemLocation[result.size()]);
 	}
 
-	private static boolean contains(ArrayList<IProblemLocationCore> problems, IProblemLocationCore problem) {
-		for (IProblemLocationCore existing : problems) {
+	private static boolean contains(ArrayList<IProblemLocation> problems, IProblemLocation problem) {
+		for (IProblemLocation existing : problems) {
 			if (existing.getProblemId() == problem.getProblemId() && existing.getOffset() == problem.getOffset() && existing.getLength() == problem.getLength()) {
 				return true;
 			}

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
@@ -24,8 +24,9 @@
 import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
 import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
-import org.eclipse.jdt.internal.ui.text.correction.ProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
+
+import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
 
 
 public abstract class AbstractMultiFixCore extends AbstractCleanUpCore implements IMultiFixCore {
@@ -52,7 +53,7 @@ public final ICleanUpFixCore createFixCore(CleanUpContextCore context) throws Co
 
 	protected abstract ICleanUpFixCore createFix(CompilationUnit unit) throws CoreException;
 
-	protected abstract ICleanUpFixCore createFix(CompilationUnit unit, IProblemLocationCore[] problems) throws CoreException;
+	protected abstract ICleanUpFixCore createFix(CompilationUnit unit, IProblemLocation[] problems) throws CoreException;
 
 	@Override
 	public int computeNumberOfFixes(CompilationUnit compilationUnit) {
@@ -75,15 +76,15 @@ protected static int getNumberOfProblems(IProblem[] problems, int problemId) {
 	}
 
 	/**
-	 * Convert set of IProblems to IProblemLocationCore
+	 * Convert set of IProblems to IProblemLocation
 	 * @param problems the problems to convert
 	 * @return the converted set
 	 */
-	protected static IProblemLocationCore[] convertProblems(IProblem[] problems) {
-		IProblemLocationCore[] result= new IProblemLocationCore[problems.length];
+	protected static IProblemLocation[] convertProblems(IProblem[] problems) {
+		IProblemLocation[] result= new IProblemLocation[problems.length];
 
 		for (int i= 0; i < problems.length; i++) {
-			result[i]= new ProblemLocationCore(problems[i]);
+			result[i]= new ProblemLocation(problems[i]);
 		}
 
 		return result;
@@ -97,20 +98,20 @@ protected static IProblemLocationCore[] convertProblems(IProblem[] problems) {
 	 * @param problemIds the ids of the resulting problem locations
 	 * @return problem locations
 	 */
-	protected static IProblemLocationCore[] filter(IProblemLocationCore[] problems, int[] problemIds) {
-		ArrayList<IProblemLocationCore> result= new ArrayList<>();
+	protected static IProblemLocation[] filter(IProblemLocation[] problems, int[] problemIds) {
+		ArrayList<IProblemLocation> result= new ArrayList<>();
 
-		for (IProblemLocationCore problem : problems) {
+		for (IProblemLocation problem : problems) {
 			if (contains(problemIds, problem.getProblemId()) && !contains(result, problem)) {
 				result.add(problem);
 			}
 		}
 
-		return result.toArray(new IProblemLocationCore[result.size()]);
+		return result.toArray(new IProblemLocation[result.size()]);
 	}
 
-	private static boolean contains(ArrayList<IProblemLocationCore> problems, IProblemLocationCore problem) {
-		for (IProblemLocationCore existing : problems) {
+	private static boolean contains(ArrayList<IProblemLocation> problems, IProblemLocation problem) {
+		for (IProblemLocation existing : problems) {
 			if (existing.getProblemId() == problem.getProblemId() && existing.getOffset() == problem.getOffset() && existing.getLength() == problem.getLength()) {
 				return true;
 			}

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
@@ -18,7 +18,7 @@
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 /**
  * An extension of {@link AbstractCleanUpCoreWrapper} for cases where the wrapped
@@ -38,7 +38,7 @@ public int computeNumberOfFixes(CompilationUnit compilationUnit) {
 	}
 
 	@Override
-	public boolean canFix(ICompilationUnit compilationUnit, IProblemLocationCore problem) {
+	public boolean canFix(ICompilationUnit compilationUnit, IProblemLocation problem) {
 		return cleanUpCore.canFix(compilationUnit, problem);
 	}
 }
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
@@ -23,9 +23,9 @@
 import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
 
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
-import org.eclipse.jdt.internal.ui.text.correction.ProblemLocationCore;
+import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
 
 /**
  * Class to wrap an ICleanUpFixCore and be used as an ICleanUpFix
@@ -47,10 +47,10 @@ public static CleanUpFixWrapper create(ICleanUpFixCore cleanUpFixCore) {
 		return cleanUpFixCore == null ? null : new CleanUpFixWrapper(cleanUpFixCore);
 	}
 
-	public static ICleanUpFix create(IProblemLocationCore[] problems, Function<IProblemLocationCore[], ICleanUpFixCore> createFunction) {
-		IProblemLocationCore[] problemLocationArray= null;
+	public static ICleanUpFix create(IProblemLocation[] problems, Function<IProblemLocation[], ICleanUpFixCore> createFunction) {
+		IProblemLocation[] problemLocationArray= null;
 		if (problems != null) {
-			problemLocationArray= new ProblemLocationCore[problems.length];
+			problemLocationArray= new ProblemLocation[problems.length];
 			for (int i= 0; i < problems.length; i++) {
 				problemLocationArray[i]=  problems[i];
 			}

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
@@ -31,7 +31,7 @@
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.CodeStyleFixCore;
 
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 /**
  * Creates fixes which can resolve code style issues
@@ -91,7 +91,7 @@ nonStaticMethods && isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_METHOD
 
 
 	@Override
-	public ICleanUpFixCore createFix(CompilationUnit compilationUnit, IProblemLocationCore[] problems) throws CoreException {
+	public ICleanUpFixCore 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),
@@ -195,7 +195,7 @@ public String getPreview() {
 	}
 
 	@Override
-	public boolean canFix(ICompilationUnit compilationUnit, IProblemLocationCore problem) {
+	public boolean canFix(ICompilationUnit compilationUnit, IProblemLocation problem) {
 		if (IProblem.UnqualifiedFieldAccess == problem.getProblemId())
 			return isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_USE_THIS) && isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_USE_THIS_ALWAYS);
 

diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/IMultiFix.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/IMultiFix.java
@@ -19,23 +19,23 @@
 
 import org.eclipse.jdt.ui.cleanup.CleanUpContext;
 import org.eclipse.jdt.ui.cleanup.ICleanUp;
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 public interface IMultiFix extends ICleanUp {
 
 	public static class MultiFixContext extends CleanUpContext {
 
-		private final IProblemLocationCore[] fLocations;
+		private final IProblemLocation[] fLocations;
 
-		public MultiFixContext(ICompilationUnit unit, CompilationUnit ast, IProblemLocationCore[] locations) {
+		public MultiFixContext(ICompilationUnit unit, CompilationUnit ast, IProblemLocation[] locations) {
 			super(unit, ast);
 			fLocations= locations;
 		}
 
 		/**
 		 * @return locations of problems to fix.
 		 */
-		public IProblemLocationCore[] getProblemLocations() {
+		public IProblemLocation[] getProblemLocations() {
 			return fLocations;
 		}
 	}
@@ -53,7 +53,7 @@ public IProblemLocationCore[] getProblemLocations() {
 	 *            The location of the problem to fix
 	 * @return True if problem can be fixed
 	 */
-	boolean canFix(ICompilationUnit compilationUnit, IProblemLocationCore problem);
+	boolean canFix(ICompilationUnit compilationUnit, IProblemLocation problem);
 
 	/**
 	 * Maximal number of problems this clean up will fix in compilation unit.

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
@@ -21,23 +21,23 @@
 
 import org.eclipse.jdt.internal.corext.fix.ICleanUpCore;
 
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 public interface IMultiFixCore extends ICleanUpCore {
 
 	public static class MultiFixContext extends CleanUpContextCore {
 
-		private final IProblemLocationCore[] fLocations;
+		private final IProblemLocation[] fLocations;
 
-		public MultiFixContext(ICompilationUnit unit, CompilationUnit ast, IProblemLocationCore[] locations) {
+		public MultiFixContext(ICompilationUnit unit, CompilationUnit ast, IProblemLocation[] locations) {
 			super(unit, ast);
 			fLocations= locations;
 		}
 
 		/**
 		 * @return locations of problems to fix.
 		 */
-		public IProblemLocationCore[] getProblemLocations() {
+		public IProblemLocation[] getProblemLocations() {
 			return fLocations;
 		}
 	}
@@ -55,7 +55,7 @@ public IProblemLocationCore[] getProblemLocations() {
 	 *            The location of the problem to fix
 	 * @return True if problem can be fixed
 	 */
-	boolean canFix(ICompilationUnit compilationUnit, IProblemLocationCore problem);
+	boolean canFix(ICompilationUnit compilationUnit, IProblemLocation problem);
 
 	/**
 	 * Maximal number of problems this clean up will fix in compilation unit.

diff --git a/...anipulation/common/org/eclipse/jdt/internal/ui/fix/InlineDeprecatedMethodCleanUpCore.java b/...anipulation/common/org/eclipse/jdt/internal/ui/fix/InlineDeprecatedMethodCleanUpCore.java
@@ -30,7 +30,7 @@
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.InlineMethodFixCore;
 
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 import org.eclipse.jdt.internal.ui.text.correction.QuickAssistProcessorUtil;
 
 public class InlineDeprecatedMethodCleanUpCore extends AbstractMultiFixCore {
@@ -84,7 +84,7 @@ public String getPreview() {
 	}
 
 	@Override
-	public boolean canFix(ICompilationUnit compilationUnit, IProblemLocationCore problem) {
+	public boolean canFix(ICompilationUnit compilationUnit, IProblemLocation problem) {
 		return false;
 	}
 
@@ -114,7 +114,7 @@ public boolean visit(MethodInvocation node) {
 	}
 
 	@Override
-	protected ICleanUpFixCore createFix(CompilationUnit unit, IProblemLocationCore[] problems) throws CoreException {
+	protected ICleanUpFixCore createFix(CompilationUnit unit, IProblemLocation[] problems) throws CoreException {
 		return null;
 	}
 

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
@@ -45,7 +45,7 @@
 import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperation;
 import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore;
 import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 import org.eclipse.text.edits.TextEditGroup;
 
 /**
@@ -140,12 +140,12 @@ public boolean visit(final ClassInstanceCreation node) {
 	}
 
 	@Override
-	public boolean canFix(final ICompilationUnit compilationUnit, final IProblemLocationCore problem) {
+	public boolean canFix(final ICompilationUnit compilationUnit, final IProblemLocation problem) {
 		return false;
 	}
 
 	@Override
-	protected ICleanUpFixCore createFix(final CompilationUnit unit, final IProblemLocationCore[] problems) throws CoreException {
+	protected ICleanUpFixCore createFix(final CompilationUnit unit, final IProblemLocation[] problems) throws CoreException {
 		return null;
 	}
 

diff --git a/...ation/common/org/eclipse/jdt/internal/ui/fix/PotentialProgrammingProblemsCleanUpCore.java b/...ation/common/org/eclipse/jdt/internal/ui/fix/PotentialProgrammingProblemsCleanUpCore.java
@@ -35,7 +35,7 @@
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.PotentialProgrammingProblemsFixCore;
 
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 public class PotentialProgrammingProblemsCleanUpCore extends AbstractMultiFixCore {
 
@@ -79,7 +79,7 @@ public ICleanUpFixCore createFix(CompilationUnit compilationUnit) throws CoreExc
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CompilationUnit compilationUnit, IProblemLocationCore[] problems) throws CoreException {
+	public ICleanUpFixCore createFix(CompilationUnit compilationUnit, IProblemLocation[] problems) throws CoreException {
 		if (compilationUnit == null)
 			return null;
 
@@ -127,7 +127,7 @@ public String getPreview() {
 	}
 
 	@Override
-	public boolean canFix(ICompilationUnit compilationUnit, IProblemLocationCore problem) {
+	public boolean canFix(ICompilationUnit compilationUnit, IProblemLocation problem) {
 		if (problem.getProblemId() == IProblem.MissingSerialVersion)
 			return (isEnabled(CleanUpConstants.ADD_MISSING_SERIAL_VERSION_ID) && isEnabled(CleanUpConstants.ADD_MISSING_SERIAL_VERSION_ID_GENERATED))
 				|| (isEnabled(CleanUpConstants.ADD_MISSING_SERIAL_VERSION_ID) && isEnabled(CleanUpConstants.ADD_MISSING_SERIAL_VERSION_ID_DEFAULT));

diff --git a/...se.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/SubstringCleanUpCore.java b/...se.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/SubstringCleanUpCore.java
@@ -40,7 +40,7 @@
 import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore;
 import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
 
-import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
 /**
  * A fix that removes the second <code>substring()</code> parameter if this parameter is the length of the string:
@@ -118,13 +118,13 @@ public boolean visit(final MethodInvocation visited) {
 				rewriteOperations.toArray(new CompilationUnitRewriteOperation[0]));
 	}
 	@Override
-	public ICleanUpFixCore createFix(CompilationUnit unit, IProblemLocationCore[] problems) throws CoreException {
+	public ICleanUpFixCore createFix(CompilationUnit unit, IProblemLocation[] problems) throws CoreException {
 		return createFix(unit);
 	}
 
 
 	@Override
-	public boolean canFix(final ICompilationUnit compilationUnit, final IProblemLocationCore problem) {
+	public boolean canFix(final ICompilationUnit compilationUnit, final IProblemLocation problem) {
 		return false;
 	}