1919
2020public class EclipseJdtSortMembers {
2121
22- private static CompilationUnit compilationUnit (String code , Map < String , String > options , Map < String , String > compilerOptions ) {
22+ private static CompilationUnit compilationUnit (String code ) {
2323 return new CompilationUnit (null , null , null ) {
2424 private final Buffer buffer = new Buffer (code );
2525
@@ -33,14 +33,14 @@ public JavaProject getJavaProject() {
3333 return new JavaProject (null , null ) {
3434 @ Override
3535 public Map <String , String > getOptions (boolean inheritJavaCoreOptions ) {
36- return compilerOptions ;
36+ return Map . of () ;
3737 }
3838 };
3939 }
4040
4141 @ Override
4242 public Map <String , String > getOptions (boolean inheritJavaCoreOptions ) {
43- return options ;
43+ return Map . of () ;
4444 }
4545
4646 @ Override
@@ -56,8 +56,12 @@ static String sortMember(String code, SortProperties properties) {
5656 }
5757
5858 try {
59- CompilationUnit compilationUnit = compilationUnit (code , properties .compilationUnitOptions , properties .compilerOptions );
60- DefaultJavaElementComparator comparator = DefaultJavaElementComparator .of (properties .doNotSortFields , properties .membersOrder , properties .sortByVisibility , properties .visibilityOrder );
59+ CompilationUnit compilationUnit = compilationUnit (code );
60+ DefaultJavaElementComparator comparator = DefaultJavaElementComparator .of (
61+ properties .doNotSortFields ,
62+ properties .membersOrder ,
63+ properties .sortByVisibility ,
64+ properties .visibilityOrder );
6165 new Sorter (AST .getJLSLatest (), compilationUnit , null , comparator ).sort ();
6266 String content = compilationUnit .getBuffer ().getContents ();
6367 if (content != null ) {
@@ -161,8 +165,6 @@ void sort() throws JavaModelException {
161165 }
162166
163167 static class SortProperties {
164- final Map <String , String > compilationUnitOptions ;
165- final Map <String , String > compilerOptions ;
166168 final boolean doNotSortFields ;
167169 final boolean enabled ;
168170 final String membersOrder ;
@@ -174,17 +176,13 @@ static class SortProperties {
174176 String membersOrder ,
175177 boolean doNotSortFields ,
176178 boolean sortByVisibility ,
177- String visibilityOrder ,
178- Map <String , String > compilationUnitOptions ,
179- Map <String , String > compilerOptions
179+ String visibilityOrder
180180 ) {
181181 this .enabled = enabled ;
182182 this .membersOrder = membersOrder ;
183183 this .doNotSortFields = doNotSortFields ;
184184 this .sortByVisibility = sortByVisibility ;
185185 this .visibilityOrder = visibilityOrder ;
186- this .compilationUnitOptions = compilationUnitOptions ;
187- this .compilerOptions = compilerOptions ;
188186 }
189187
190188 static SortProperties from (Map <String , String > properties ) {
@@ -196,7 +194,7 @@ static SortProperties from(Map<String, String> properties) {
196194 // At the moment we see no need for the following options, but they may become important, idk.
197195 Map <String , String > compilationUnitOptions = Map .of ();
198196 Map <String , String > compilerOptions = Map .of ();
199- return new SortProperties (enabled , membersOrder , doNotSortFields , sortByVisibility , visibilityOrder , compilationUnitOptions , compilerOptions );
197+ return new SortProperties (enabled , membersOrder , doNotSortFields , sortByVisibility , visibilityOrder );
200198 }
201199 }
202200}
0 commit comments