Refactor MultiCatchCleanUp to jdt.core.manipulation (#1383)

- fixes #1382
eclipse-jdt · May 2, 2024 · 8a46c86 · 8a46c86
1 parent c13bcd3
commit 8a46c86
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/...dt/internal/ui/fix/MultiCatchCleanUp.java → ...nternal/ui/fix/MultiCatchCleanUpCore.java b/...dt/internal/ui/fix/MultiCatchCleanUp.java → ...nternal/ui/fix/MultiCatchCleanUpCore.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Fabrice TIERCELIN and others.
+ * Copyright (c) 2020, 2024 Fabrice TIERCELIN and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
  *
  * Contributors:
  *     Fabrice TIERCELIN - initial API and implementation
+ *     Red Hat Inc. - refactored to jdt.core.manipulation from jdt.ui
  *******************************************************************************/
 package org.eclipse.jdt.internal.ui.fix;
 
@@ -52,8 +53,8 @@
 import org.eclipse.jdt.internal.corext.dom.ASTNodes;
 import org.eclipse.jdt.internal.corext.dom.ASTSemanticMatcher;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
-import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix;
-import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation;
+import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore;
+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.corext.util.JavaModelUtil;
@@ -70,16 +71,16 @@
  * <li>The <code>catch</code> blocks must be able to move.</li>
  * </ul>
  */
-public class MultiCatchCleanUp extends AbstractMultiFix {
+public class MultiCatchCleanUpCore extends AbstractMultiFix {
 	private enum MergeDirection {
 		NONE, UP, DOWN;
 	}
 
-	public MultiCatchCleanUp() {
+	public MultiCatchCleanUpCore() {
 		this(Collections.emptyMap());
 	}
 
-	public MultiCatchCleanUp(final Map<String, String> options) {
+	public MultiCatchCleanUpCore(final Map<String, String> options) {
 		super(options);
 	}
 
@@ -420,7 +421,7 @@ private boolean matchMultiCatch(final CatchClause firstCatchClause, final CatchC
 			return null;
 		}
 
-		return new CompilationUnitRewriteOperationsFix(MultiFixMessages.MultiCatchCleanUp_description, unit,
+		return new CompilationUnitRewriteOperationsFixCore(MultiFixMessages.MultiCatchCleanUp_description, unit,
 				rewriteOperations.toArray(new CompilationUnitRewriteOperation[0]));
 	}
 
@@ -444,7 +445,7 @@ public MultiCatchOperation(final List<CatchClause> mergeableCatchClauses, final
 		}
 
 		@Override
-		public void rewriteASTInternal(final CompilationUnitRewrite cuRewrite, final LinkedProposalModelCore linkedModel) throws CoreException {
+		public void rewriteAST(final CompilationUnitRewrite cuRewrite, final LinkedProposalModelCore linkedModel) throws CoreException {
 			ASTRewrite rewrite= cuRewrite.getASTRewrite();
 			AST ast= cuRewrite.getRoot().getAST();
 			TextEditGroup group= createTextEditGroup(MultiFixMessages.MultiCatchCleanUp_description, cuRewrite);

diff --git a/org.eclipse.jdt.ui/plugin.xml b/org.eclipse.jdt.ui/plugin.xml
@@ -7512,7 +7512,7 @@
             runAfter="org.eclipse.jdt.ui.cleanup.join">
       </cleanUp>
       <cleanUp
-            class="org.eclipse.jdt.internal.ui.fix.MultiCatchCleanUp"
+            class="org.eclipse.jdt.internal.ui.fix.MultiCatchCleanUpCore"
             id="org.eclipse.jdt.ui.cleanup.multi_catch"
             runAfter="org.eclipse.jdt.ui.cleanup.try_with_resource">
       </cleanUp>

diff --git a/...eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/JavaFeatureTabPage.java b/...eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/JavaFeatureTabPage.java
@@ -28,7 +28,7 @@
 import org.eclipse.jdt.internal.ui.fix.HashCleanUp;
 import org.eclipse.jdt.internal.ui.fix.JoinCleanUp;
 import org.eclipse.jdt.internal.ui.fix.LambdaExpressionsCleanUpCore;
-import org.eclipse.jdt.internal.ui.fix.MultiCatchCleanUp;
+import org.eclipse.jdt.internal.ui.fix.MultiCatchCleanUpCore;
 import org.eclipse.jdt.internal.ui.fix.ObjectsEqualsCleanUp;
 import org.eclipse.jdt.internal.ui.fix.PatternMatchingForInstanceofCleanUpCore;
 import org.eclipse.jdt.internal.ui.fix.StringConcatToTextBlockCleanUpCore;
@@ -52,7 +52,7 @@ protected AbstractCleanUp[] createPreviewCleanUps(final Map<String, String> valu
 				new JoinCleanUp(values),
 				new TryWithResourceCleanUp(values),
 				new StringConcatToTextBlockCleanUpCore(values),
-				new MultiCatchCleanUp(values),
+				new MultiCatchCleanUpCore(values),
 				new TypeParametersCleanUp(values),
 				new HashCleanUp(values),
 				new ObjectsEqualsCleanUp(values),