diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
index a67b08dd..5aa06d30 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
@@ -459,7 +459,7 @@ public class MediaFileService {
}
// Exclude all hidden files starting with a single "." or "@eaDir" (thumbnail dir created on Synology devices).
- return (name.startsWith(".") && !name.startsWith("..")) || name.startsWith("@eaDir") || name.equals("Thumbs.db");
+ return (name.startsWith(".") && !name.startsWith("..")) || name.startsWith("@eaDir") || "Thumbs.db".equals(name);
}
private MediaFile createMediaFile(File file) {
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java
index 286083b8..14a6191d 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java
@@ -360,17 +360,17 @@ public class JaudiotaggerParser extends MetaDataParser {
String format = FilenameUtils.getExtension(file.getName()).toLowerCase();
- return format.equals("mp3") ||
- format.equals("m4a") ||
- format.equals("m4b") ||
- format.equals("aac") ||
- format.equals("ogg") ||
- format.equals("flac") ||
- format.equals("wav") ||
- format.equals("mpc") ||
- format.equals("mp+") ||
- format.equals("ape") ||
- format.equals("wma");
+ return "mp3".equals(format) ||
+ "m4a".equals(format) ||
+ "m4b".equals(format) ||
+ "aac".equals(format) ||
+ "ogg".equals(format) ||
+ "flac".equals(format) ||
+ "wav".equals(format) ||
+ "mpc".equals(format) ||
+ "mp+".equals(format) ||
+ "ape".equals(format) ||
+ "wma".equals(format);
}
/**
@@ -393,4 +393,4 @@ public class JaudiotaggerParser extends MetaDataParser {
Tag tag = audioFile.getTag();
return tag == null ? null : tag.getFirstArtwork();
}
-}
\ No newline at end of file
+}
diff --git a/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java b/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java
index 5ac408af..864e7d64 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java
@@ -42,7 +42,7 @@ public class CustomThemeSource extends ResourceBundleThemeSource {
// Create parent theme recursively.
for (Theme theme : settingsService.getAvailableThemes()) {
- if (basename.equals(basenamePrefix + theme.getId()) && theme.getParent() != null) {
+ if ((basenamePrefix + theme.getId()).equals(basename) && theme.getParent() != null) {
String parent = basenamePrefix + theme.getParent();
messageSource.setParentMessageSource(createMessageSource(parent));
break;
diff --git a/checkstyle.xml b/checkstyle.xml
index d9c11fdb..264757eb 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -22,6 +22,7 @@
+