Skip to content

Commit 3479f4f

Browse files
committed
QOL changes
allow comments and empty lines in the AT file
1 parent f78fea3 commit 3479f4f

2 files changed

Lines changed: 7 additions & 22 deletions

File tree

src/main/java/org/dimdev/accesstransform/AccessLevel.java

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.dimdev.accesstransform;
22

3+
import java.util.Locale;
4+
35
public class AccessLevel {
46
public enum Visibility {
57
PRIVATE,
@@ -30,32 +32,13 @@ public static AccessLevel union(AccessLevel first, AccessLevel second) {
3032
}
3133

3234
public static AccessLevel fromString(String string) {
35+
string = string.toUpperCase(Locale.ROOT);
3336
boolean isFinal = true;
34-
if (string.endsWith("-f")) {
37+
if (string.endsWith("-F")) {
3538
isFinal = false;
3639
string = string.substring(0, string.length() - 2);
3740
}
3841

39-
switch (string) {
40-
case "private": {
41-
return new AccessLevel(Visibility.PRIVATE, isFinal);
42-
}
43-
44-
case "default": {
45-
return new AccessLevel(Visibility.DEFAULT, isFinal);
46-
}
47-
48-
case "protected": {
49-
return new AccessLevel(Visibility.PROTECTED, isFinal);
50-
}
51-
52-
case "public": {
53-
return new AccessLevel(Visibility.PUBLIC, isFinal);
54-
}
55-
56-
default: {
57-
throw new RuntimeException("Unknown visibility '" + string + "'");
58-
}
59-
}
42+
return new AccessLevel(Visibility.valueOf(string), isFinal);
6043
}
6144
}

src/main/java/org/dimdev/accesstransform/AccessTransformationSet.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public void addMimimumAccessLevel(ElementReference elementReference, AccessLevel
1515
}
1616

1717
public void addMinimumAccessLevel(String string) {
18+
string = string.trim();
19+
if(string.isEmpty() || string.startsWith("#")) return;
1820
int indexOfFirstSpace = string.indexOf(' ');
1921
String accessLevel = string.substring(0, indexOfFirstSpace);
2022
String elementReference = string.substring(indexOfFirstSpace + 1);

0 commit comments

Comments
 (0)