From 1e7cea86ade5f609dc9d7b6d233b3ae027957eb1 Mon Sep 17 00:00:00 2001 From: Jannik Date: Sat, 28 Apr 2018 12:17:12 +0200 Subject: [PATCH] code cleanup * log4j 2.10.0 -> 2.11.0 --- pom.xml | 4 ++-- src/main/java/com/cemu_UI/application/Main.java | 3 +-- .../java/com/cemu_UI/application/MainWindowController.java | 6 +++--- src/main/java/com/cemu_UI/application/playGame.java | 3 +-- src/main/java/com/cemu_UI/controller/CloudController.java | 3 +-- src/main/java/com/cemu_UI/controller/DBController.java | 3 +-- .../java/com/cemu_UI/controller/SmmdbAPIController.java | 3 +-- src/main/java/com/cemu_UI/controller/UpdateController.java | 3 +-- .../java/com/cemu_UI/datatypes/CourseTableDataType.java | 3 +-- src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java | 3 +-- src/main/java/com/cemu_UI/datatypes/UIROMDataType.java | 3 +-- src/main/java/com/cemu_UI/uiElements/JFXEditGameDialog.java | 4 +--- src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java | 3 +-- .../java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java | 4 +--- .../java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java | 3 +-- .../vendorCloudController/GoogleDriveController.java | 3 +-- 16 files changed, 19 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 511f9d4..95157e7 100644 --- a/pom.xml +++ b/pom.xml @@ -44,13 +44,13 @@ org.apache.logging.log4j log4j-api - 2.10.0 + 2.11.0 org.apache.logging.log4j log4j-core - 2.10.0 + 2.11.0 diff --git a/src/main/java/com/cemu_UI/application/Main.java b/src/main/java/com/cemu_UI/application/Main.java index 309abff..6879180 100644 --- a/src/main/java/com/cemu_UI/application/Main.java +++ b/src/main/java/com/cemu_UI/application/Main.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.application; import java.io.File; diff --git a/src/main/java/com/cemu_UI/application/MainWindowController.java b/src/main/java/com/cemu_UI/application/MainWindowController.java index 2ccc68c..3a90c41 100644 --- a/src/main/java/com/cemu_UI/application/MainWindowController.java +++ b/src/main/java/com/cemu_UI/application/MainWindowController.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.application; import java.awt.Desktop; @@ -266,6 +265,7 @@ public class MainWindowController { @FXML private JFXTreeTableColumn timeColumn = new JFXTreeTableColumn<>("time"); + @SuppressWarnings("unused") private enum CloudService { GoogleDrive, Dropbox } @@ -295,7 +295,7 @@ public class MainWindowController { private String id; private String version = "0.3.0"; private String buildNumber = "077"; - private String versionName = "Puzzle Plank Galaxy"; + private String versionName = "Purple Comet"; private int xPos = -200; private int yPos = 17; private int xPosHelper; diff --git a/src/main/java/com/cemu_UI/application/playGame.java b/src/main/java/com/cemu_UI/application/playGame.java index 1a0ebfc..651504a 100644 --- a/src/main/java/com/cemu_UI/application/playGame.java +++ b/src/main/java/com/cemu_UI/application/playGame.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.application; import java.io.IOException; diff --git a/src/main/java/com/cemu_UI/controller/CloudController.java b/src/main/java/com/cemu_UI/controller/CloudController.java index 3358eb4..6e3f385 100644 --- a/src/main/java/com/cemu_UI/controller/CloudController.java +++ b/src/main/java/com/cemu_UI/controller/CloudController.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.controller; import java.io.File; diff --git a/src/main/java/com/cemu_UI/controller/DBController.java b/src/main/java/com/cemu_UI/controller/DBController.java index 9dae994..e4422c3 100644 --- a/src/main/java/com/cemu_UI/controller/DBController.java +++ b/src/main/java/com/cemu_UI/controller/DBController.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.controller; import java.awt.Graphics2D; diff --git a/src/main/java/com/cemu_UI/controller/SmmdbAPIController.java b/src/main/java/com/cemu_UI/controller/SmmdbAPIController.java index bf14b95..d683f83 100644 --- a/src/main/java/com/cemu_UI/controller/SmmdbAPIController.java +++ b/src/main/java/com/cemu_UI/controller/SmmdbAPIController.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.controller; import java.io.BufferedReader; diff --git a/src/main/java/com/cemu_UI/controller/UpdateController.java b/src/main/java/com/cemu_UI/controller/UpdateController.java index a20dd5e..d214505 100644 --- a/src/main/java/com/cemu_UI/controller/UpdateController.java +++ b/src/main/java/com/cemu_UI/controller/UpdateController.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.controller; import java.io.BufferedReader; diff --git a/src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java b/src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java index 81f2176..f1f79f1 100644 --- a/src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java +++ b/src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.datatypes; import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject; diff --git a/src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java b/src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java index 8b79697..749fa3a 100644 --- a/src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java +++ b/src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.datatypes; import javafx.beans.property.IntegerProperty; diff --git a/src/main/java/com/cemu_UI/datatypes/UIROMDataType.java b/src/main/java/com/cemu_UI/datatypes/UIROMDataType.java index 23a46f6..2a66c6e 100644 --- a/src/main/java/com/cemu_UI/datatypes/UIROMDataType.java +++ b/src/main/java/com/cemu_UI/datatypes/UIROMDataType.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.datatypes; import com.jfoenix.controls.JFXButton; diff --git a/src/main/java/com/cemu_UI/uiElements/JFXEditGameDialog.java b/src/main/java/com/cemu_UI/uiElements/JFXEditGameDialog.java index c5cdb67..0487b14 100644 --- a/src/main/java/com/cemu_UI/uiElements/JFXEditGameDialog.java +++ b/src/main/java/com/cemu_UI/uiElements/JFXEditGameDialog.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - - package com.cemu_UI.uiElements; import java.io.File; diff --git a/src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java b/src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java index 9c2b710..ee2513a 100644 --- a/src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java +++ b/src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.uiElements; import com.jfoenix.controls.JFXButton; diff --git a/src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java b/src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java index 5dd4d1a..47d2ff8 100644 --- a/src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java +++ b/src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - - package com.cemu_UI.uiElements; import java.util.ResourceBundle; diff --git a/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java b/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java index fd8ff2f..2831162 100644 --- a/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java +++ b/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.uiElements; import com.jfoenix.controls.JFXButton; diff --git a/src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java b/src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java index 485ceef..65289bf 100644 --- a/src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java +++ b/src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java @@ -1,7 +1,7 @@ /** * cemu_UI * - * Copyright 2017 <@Seil0> + * Copyright 2017-2018 <@Seil0> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - package com.cemu_UI.vendorCloudController; import java.io.FileOutputStream;