Skip to content

Commit 634a1ff

Browse files
committed
Upgrade to Eclipse 2023-12
Closes gh-401
1 parent 9a3a443 commit 634a1ff

File tree

2 files changed

+3
-3
lines changed
  • spring-javaformat/spring-javaformat-formatter-eclipse-rewriter/src/main/java/io/spring/javaformat/formatter/eclipse/rewrite

2 files changed

+3
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<java.version>1.8</java.version>
3434
<eclipse.jdk8.repository>https://download.eclipse.org/releases/2021-03/202103171000/</eclipse.jdk8.repository>
35-
<eclipse.jdk17.repository>https://download.eclipse.org/releases/2022-12/202212071000/</eclipse.jdk17.repository>
35+
<eclipse.jdk17.repository>https://download.eclipse.org/releases/2023-12/202312061001/</eclipse.jdk17.repository>
3636
<eclipse.checkstyle.repository>https://checkstyle.org/eclipse-cs-update-site/</eclipse.checkstyle.repository>
3737
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
3838
<ant.version>1.8.1</ant.version>

spring-javaformat/spring-javaformat-formatter-eclipse-rewriter/src/main/java/io/spring/javaformat/formatter/eclipse/rewrite/EclipseRewriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ private static class DefaultCodeFormatterManipulator extends ClassVisitor {
116116

117117
@Override
118118
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
119-
if (access == Opcodes.ACC_PRIVATE && UPDATED_FIELDS.contains(name)) {
119+
if ((access & Opcodes.ACC_PRIVATE) != 0 && UPDATED_FIELDS.contains(name)) {
120120
access = Opcodes.ACC_PROTECTED;
121121
}
122122
return super.visitField(access, name, desc, signature, value);
123123
}
124124

125125
@Override
126126
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
127-
if (access == Opcodes.ACC_PRIVATE && UPDATED_METHODS.contains(name)) {
127+
if ((access & Opcodes.ACC_PRIVATE) != 0 && UPDATED_METHODS.contains(name)) {
128128
access = Opcodes.ACC_PROTECTED;
129129
}
130130
return new DefaultCodeFormatterMethodManipulator(

0 commit comments

Comments
 (0)