Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK14 switch - and checkstyle skipping #6250

Merged
merged 3 commits into from
Apr 8, 2020
Merged

JDK14 switch - and checkstyle skipping #6250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acd1530
JDK14 switch - and checkstyle skipping
koppor Mar 29, 2020
e99dea8
Try //CHECKSTYLE:OFF
koppor Apr 6, 2020
afd50ea
Ignore java14 files from checkstyle checking
koppor Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
<property name="header" value=""/>
</module>

<!-- BeforeExecutionFileFilters is required for sources that are based on java14 -->
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value="AuthorAndsReplacer.java|Ordinal.java" />
</module>

<module name="SuppressionFilter">
<property name="file" value="${config_loc}/suppressions.xml"/>
</module>
Expand Down
36 changes: 15 additions & 21 deletions src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,22 @@ public String format(String fieldText) {
return null;
}
String[] authors = fieldText.split(" and ");
String s;

switch (authors.length) {
case 1:
//Does nothing;
s = authors[0];
break;
case 2:
s = authors[0] + " & " + authors[1];
break;
default:
int i;
int x = authors.length;
StringBuilder sb = new StringBuilder();

for (i = 0; i < (x - 2); i++) {
sb.append(authors[i]).append("; ");
//CHECKSTYLE:OFF
String s = switch (authors.length) {
case 1 -> authors[0]; // just no action
case 2 -> authors[0] + " & " + authors[1];
default -> {
int i;
int x = authors.length;
StringBuilder sb = new StringBuilder();
for (i = 0; i < (x - 2); i++) {
sb.append(authors[i]).append("; ");
}
sb.append(authors[i]).append(" & ").append(authors[i + 1]);
yield sb.toString();
}
sb.append(authors[i]).append(" & ").append(authors[i + 1]);
s = sb.toString();
break;
}
};
//CHECKSTYLE:ON

return s;

Expand Down
23 changes: 8 additions & 15 deletions src/main/java/org/jabref/logic/layout/format/Ordinal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,14 @@ public String format(String fieldText) {
while (m.find()) {
String result = m.group(1);
int value = Integer.parseInt(result);
String ordinalString;
switch (value) {
case 1:
ordinalString = "st";
break;
case 2:
ordinalString = "nd";
break;
case 3:
ordinalString = "rd";
break;
default:
ordinalString = "th";
break;
}
//CHECKSTYLE:OFF
String ordinalString = switch (value) {
case 1 -> "st";
case 2 -> "nd";
case 3 -> "rd";
default -> "th";
};
//CHECKSTYLE:ON
m.appendReplacement(sb, result + ordinalString);
}
m.appendTail(sb);
Expand Down