Skip to content

Commit 2e27d44

Browse files
committedFeb 28, 2024
Update target platform to latest Eclipse 4.31-I-builds.
- I20240227-1800 is approximately 4.31 RC1 Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
1 parent 6c16211 commit 2e27d44

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed
 

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/RefactorProcessor.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,13 @@
6868
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
6969
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
7070
import org.eclipse.jdt.core.manipulation.ChangeCorrectionProposalCore;
71-
import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
7271
import org.eclipse.jdt.core.manipulation.CleanUpOptionsCore;
73-
import org.eclipse.jdt.core.manipulation.CleanUpRequirementsCore;
74-
import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
7572
import org.eclipse.jdt.internal.core.manipulation.StubUtility;
7673
import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
7774
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
7875
import org.eclipse.jdt.internal.corext.dom.Bindings;
7976
import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
8077
import org.eclipse.jdt.internal.corext.fix.ConvertLoopFixCore;
81-
import org.eclipse.jdt.internal.corext.fix.ICleanUpCore;
8278
import org.eclipse.jdt.internal.corext.fix.IProposableFix;
8379
import org.eclipse.jdt.internal.corext.fix.LambdaExpressionsFixCore;
8480
import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore;
@@ -91,11 +87,9 @@
9187
import org.eclipse.jdt.internal.corext.refactoring.surround.SurroundWithTryCatchRefactoring;
9288
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
9389
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;
9591
import org.eclipse.jdt.internal.ui.fix.LambdaExpressionsCleanUpCore;
9692
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;
9993
import org.eclipse.jdt.internal.ui.text.correction.IProposalRelevance;
10094
import org.eclipse.jdt.internal.ui.text.correction.proposals.ASTRewriteRemoveImportsCorrectionProposalCore;
10195
import org.eclipse.jdt.internal.ui.text.correction.proposals.FixCorrectionProposalCore;
@@ -107,6 +101,12 @@
107101
import org.eclipse.jdt.ls.core.internal.text.correction.ActionMessages;
108102
import org.eclipse.jdt.ls.core.internal.text.correction.RefactorProposalUtility;
109103
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;
110110
import org.eclipse.lsp4j.CodeActionKind;
111111
import org.eclipse.lsp4j.CodeActionParams;
112112
import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
@@ -908,14 +908,14 @@ private static boolean getConvertForLoopProposal(IInvocationContext context, AST
908908
}
909909
Map<String, String> options = new HashMap<>();
910910
options.put(CleanUpConstants.CONTROL_STATEMENTS_CONVERT_FOR_LOOP_TO_ENHANCED, CleanUpOptionsCore.TRUE);
911-
ICleanUpCore cleanUp = new AbstractCleanUpCore(options) {
911+
ICleanUp cleanUp = new AbstractCleanUp(options) {
912912
@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);
915915
}
916916

917917
@Override
918-
public ICleanUpFixCore createFixCore(CleanUpContextCore context) throws CoreException {
918+
public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
919919
CompilationUnit compilationUnit = context.getAST();
920920
if (compilationUnit == null) {
921921
return null;

‎org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<unit id="org.mockito.mockito-core" version="0.0.0"/>
2626
<unit id="org.apache.commons.commons-io" version="0.0.0"/>
2727
<unit id="org.eclipse.jdt.apt.pluggable.core" version="0.0.0"/>
28-
<repository location="https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240207-1800/"/>
28+
<repository location="https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240227-1800/"/>
2929
</location>
3030
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
3131
<unit id="org.eclipse.jdt.core.compiler.batch" version="0.0.0"/>
@@ -69,4 +69,4 @@
6969
</location>
7070
</locations>
7171
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
72-
</target>
72+
</target>

0 commit comments

Comments
 (0)