update version to 1.0.1-SNAPSHOT, remove log4j and logback

dlsc-software-consulting-gmbh · Nov 8, 2018 · 4782738 · 4782738
1 parent 2059e36
commit 4782738
Show file tree

Hide file tree

Showing 25 changed files with 134 additions and 99 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
+### Eclipse files
+.project
+**/.classpath
+**/.settings
+
 # Created by .ignore support plugin (hsz.mobi)
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.dlsc.workbenchfx</groupId>
     <artifactId>workbenchfx-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/workbenchfx-core/pom.xml b/workbenchfx-core/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.dlsc.workbenchfx</groupId>
     <artifactId>workbenchfx-core</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>WorkbenchFX</name>
@@ -381,23 +381,11 @@
         -->
 
         <!-- Logging -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
-            <version>2.11.1</version>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.25</version>
         </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
 
 
         <!-- *** Test *** -->

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/Workbench.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/Workbench.java
@@ -1,8 +1,18 @@
 package com.dlsc.workbenchfx;
 
-import static com.dlsc.workbenchfx.model.WorkbenchDialog.Type;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import java.util.logging.LogManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.dlsc.workbenchfx.model.WorkbenchDialog;
+import com.dlsc.workbenchfx.model.WorkbenchDialog.Type;
 import com.dlsc.workbenchfx.model.WorkbenchModule;
 import com.dlsc.workbenchfx.model.WorkbenchOverlay;
 import com.dlsc.workbenchfx.view.WorkbenchPresenter;
@@ -14,12 +24,7 @@
 import com.dlsc.workbenchfx.view.controls.module.Tab;
 import com.dlsc.workbenchfx.view.controls.module.Tile;
 import com.google.common.collect.Range;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
+
 import javafx.animation.TranslateTransition;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -53,8 +58,6 @@
 import javafx.stage.WindowEvent;
 import javafx.util.Callback;
 import javafx.util.Duration;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Contains all the model logic for the workbench.
@@ -65,7 +68,7 @@
 public final class Workbench extends Control {
 
   private static final Logger LOGGER =
-      LogManager.getLogger(Workbench.class.getName());
+      LoggerFactory.getLogger(Workbench.class.getName());
 
   // Constants
   private static final int MAX_PERCENT = 100;
@@ -178,7 +181,7 @@ public static WorkbenchBuilder builder(WorkbenchModule... modules) {
   }
 
   public static final class WorkbenchBuilder {
-    private static final Logger LOGGER = LogManager.getLogger(WorkbenchBuilder.class.getName());
+    private static final Logger LOGGER = LoggerFactory.getLogger(WorkbenchBuilder.class.getName());
 
     // Required parameters
     private WorkbenchModule[] modules;

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/WorkbenchSkin.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/WorkbenchSkin.java
@@ -1,5 +1,8 @@
 package com.dlsc.workbenchfx;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.dlsc.workbenchfx.model.WorkbenchModule;
 import com.dlsc.workbenchfx.view.AddModulePresenter;
 import com.dlsc.workbenchfx.view.AddModuleView;
@@ -10,10 +13,8 @@
 import com.dlsc.workbenchfx.view.WorkbenchPresenter;
 import com.dlsc.workbenchfx.view.WorkbenchView;
 import com.dlsc.workbenchfx.view.controls.selectionstrip.SelectionStrip;
-import javafx.scene.control.SkinBase;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
+import javafx.scene.control.SkinBase;
 /**
  * Represents the Skin which is made for the {@link Workbench}.
  * It creates all the Views and Presenters which are needed and sets the stylesheets.
@@ -24,7 +25,7 @@
 public final class WorkbenchSkin extends SkinBase<Workbench> {
 
   private static final Logger LOGGER =
-      LogManager.getLogger(WorkbenchSkin.class.getName());
+      LoggerFactory.getLogger(WorkbenchSkin.class.getName());
 
   // Views
   private SelectionStrip<WorkbenchModule> tabBar;

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/model/WorkbenchDialog.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/model/WorkbenchDialog.java
@@ -25,8 +25,9 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.input.KeyCode;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents the model class of a Dialog in {@link Workbench}.
@@ -37,7 +38,7 @@
  */
 public final class WorkbenchDialog {
   private static final Logger LOGGER =
-      LogManager.getLogger(WorkbenchDialog.class.getName());
+      LoggerFactory.getLogger(WorkbenchDialog.class.getName());
 
   private Type type;
 
@@ -124,7 +125,7 @@ public static WorkbenchDialogBuilder builder(
   // Builder
   public static final class WorkbenchDialogBuilder {
     private static final Logger LOGGER =
-        LogManager.getLogger(WorkbenchDialogBuilder.class.getName());
+        LoggerFactory.getLogger(WorkbenchDialogBuilder.class.getName());
 
     // Required parameters - only either type or buttonTypes are required
     private final WorkbenchDialog.Type type;

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/model/WorkbenchModule.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/model/WorkbenchModule.java
@@ -1,22 +1,25 @@
 package com.dlsc.workbenchfx.model;
 
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.dlsc.workbenchfx.Workbench;
 import com.dlsc.workbenchfx.view.controls.ToolbarControl;
 import com.dlsc.workbenchfx.view.controls.ToolbarItem;
 import com.dlsc.workbenchfx.view.controls.module.Tab;
 import com.dlsc.workbenchfx.view.controls.module.Tile;
+
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView;
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView;
-import java.util.Objects;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Represents the base for a module, to be displayed in WorkbenchFX.
@@ -30,7 +33,7 @@
 public abstract class WorkbenchModule {
 
   private static final Logger LOGGER =
-      LogManager.getLogger(WorkbenchModule.class.getName());
+      LoggerFactory.getLogger(WorkbenchModule.class.getName());
 
   private Workbench workbench;
   private final String name;

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/AddModulePresenter.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/AddModulePresenter.java
@@ -1,10 +1,12 @@
 package com.dlsc.workbenchfx.view;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.dlsc.workbenchfx.Workbench;
 import com.dlsc.workbenchfx.view.controls.module.Page;
+
 import javafx.css.PseudoClass;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Represents the presenter of the corresponding {@link AddModuleView}.
@@ -15,7 +17,7 @@
 public final class AddModulePresenter extends Presenter {
 
   private static final Logger LOGGER =
-      LogManager.getLogger(AddModulePresenter.class.getName());
+      LoggerFactory.getLogger(AddModulePresenter.class.getName());
 
   private static final PseudoClass ONE_PAGE_STATE = PseudoClass.getPseudoClass("one-page");
 

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/ContentPresenter.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/ContentPresenter.java
@@ -1,17 +1,20 @@
 package com.dlsc.workbenchfx.view;
 
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.dlsc.workbenchfx.Workbench;
 import com.dlsc.workbenchfx.model.WorkbenchModule;
 import com.dlsc.workbenchfx.util.WorkbenchUtils;
-import java.util.Objects;
+
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 import javafx.scene.Node;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Represents the presenter of the corresponding {@link ContentView}.
@@ -22,7 +25,7 @@
 public final class ContentPresenter extends Presenter {
 
   private static final Logger LOGGER =
-      LogManager.getLogger(ContentPresenter.class.getName());
+      LoggerFactory.getLogger(ContentPresenter.class.getName());
 
   private final Workbench model;
   private final ContentView view;

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/ContentView.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/ContentView.java
@@ -1,14 +1,16 @@
 package com.dlsc.workbenchfx.view;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.dlsc.workbenchfx.model.WorkbenchModule;
 import com.dlsc.workbenchfx.view.controls.ToolbarControl;
+
 import javafx.scene.Node;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Displays the content of the currently active {@link WorkbenchModule}.
@@ -19,7 +21,7 @@
 public final class ContentView extends BorderPane implements View {
 
   private static final Logger LOGGER =
-      LogManager.getLogger(ContentView.class.getName());
+      LoggerFactory.getLogger(ContentView.class.getName());
 
   ToolbarControl toolbarControl;
   AddModuleView addModuleView;

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/ToolbarPresenter.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/ToolbarPresenter.java
@@ -1,16 +1,19 @@
 package com.dlsc.workbenchfx.view;
 
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.dlsc.workbenchfx.Workbench;
 import com.dlsc.workbenchfx.model.WorkbenchModule;
 import com.dlsc.workbenchfx.view.controls.ToolbarItem;
 import com.dlsc.workbenchfx.view.controls.selectionstrip.TabCell;
-import java.util.Objects;
+
 import javafx.beans.InvalidationListener;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
 import javafx.scene.control.MenuItem;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Represents the presenter of the corresponding {@link ToolbarView}.
@@ -21,7 +24,7 @@
 public final class ToolbarPresenter extends Presenter {
 
   private static final Logger LOGGER =
-      LogManager.getLogger(ToolbarPresenter.class.getName());
+      LoggerFactory.getLogger(ToolbarPresenter.class.getName());
   private static final String STYLE_CLASS_ACTIVE_ADD_BUTTON = "active-add-button";
 
   private final Workbench model;

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/WorkbenchPresenter.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/WorkbenchPresenter.java
@@ -1,18 +1,21 @@
 package com.dlsc.workbenchfx.view;
 
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.dlsc.workbenchfx.Workbench;
 import com.dlsc.workbenchfx.model.WorkbenchDialog;
 import com.dlsc.workbenchfx.model.WorkbenchOverlay;
 import com.dlsc.workbenchfx.util.WorkbenchUtils;
 import com.dlsc.workbenchfx.view.controls.dialog.DialogControl;
-import java.util.Objects;
+
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 import javafx.scene.control.ButtonType;
 import javafx.scene.layout.Region;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Represents the presenter of the corresponding {@link WorkbenchView}.
@@ -22,7 +25,7 @@
  */
 public final class WorkbenchPresenter extends Presenter {
 
-  private static final Logger LOGGER = LogManager.getLogger(WorkbenchPresenter.class.getName());
+  private static final Logger LOGGER = LoggerFactory.getLogger(WorkbenchPresenter.class.getName());
 
   private final Workbench model;
   private final WorkbenchView view;

diff --git a/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/WorkbenchView.java b/workbenchfx-core/src/main/java/com/dlsc/workbenchfx/view/WorkbenchView.java
@@ -5,8 +5,9 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents the master view, which is used to show all view parts.
@@ -16,7 +17,7 @@
  */
 public final class WorkbenchView extends StackPane implements View {
   private static final Logger LOGGER =
-      LogManager.getLogger(WorkbenchView.class.getName());
+      LoggerFactory.getLogger(WorkbenchView.class.getName());
 
   final ToolbarView toolbarView;
   final AddModuleView addModuleView;