From 15ddb197d46d04d597060f691daef63107f2a2c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helge=20Stenstr=C3=B6m?= Date: Fri, 25 Aug 2023 23:13:59 +0200 Subject: [PATCH] Fixing code style issues DJDiscResizer.main: C-style array type declaration Viewer.init : .size() == 0 replaced with .isEmpty() MainTools.countDownloads: string literal replaced with StandardCharsets.UTF_8 ProgressOutputStream.Listener.progress: removed reduntant public modifier FlipPanel, Library, Media, SmartController, User, XPlayerModel: removed reduntant qualifier for 'this' Multiple files: removed unnecessary semicolon, mostly for enums. --- .../goxr3plus/xr3player/application/MainTools.java | 3 ++- .../xr3player/controllers/custom/DJDisc.java | 4 ++-- .../xr3player/controllers/custom/DJDiscResizer.java | 2 +- .../xr3player/controllers/custom/DJFilter.java | 4 ++-- .../xr3player/controllers/custom/FlipPanel.java | 4 ++-- .../xr3player/controllers/custom/SystemMonitor.java | 4 ++-- .../controllers/dropbox/ProgressOutputStream.java | 2 +- .../general/OnlineMusicBoxController.java | 4 ++-- .../xr3player/controllers/general/SearchBox.java | 4 ++-- .../xr3player/controllers/general/TopBar.java | 4 ++-- .../xr3player/controllers/general/Viewer.java | 2 +- .../xr3player/controllers/librarymode/Library.java | 12 ++++++------ .../xr3player/controllers/loginmode/User.java | 4 ++-- .../settings/ApplicationSettingsController.java | 4 ++-- .../controllers/smartcontroller/SmartController.java | 8 ++++---- .../smartcontroller/SmartControllerMode.java | 2 +- .../controllers/windows/ConsoleWindowController.java | 4 ++-- .../xr3player/controllers/windows/StarWindow.java | 4 ++-- .../xr3player/database/DatabaseManager.java | 2 +- .../com/goxr3plus/xr3player/enums/AudioType.java | 2 +- .../goxr3plus/xr3player/enums/DropBoxOperation.java | 2 +- .../com/goxr3plus/xr3player/enums/FileCategory.java | 2 +- .../com/goxr3plus/xr3player/enums/FileLinkType.java | 2 +- .../java/com/goxr3plus/xr3player/enums/FileType.java | 2 +- .../com/goxr3plus/xr3player/enums/FilesMode.java | 2 +- .../java/com/goxr3plus/xr3player/enums/Genre.java | 2 +- .../goxr3plus/xr3player/enums/NotificationType.java | 2 +- .../com/goxr3plus/xr3player/enums/Operation.java | 2 +- .../goxr3plus/xr3player/enums/TagTabCategory.java | 2 +- .../com/goxr3plus/xr3player/enums/UserCategory.java | 2 +- .../xr3player/models/smartcontroller/Media.java | 4 ++-- .../xr3player/models/xplayer/XPlayerModel.java | 6 +++--- .../xr3player/services/general/StoppableService.java | 4 ++-- .../services/loginmode/UsersLoaderService.java | 2 +- .../services/smartcontroller/FilesExportService.java | 2 +- .../services/smartcontroller/FiltersModeService.java | 6 +++--- .../services/smartcontroller/FoldersModeService.java | 2 +- .../services/smartcontroller/MediaTagsService.java | 4 ++-- .../xplayer/dsp/KJDSPAudioDataConsumer.java | 8 ++++---- .../xr3player/xplayer/microphone/Microphone.java | 4 ++-- .../xplayer/microphone/MicrophoneAnalyzer.java | 3 +-- .../presenter/VisualizerWindowController.java | 4 ++-- .../xr3player/xplayer/waveform/WaveFormService.java | 4 ++-- 43 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/main/java/com/goxr3plus/xr3player/application/MainTools.java b/src/main/java/com/goxr3plus/xr3player/application/MainTools.java index e9554638..8de7f9f9 100644 --- a/src/main/java/com/goxr3plus/xr3player/application/MainTools.java +++ b/src/main/java/com/goxr3plus/xr3player/application/MainTools.java @@ -5,6 +5,7 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Optional; @@ -70,7 +71,7 @@ public static void countDownloads() { // ---------------------- COUNT TOTAL GITHUB DOWNLOADS ---------------------- final String text2 = "GitHub: [ " + Arrays .stream(IOUtils - .toString(new URL("https://api.github.com/repos/goxr3plus/XR3Player/releases"), "UTF-8") + .toString(new URL("https://api.github.com/repos/goxr3plus/XR3Player/releases"), StandardCharsets.UTF_8) .split("\"download_count\":")) .skip(1).mapToInt(l -> Integer.parseInt(l.split(",")[0])).sum() + " ]"; Platform.runLater(() -> Main.loginMode.getGitHubDownloadsLabel().setText(text2)); diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJDisc.java b/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJDisc.java index d2a933ab..51f691a1 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJDisc.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJDisc.java @@ -57,8 +57,8 @@ private enum TimeMode { /** The normal. */ NORMAL, /** The reversed. */ - REVERSED; - } + REVERSED + } /** The angle. */ private int angle; diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJDiscResizer.java b/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJDiscResizer.java index 63c729e3..f47cc182 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJDiscResizer.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJDiscResizer.java @@ -59,7 +59,7 @@ public void reCalculateCanvasSize() { * * @param args */ - public static void main(String args[]) { + public static void main(String[] args) { launch(args); } } diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJFilter.java b/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJFilter.java index 71ba8ee8..1af36802 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJFilter.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/custom/DJFilter.java @@ -25,8 +25,8 @@ public class DJFilter extends StackPane { public enum DJFilterCategory { - EQUALIZER_FILTER, VOLUME_FILTER; - } + EQUALIZER_FILTER, VOLUME_FILTER + } /** The listeners. */ private final ArrayList listeners = new ArrayList<>(); diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/custom/FlipPanel.java b/src/main/java/com/goxr3plus/xr3player/controllers/custom/FlipPanel.java index c163c0f9..0a9670ab 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/custom/FlipPanel.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/custom/FlipPanel.java @@ -92,7 +92,7 @@ public void flipToFront() { flipToFront.setOnFinished(event -> { front.setCache(false); back.setCache(false); - fireEvent(new FlipEvent(FlipPanel.this, FlipPanel.this, FlipEvent.FLIP_TO_FRONT_FINISHED)); + fireEvent(new FlipEvent(this, this, FlipEvent.FLIP_TO_FRONT_FINISHED)); }); flipToFront.play(); } @@ -114,7 +114,7 @@ public void flipToBack() { flipToBack.setOnFinished(event -> { front.setCache(false); back.setCache(false); - fireEvent(new FlipEvent(FlipPanel.this, FlipPanel.this, FlipEvent.FLIP_TO_BACK_FINISHED)); + fireEvent(new FlipEvent(this, this, FlipEvent.FLIP_TO_BACK_FINISHED)); }); flipToBack.play(); } diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/custom/SystemMonitor.java b/src/main/java/com/goxr3plus/xr3player/controllers/custom/SystemMonitor.java index 20d63a9f..f2036d63 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/custom/SystemMonitor.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/custom/SystemMonitor.java @@ -54,8 +54,8 @@ public enum Monitor { /** * Monitor the RAM */ - RAM; - } + RAM + } /** The monitor. */ private Monitor monitor; diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/dropbox/ProgressOutputStream.java b/src/main/java/com/goxr3plus/xr3player/controllers/dropbox/ProgressOutputStream.java index b2b98372..ede085a3 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/dropbox/ProgressOutputStream.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/dropbox/ProgressOutputStream.java @@ -61,6 +61,6 @@ public long getTotalSize() { } public interface Listener { - public void progress(long completed, long totalSize); + void progress(long completed, long totalSize); } } diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/general/OnlineMusicBoxController.java b/src/main/java/com/goxr3plus/xr3player/controllers/general/OnlineMusicBoxController.java index 7d2bca0d..6637e2eb 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/general/OnlineMusicBoxController.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/general/OnlineMusicBoxController.java @@ -39,8 +39,8 @@ public class OnlineMusicBoxController extends StackPane { // Online-Music-Categories public enum OnlineMusicCategory { - RECOMMENDED, GENRES, ACTIVITIES, MOOD, EDITORSPICK, CHARTS; - } + RECOMMENDED, GENRES, ACTIVITIES, MOOD, EDITORSPICK, CHARTS + } private final OnlineMusicCategory category; diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/general/SearchBox.java b/src/main/java/com/goxr3plus/xr3player/controllers/general/SearchBox.java index 12aec00c..cbcf285e 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/general/SearchBox.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/general/SearchBox.java @@ -48,8 +48,8 @@ public class SearchBox extends HBox { public enum SearchBoxType { - LIBRARYSEARCHBOX, USERSSEARCHBOX; - } + LIBRARYSEARCHBOX, USERSSEARCHBOX + } private final SearchBoxType searchBoxType; diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/general/TopBar.java b/src/main/java/com/goxr3plus/xr3player/controllers/general/TopBar.java index c55c537e..b3dd992f 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/general/TopBar.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/general/TopBar.java @@ -78,9 +78,9 @@ public enum WindowMode { /** * The window is on movie mode */ - MOVIEMODE; + MOVIEMODE - } + } /** * Constructor. diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/general/Viewer.java b/src/main/java/com/goxr3plus/xr3player/controllers/general/Viewer.java index a51c3aae..05d78299 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/general/Viewer.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/general/Viewer.java @@ -167,7 +167,7 @@ else if (key.getCode() == KeyCode.BACK_SPACE) searchWord.set(""); else if (key.getCode() == KeyCode.A && key.isControlDown()) { if (libraryMode != null) - if (getItemsObservableList().size() == 0) + if (getItemsObservableList().isEmpty()) getItemsObservableList().forEach(library -> ((Library) library).setSelected(true)); else { boolean select = !((Library) getItemsObservableList().get(0)).isSelected(); diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/librarymode/Library.java b/src/main/java/com/goxr3plus/xr3player/controllers/librarymode/Library.java index f65fadfe..dcf4b1c8 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/librarymode/Library.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/librarymode/Library.java @@ -151,7 +151,7 @@ public enum SaveMode { /** * Songs have been copied into the database. */ - DATABASE_PATH; + DATABASE_PATH } /** @@ -486,7 +486,7 @@ private void initialize() { nameLabel.getTooltip().setText(libraryName); nameLabel.setOnMouseReleased(m -> { if (m.getButton() == MouseButton.PRIMARY && m.getClickCount() == 2 - && Main.libraryMode.viewer.centerItemProperty().get() == Library.this)// Main.libraryMode.teamViewer.getTimeline().getStatus() + && Main.libraryMode.viewer.centerItemProperty().get() == this)// Main.libraryMode.teamViewer.getTimeline().getStatus() // != Status.RUNNING) renameLibrary(nameLabel); }); @@ -497,13 +497,13 @@ private void initialize() { ratingLabel.textProperty().bind(starsProperty().asString()); ratingLabel.setOnMouseReleased(m -> { if (m.getButton() == MouseButton.PRIMARY - && Main.libraryMode.viewer.centerItemProperty().get() == Library.this) + && Main.libraryMode.viewer.centerItemProperty().get() == this) updateLibraryStars(ratingLabel); }); // ----InformationLabel informationLabel.setOnMouseReleased(m -> { - if (Main.libraryMode.viewer.centerItemProperty().get() == Library.this) + if (Main.libraryMode.viewer.centerItemProperty().get() == this) Main.libraryMode.libraryInformation.showWindow(this); }); @@ -597,7 +597,7 @@ public void updateStars(final double stars) { if (setStars(stars)) { // Try try (PreparedStatement libUStars = Main.dbManager.getConnection() - .prepareStatement("UPDATE LIBRARIES SET STARS=? WHERE NAME=?;");) { + .prepareStatement("UPDATE LIBRARIES SET STARS=? WHERE NAME=?;")) { // SQLITE COMMIT libUStars.setDouble(1, stars); @@ -933,7 +933,7 @@ public void finalizeLibraryDelete(final List list) { } public enum LibraryStatus { - OPENED, CLOSED; + OPENED, CLOSED } /** diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/loginmode/User.java b/src/main/java/com/goxr3plus/xr3player/controllers/loginmode/User.java index 99bb9871..0feb5d6f 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/loginmode/User.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/loginmode/User.java @@ -231,7 +231,7 @@ private void initialize() { nameField.getTooltip().setText(getName()); nameField.setOnMouseReleased(m -> { if (m.getButton() == MouseButton.PRIMARY && m.getClickCount() == 2 - && Main.loginMode.viewer.centerItemProperty().get() == User.this)// Main.loginMode.teamViewer.getTimeline().getStatus() + && Main.loginMode.viewer.centerItemProperty().get() == this)// Main.loginMode.teamViewer.getTimeline().getStatus() // != Status.RUNNING) renameUser(nameField); }); @@ -251,7 +251,7 @@ private void initialize() { * Open display information stack pane for this user */ public void displayInformation() { - if (Main.loginMode.viewer.centerItemProperty().get() == User.this) + if (Main.loginMode.viewer.centerItemProperty().get() == this) Main.loginMode.userInformation.displayForUser(this); } diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/settings/ApplicationSettingsController.java b/src/main/java/com/goxr3plus/xr3player/controllers/settings/ApplicationSettingsController.java index cc5cabfb..8bf14e78 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/settings/ApplicationSettingsController.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/settings/ApplicationSettingsController.java @@ -36,8 +36,8 @@ public class ApplicationSettingsController extends BorderPane { * */ public enum SettingsTab { - GENERERAL, LIBRARIES, PLAYLISTS, SHORTCUTS, XPLAYERS, ANYONE; - } + GENERERAL, LIBRARIES, PLAYLISTS, SHORTCUTS, XPLAYERS, ANYONE + } @FXML private Button restoreAllSettings; diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/smartcontroller/SmartController.java b/src/main/java/com/goxr3plus/xr3player/controllers/smartcontroller/SmartController.java index edfb98d0..531d1c48 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/smartcontroller/SmartController.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/smartcontroller/SmartController.java @@ -247,8 +247,8 @@ public class SmartController extends StackPane { // ---------Security--------------------------- public enum WorkOnProgress { - NONE, INSERTING_FILES, DELETE_FILES, RENAMING_LIBRARY, UPDATING_PLAYLIST, SEARCHING_FILES, EXPORTING_FILES; - } + NONE, INSERTING_FILES, DELETE_FILES, RENAMING_LIBRARY, UPDATING_PLAYLIST, SEARCHING_FILES, EXPORTING_FILES + } public volatile WorkOnProgress workOnProgress = WorkOnProgress.NONE; @@ -886,7 +886,7 @@ public void unbind() { * Goes on the Previous List. */ public void goPrevious() { - if (SmartController.this.genre != Genre.SEARCHWINDOW && isFree(false) && !searchService.isActive() + if (this.genre != Genre.SEARCHWINDOW && isFree(false) && !searchService.isActive() && totalInDataBase.get() != 0 && currentPage.get() > 0) { currentPage.set(currentPage.get() - 1); loadService.startService(false, true, false); @@ -897,7 +897,7 @@ public void goPrevious() { * Goes on the Next List. */ public void goNext() { - if (SmartController.this.genre != Genre.SEARCHWINDOW && isFree(false) && !searchService.isActive() + if (this.genre != Genre.SEARCHWINDOW && isFree(false) && !searchService.isActive() && totalInDataBase.get() != 0 && currentPage.get() < getMaximumList()) { currentPage.set(currentPage.get() + 1); loadService.startService(false, true, false); diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/smartcontroller/SmartControllerMode.java b/src/main/java/com/goxr3plus/xr3player/controllers/smartcontroller/SmartControllerMode.java index fff2e3ee..d38b3081 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/smartcontroller/SmartControllerMode.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/smartcontroller/SmartControllerMode.java @@ -8,5 +8,5 @@ */ public enum SmartControllerMode { - MEDIA, ASSOCIATED_FOLDERS, FILTERS_MODE; + MEDIA, ASSOCIATED_FOLDERS, FILTERS_MODE } diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/windows/ConsoleWindowController.java b/src/main/java/com/goxr3plus/xr3player/controllers/windows/ConsoleWindowController.java index 77569872..103b4e9a 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/windows/ConsoleWindowController.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/windows/ConsoleWindowController.java @@ -77,8 +77,8 @@ public class ConsoleWindowController extends StackPane { * */ public enum ConsoleTab { - CONSOLE, SPEECH_RECOGNITION; - } + CONSOLE, SPEECH_RECOGNITION + } /** * Constructor diff --git a/src/main/java/com/goxr3plus/xr3player/controllers/windows/StarWindow.java b/src/main/java/com/goxr3plus/xr3player/controllers/windows/StarWindow.java index 9bb77a44..f57285e0 100644 --- a/src/main/java/com/goxr3plus/xr3player/controllers/windows/StarWindow.java +++ b/src/main/java/com/goxr3plus/xr3player/controllers/windows/StarWindow.java @@ -57,9 +57,9 @@ public class StarWindow extends GridPane { // ------------------------------------- /** The window. */ - private final Stage window = new Stage();; + private final Stage window = new Stage(); - /** The gc. */ + /** The gc. */ private GraphicsContext gc; /** The stars position. */ diff --git a/src/main/java/com/goxr3plus/xr3player/database/DatabaseManager.java b/src/main/java/com/goxr3plus/xr3player/database/DatabaseManager.java index 4ae88313..7d2ebcf4 100644 --- a/src/main/java/com/goxr3plus/xr3player/database/DatabaseManager.java +++ b/src/main/java/com/goxr3plus/xr3player/database/DatabaseManager.java @@ -366,7 +366,7 @@ protected Void call() throws Exception { try (ResultSet resultSet = getConnection().createStatement() .executeQuery("SELECT* FROM LIBRARIES;"); ResultSet dbCounter = getConnection().createStatement() - .executeQuery("SELECT COUNT(NAME) FROM LIBRARIES;");) { + .executeQuery("SELECT COUNT(NAME) FROM LIBRARIES;")) { totalLibraries = dbCounter.getInt(1); diff --git a/src/main/java/com/goxr3plus/xr3player/enums/AudioType.java b/src/main/java/com/goxr3plus/xr3player/enums/AudioType.java index 5b6ffccd..368d0e65 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/AudioType.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/AudioType.java @@ -22,5 +22,5 @@ public enum AudioType { /** * Audio is UNKOWN */ - UNKNOWN; + UNKNOWN } \ No newline at end of file diff --git a/src/main/java/com/goxr3plus/xr3player/enums/DropBoxOperation.java b/src/main/java/com/goxr3plus/xr3player/enums/DropBoxOperation.java index d6369b9e..dc10fa86 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/DropBoxOperation.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/DropBoxOperation.java @@ -1,5 +1,5 @@ package com.goxr3plus.xr3player.enums; public enum DropBoxOperation { - REFRESH, SEARCH, CREATE_FOLDER, DELETE, PERMANENTLY_DELETE, RENAME, STOPPED; + REFRESH, SEARCH, CREATE_FOLDER, DELETE, PERMANENTLY_DELETE, RENAME, STOPPED } \ No newline at end of file diff --git a/src/main/java/com/goxr3plus/xr3player/enums/FileCategory.java b/src/main/java/com/goxr3plus/xr3player/enums/FileCategory.java index 61437eb0..48df957f 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/FileCategory.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/FileCategory.java @@ -2,6 +2,6 @@ public enum FileCategory { - DIRECTORY, FILE; + DIRECTORY, FILE } diff --git a/src/main/java/com/goxr3plus/xr3player/enums/FileLinkType.java b/src/main/java/com/goxr3plus/xr3player/enums/FileLinkType.java index 01b33de0..ed6047b8 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/FileLinkType.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/FileLinkType.java @@ -6,5 +6,5 @@ */ public enum FileLinkType { - SYMBOLIC_LINK, HARD_LINK, SHORTCUT, ORIGINAL_FILE, UNKNOWN; + SYMBOLIC_LINK, HARD_LINK, SHORTCUT, ORIGINAL_FILE, UNKNOWN } diff --git a/src/main/java/com/goxr3plus/xr3player/enums/FileType.java b/src/main/java/com/goxr3plus/xr3player/enums/FileType.java index af8964c6..bdf095fe 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/FileType.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/FileType.java @@ -7,5 +7,5 @@ * */ public enum FileType { - DIRECTORY, FILE, ZIP; + DIRECTORY, FILE, ZIP } \ No newline at end of file diff --git a/src/main/java/com/goxr3plus/xr3player/enums/FilesMode.java b/src/main/java/com/goxr3plus/xr3player/enums/FilesMode.java index 66d91ab4..983c659e 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/FilesMode.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/FilesMode.java @@ -16,6 +16,6 @@ public enum FilesMode { SELECTED_MEDIA, - EVERYTHING_ON_PLAYLIST; + EVERYTHING_ON_PLAYLIST } diff --git a/src/main/java/com/goxr3plus/xr3player/enums/Genre.java b/src/main/java/com/goxr3plus/xr3player/enums/Genre.java index 63e2075a..b493d853 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/Genre.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/Genre.java @@ -21,6 +21,6 @@ public enum Genre { // /** The radiostation. */ // RADIOSTATION, /** The unknown. */ - BUYBUTTON, UNKNOWN; + BUYBUTTON, UNKNOWN } diff --git a/src/main/java/com/goxr3plus/xr3player/enums/NotificationType.java b/src/main/java/com/goxr3plus/xr3player/enums/NotificationType.java index 0d21c3f8..be26a334 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/NotificationType.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/NotificationType.java @@ -26,6 +26,6 @@ public enum NotificationType { ERROR, /** The success. */ - SUCCESS; + SUCCESS } diff --git a/src/main/java/com/goxr3plus/xr3player/enums/Operation.java b/src/main/java/com/goxr3plus/xr3player/enums/Operation.java index 73121456..269306c9 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/Operation.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/Operation.java @@ -18,6 +18,6 @@ public enum Operation { /** The refresh. */ REFRESH, /** The update */ - UPDATE_TABLE_VIEW, UNKNOWN; + UPDATE_TABLE_VIEW, UNKNOWN } diff --git a/src/main/java/com/goxr3plus/xr3player/enums/TagTabCategory.java b/src/main/java/com/goxr3plus/xr3player/enums/TagTabCategory.java index 5c360f32..7d79e23d 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/TagTabCategory.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/TagTabCategory.java @@ -2,6 +2,6 @@ public enum TagTabCategory { - ARTWORK, BASICINFO, CURRENT, ID3V1, ID3V2; + ARTWORK, BASICINFO, CURRENT, ID3V1, ID3V2 } diff --git a/src/main/java/com/goxr3plus/xr3player/enums/UserCategory.java b/src/main/java/com/goxr3plus/xr3player/enums/UserCategory.java index e60f6c47..e0d42452 100644 --- a/src/main/java/com/goxr3plus/xr3player/enums/UserCategory.java +++ b/src/main/java/com/goxr3plus/xr3player/enums/UserCategory.java @@ -1,5 +1,5 @@ package com.goxr3plus.xr3player.enums; public enum UserCategory { - LOGGED_IN, NO_LOGGED_IN; + LOGGED_IN, NO_LOGGED_IN } \ No newline at end of file diff --git a/src/main/java/com/goxr3plus/xr3player/models/smartcontroller/Media.java b/src/main/java/com/goxr3plus/xr3player/models/smartcontroller/Media.java index 6ad67daa..a130f495 100644 --- a/src/main/java/com/goxr3plus/xr3player/models/smartcontroller/Media.java +++ b/src/main/java/com/goxr3plus/xr3player/models/smartcontroller/Media.java @@ -1045,11 +1045,11 @@ private void internalDataBaseUpdateStars(final SmartController smartController) preparedUStars.setString(2, getFilePath()); if (preparedUStars.executeUpdate() > 0) {// && controller1 != controller) //Check smartController.getItemsObservableList().forEach(media -> { - if (media.getFilePath().equals(Media.this.getFilePath())) + if (media.getFilePath().equals(this.getFilePath())) media.starsProperty().set(stars.get()); }); smartController.getFiltersMode().getMediaTableViewer().getTableView().getItems().forEach(media -> { - if (media.getFilePath().equals(Media.this.getFilePath())) + if (media.getFilePath().equals(this.getFilePath())) media.starsProperty().set(stars.get()); }); } diff --git a/src/main/java/com/goxr3plus/xr3player/models/xplayer/XPlayerModel.java b/src/main/java/com/goxr3plus/xr3player/models/xplayer/XPlayerModel.java index 56d400d7..3edf3aab 100644 --- a/src/main/java/com/goxr3plus/xr3player/models/xplayer/XPlayerModel.java +++ b/src/main/java/com/goxr3plus/xr3player/models/xplayer/XPlayerModel.java @@ -39,9 +39,9 @@ public class XPlayerModel { * Constructor. */ public XPlayerModel() { - songObject = new SimpleObjectProperty<>(XPlayerModel.this, "songObject", null); - songExtension = new SimpleStringProperty(XPlayerModel.this, "songExtension", null); - songPath = new SimpleStringProperty(XPlayerModel.this, "songPath", null); + songObject = new SimpleObjectProperty<>(this, "songObject", null); + songExtension = new SimpleStringProperty(this, "songExtension", null); + songPath = new SimpleStringProperty(this, "songPath", null); equalizerArray = new float[32]; } diff --git a/src/main/java/com/goxr3plus/xr3player/services/general/StoppableService.java b/src/main/java/com/goxr3plus/xr3player/services/general/StoppableService.java index 7e1a734b..5c541bef 100644 --- a/src/main/java/com/goxr3plus/xr3player/services/general/StoppableService.java +++ b/src/main/java/com/goxr3plus/xr3player/services/general/StoppableService.java @@ -12,8 +12,8 @@ public class StoppableService extends Service { public enum StoppableServiceCategory { - INTERNET_CHECKER, TIMER_CHECKER; - } + INTERNET_CHECKER, TIMER_CHECKER + } private final StoppableServiceCategory category; diff --git a/src/main/java/com/goxr3plus/xr3player/services/loginmode/UsersLoaderService.java b/src/main/java/com/goxr3plus/xr3player/services/loginmode/UsersLoaderService.java index e90789d1..5df5ca83 100644 --- a/src/main/java/com/goxr3plus/xr3player/services/loginmode/UsersLoaderService.java +++ b/src/main/java/com/goxr3plus/xr3player/services/loginmode/UsersLoaderService.java @@ -154,7 +154,7 @@ else if (!accessTokens.isEmpty()) // Check if we have one access token try (Connection connection = DriverManager .getConnection("jdbc:sqlite:" + dbFileAbsolutePath); ResultSet dbCounter = connection.createStatement() - .executeQuery("SELECT COUNT(NAME) FROM LIBRARIES;");) { + .executeQuery("SELECT COUNT(NAME) FROM LIBRARIES;")) { final int[] totalLibraries = {0}; totalLibraries[0] += dbCounter.getInt(1); diff --git a/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FilesExportService.java b/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FilesExportService.java index 4bad5b32..cefa84ae 100644 --- a/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FilesExportService.java +++ b/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FilesExportService.java @@ -190,7 +190,7 @@ protected Boolean call() throws Exception { // Stream try (ResultSet resultSet = Main.dbManager.getConnection().createStatement() - .executeQuery("SELECT* FROM '" + smartController.getDataBaseTableName() + "'");) { + .executeQuery("SELECT* FROM '" + smartController.getDataBaseTableName() + "'")) { // Make a list of all the items final List list = new ArrayList<>(); diff --git a/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FiltersModeService.java b/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FiltersModeService.java index 58d3de75..e0ed15d1 100644 --- a/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FiltersModeService.java +++ b/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FiltersModeService.java @@ -46,8 +46,8 @@ public class FiltersModeService extends Service { private enum Filter { - ARTIST, ALBUM, GENRE, YEAR, BPM, KEY, COMPOSER, BIT_RATE; - } + ARTIST, ALBUM, GENRE, YEAR, BPM, KEY, COMPOSER, BIT_RATE + } /** * The operation to be done by the Service @@ -225,7 +225,7 @@ protected Void call() throws Exception { String query = "SELECT" + (operation == Operation.UPDATE_TABLE_VIEW ? "*" : "(PATH)") + "FROM '" + smartControllerArtistsMode.getSmartController().getDataBaseTableName() + "'"; try (ResultSet resultSet = Main.dbManager.getConnection().createStatement() - .executeQuery(query);) { + .executeQuery(query)) { int counter = 0; // Fetch the items from the database diff --git a/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FoldersModeService.java b/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FoldersModeService.java index b42e66b4..f7e53d50 100644 --- a/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FoldersModeService.java +++ b/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/FoldersModeService.java @@ -153,7 +153,7 @@ protected Void call() throws Exception { String query = "SELECT(PATH) FROM '" + smartControllerFoldersMode.getSmartController().getDataBaseTableName() + "'"; try (ResultSet resultSet = Main.dbManager.getConnection().createStatement() - .executeQuery(query);) { + .executeQuery(query)) { // Fetch the items from the database while (resultSet.next()) diff --git a/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/MediaTagsService.java b/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/MediaTagsService.java index 294e8d22..4336e343 100644 --- a/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/MediaTagsService.java +++ b/src/main/java/com/goxr3plus/xr3player/services/smartcontroller/MediaTagsService.java @@ -33,8 +33,8 @@ public class MediaTagsService extends Service { public enum AllDetailsServiceOperation { - ALL, TAGS, ARTWORK_COLUMN; - } + ALL, TAGS, ARTWORK_COLUMN + } /** * Constructor diff --git a/src/main/java/com/goxr3plus/xr3player/xplayer/dsp/KJDSPAudioDataConsumer.java b/src/main/java/com/goxr3plus/xr3player/xplayer/dsp/KJDSPAudioDataConsumer.java index 5f60b8a5..6fa68c1d 100644 --- a/src/main/java/com/goxr3plus/xr3player/xplayer/dsp/KJDSPAudioDataConsumer.java +++ b/src/main/java/com/goxr3plus/xr3player/xplayer/dsp/KJDSPAudioDataConsumer.java @@ -80,8 +80,8 @@ public enum ChannelMode { MONO, /** The stereo. */ - STEREO; - } + STEREO + } /** * Indicates the Type of The Sample. @@ -94,8 +94,8 @@ public enum SampleType { EIGHT_BIT, /** The sixteen bit. */ - SIXTEEN_BIT; - } + SIXTEEN_BIT + } /** * Default constructor creates a DSPAC with DEFAULT_SAMPLE_SIZE and DEFAULT_FPS diff --git a/src/main/java/com/goxr3plus/xr3player/xplayer/microphone/Microphone.java b/src/main/java/com/goxr3plus/xr3player/xplayer/microphone/Microphone.java index 86442dff..eae4eaa4 100644 --- a/src/main/java/com/goxr3plus/xr3player/xplayer/microphone/Microphone.java +++ b/src/main/java/com/goxr3plus/xr3player/xplayer/microphone/Microphone.java @@ -27,8 +27,8 @@ public class Microphone implements Closeable { * Enum for current Microphone state */ public enum CaptureState { - PROCESSING_AUDIO, STARTING_CAPTURE, CLOSED; - } + PROCESSING_AUDIO, STARTING_CAPTURE, CLOSED + } /** * Variable for enum diff --git a/src/main/java/com/goxr3plus/xr3player/xplayer/microphone/MicrophoneAnalyzer.java b/src/main/java/com/goxr3plus/xr3player/xplayer/microphone/MicrophoneAnalyzer.java index 9d30d429..4a2220be 100644 --- a/src/main/java/com/goxr3plus/xr3player/xplayer/microphone/MicrophoneAnalyzer.java +++ b/src/main/java/com/goxr3plus/xr3player/xplayer/microphone/MicrophoneAnalyzer.java @@ -281,8 +281,7 @@ private int findMaxMagnitude(Complex[] input) { double tmp = c.getMagnitude(); if (tmp > max) { max = tmp; - ; - index = i; + index = i; } } return index; diff --git a/src/main/java/com/goxr3plus/xr3player/xplayer/visualizer/presenter/VisualizerWindowController.java b/src/main/java/com/goxr3plus/xr3player/xplayer/visualizer/presenter/VisualizerWindowController.java index 345e8bc3..2f341a09 100644 --- a/src/main/java/com/goxr3plus/xr3player/xplayer/visualizer/presenter/VisualizerWindowController.java +++ b/src/main/java/com/goxr3plus/xr3player/xplayer/visualizer/presenter/VisualizerWindowController.java @@ -300,8 +300,8 @@ public String toString() { public String toString() { return "Foreground"; } - }; - } + } + } /** * Replaces the background image of visualizer. diff --git a/src/main/java/com/goxr3plus/xr3player/xplayer/waveform/WaveFormService.java b/src/main/java/com/goxr3plus/xr3player/xplayer/waveform/WaveFormService.java index 792f6005..72b0b595 100644 --- a/src/main/java/com/goxr3plus/xr3player/xplayer/waveform/WaveFormService.java +++ b/src/main/java/com/goxr3plus/xr3player/xplayer/waveform/WaveFormService.java @@ -55,8 +55,8 @@ public class WaveFormService extends Service { * */ public enum WaveFormJob { - AMPLITUDES_AND_WAVEFORM, WAVEFORM; - } + AMPLITUDES_AND_WAVEFORM, WAVEFORM + } /** * Constructor.