19
19
20
20
public class EclipseJdtSortMembers {
21
21
22
- private static CompilationUnit compilationUnit (String code , Map < String , String > options , Map < String , String > compilerOptions ) {
22
+ private static CompilationUnit compilationUnit (String code ) {
23
23
return new CompilationUnit (null , null , null ) {
24
24
private final Buffer buffer = new Buffer (code );
25
25
@@ -33,14 +33,14 @@ public JavaProject getJavaProject() {
33
33
return new JavaProject (null , null ) {
34
34
@ Override
35
35
public Map <String , String > getOptions (boolean inheritJavaCoreOptions ) {
36
- return compilerOptions ;
36
+ return Map . of () ;
37
37
}
38
38
};
39
39
}
40
40
41
41
@ Override
42
42
public Map <String , String > getOptions (boolean inheritJavaCoreOptions ) {
43
- return options ;
43
+ return Map . of () ;
44
44
}
45
45
46
46
@ Override
@@ -56,8 +56,12 @@ static String sortMember(String code, SortProperties properties) {
56
56
}
57
57
58
58
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 );
61
65
new Sorter (AST .getJLSLatest (), compilationUnit , null , comparator ).sort ();
62
66
String content = compilationUnit .getBuffer ().getContents ();
63
67
if (content != null ) {
@@ -161,8 +165,6 @@ void sort() throws JavaModelException {
161
165
}
162
166
163
167
static class SortProperties {
164
- final Map <String , String > compilationUnitOptions ;
165
- final Map <String , String > compilerOptions ;
166
168
final boolean doNotSortFields ;
167
169
final boolean enabled ;
168
170
final String membersOrder ;
@@ -174,17 +176,13 @@ static class SortProperties {
174
176
String membersOrder ,
175
177
boolean doNotSortFields ,
176
178
boolean sortByVisibility ,
177
- String visibilityOrder ,
178
- Map <String , String > compilationUnitOptions ,
179
- Map <String , String > compilerOptions
179
+ String visibilityOrder
180
180
) {
181
181
this .enabled = enabled ;
182
182
this .membersOrder = membersOrder ;
183
183
this .doNotSortFields = doNotSortFields ;
184
184
this .sortByVisibility = sortByVisibility ;
185
185
this .visibilityOrder = visibilityOrder ;
186
- this .compilationUnitOptions = compilationUnitOptions ;
187
- this .compilerOptions = compilerOptions ;
188
186
}
189
187
190
188
static SortProperties from (Map <String , String > properties ) {
@@ -196,7 +194,7 @@ static SortProperties from(Map<String, String> properties) {
196
194
// At the moment we see no need for the following options, but they may become important, idk.
197
195
Map <String , String > compilationUnitOptions = Map .of ();
198
196
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 );
200
198
}
201
199
}
202
200
}
0 commit comments