|
68 | 68 | import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
|
69 | 69 | import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
|
70 | 70 | import org.eclipse.jdt.core.manipulation.ChangeCorrectionProposalCore;
|
71 |
| -import org.eclipse.jdt.core.manipulation.CleanUpContextCore; |
72 | 71 | import org.eclipse.jdt.core.manipulation.CleanUpOptionsCore;
|
73 |
| -import org.eclipse.jdt.core.manipulation.CleanUpRequirementsCore; |
74 |
| -import org.eclipse.jdt.core.manipulation.ICleanUpFixCore; |
75 | 72 | import org.eclipse.jdt.internal.core.manipulation.StubUtility;
|
76 | 73 | import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
|
77 | 74 | import org.eclipse.jdt.internal.corext.dom.ASTNodes;
|
78 | 75 | import org.eclipse.jdt.internal.corext.dom.Bindings;
|
79 | 76 | import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
|
80 | 77 | import org.eclipse.jdt.internal.corext.fix.ConvertLoopFixCore;
|
81 |
| -import org.eclipse.jdt.internal.corext.fix.ICleanUpCore; |
82 | 78 | import org.eclipse.jdt.internal.corext.fix.IProposableFix;
|
83 | 79 | import org.eclipse.jdt.internal.corext.fix.LambdaExpressionsFixCore;
|
84 | 80 | import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore;
|
|
91 | 87 | import org.eclipse.jdt.internal.corext.refactoring.surround.SurroundWithTryCatchRefactoring;
|
92 | 88 | import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
|
93 | 89 | import org.eclipse.jdt.internal.corext.util.Messages;
|
94 |
| -import org.eclipse.jdt.internal.ui.fix.AbstractCleanUpCore; |
| 90 | +import org.eclipse.jdt.internal.ui.fix.AbstractCleanUp; |
95 | 91 | import org.eclipse.jdt.internal.ui.fix.LambdaExpressionsCleanUpCore;
|
96 | 92 | import org.eclipse.jdt.internal.ui.fix.MultiFixMessages;
|
97 |
| -import org.eclipse.jdt.ui.text.java.IInvocationContext; |
98 |
| -import org.eclipse.jdt.ui.text.java.IProblemLocation; |
99 | 93 | import org.eclipse.jdt.internal.ui.text.correction.IProposalRelevance;
|
100 | 94 | import org.eclipse.jdt.internal.ui.text.correction.proposals.ASTRewriteRemoveImportsCorrectionProposalCore;
|
101 | 95 | import org.eclipse.jdt.internal.ui.text.correction.proposals.FixCorrectionProposalCore;
|
|
107 | 101 | import org.eclipse.jdt.ls.core.internal.text.correction.ActionMessages;
|
108 | 102 | import org.eclipse.jdt.ls.core.internal.text.correction.RefactorProposalUtility;
|
109 | 103 | import org.eclipse.jdt.ls.core.internal.text.correction.RefactoringCorrectionCommandProposal;
|
| 104 | +import org.eclipse.jdt.ui.cleanup.CleanUpContext; |
| 105 | +import org.eclipse.jdt.ui.cleanup.CleanUpRequirements; |
| 106 | +import org.eclipse.jdt.ui.cleanup.ICleanUp; |
| 107 | +import org.eclipse.jdt.ui.cleanup.ICleanUpFix; |
| 108 | +import org.eclipse.jdt.ui.text.java.IInvocationContext; |
| 109 | +import org.eclipse.jdt.ui.text.java.IProblemLocation; |
110 | 110 | import org.eclipse.lsp4j.CodeActionKind;
|
111 | 111 | import org.eclipse.lsp4j.CodeActionParams;
|
112 | 112 | import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
|
@@ -908,14 +908,14 @@ private static boolean getConvertForLoopProposal(IInvocationContext context, AST
|
908 | 908 | }
|
909 | 909 | Map<String, String> options = new HashMap<>();
|
910 | 910 | options.put(CleanUpConstants.CONTROL_STATEMENTS_CONVERT_FOR_LOOP_TO_ENHANCED, CleanUpOptionsCore.TRUE);
|
911 |
| - ICleanUpCore cleanUp = new AbstractCleanUpCore(options) { |
| 911 | + ICleanUp cleanUp = new AbstractCleanUp(options) { |
912 | 912 | @Override
|
913 |
| - public CleanUpRequirementsCore getRequirementsCore() { |
914 |
| - return new CleanUpRequirementsCore(isEnabled(CleanUpConstants.CONTROL_STATEMENTS_CONVERT_FOR_LOOP_TO_ENHANCED), false, false, null); |
| 913 | + public CleanUpRequirements getRequirements() { |
| 914 | + return new CleanUpRequirements(isEnabled(CleanUpConstants.CONTROL_STATEMENTS_CONVERT_FOR_LOOP_TO_ENHANCED), false, false, null); |
915 | 915 | }
|
916 | 916 |
|
917 | 917 | @Override
|
918 |
| - public ICleanUpFixCore createFixCore(CleanUpContextCore context) throws CoreException { |
| 918 | + public ICleanUpFix createFix(CleanUpContext context) throws CoreException { |
919 | 919 | CompilationUnit compilationUnit = context.getAST();
|
920 | 920 | if (compilationUnit == null) {
|
921 | 921 | return null;
|
|
0 commit comments