[DW] updated dependencies to log4j2, slf4j

[DW] updated other libraries

src/main/java/de/jowisoftware/sshclient/Init.java

@@ -1,13 +1,6 @@
 package de.jowisoftware.sshclient;
 
-import java.io.File;
-
-import javax.swing.UIManager;
-
-import org.apache.log4j.Logger;
-
 import com.jcraft.jsch.JSch;
-
 import de.jowisoftware.sshclient.application.Application;
 import de.jowisoftware.sshclient.application.settings.ApplicationSettings;
 import de.jowisoftware.sshclient.application.settings.awt.AWTApplicationSettings;
@@ -18,9 +11,14 @@
 import de.jowisoftware.sshclient.jsch.JSchKeyManager;
 import de.jowisoftware.sshclient.ui.MainWindow;
 import de.jowisoftware.sshclient.ui.security.SimplePasswordManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.*;
+import java.io.File;
 
 public class Init {
-    private static final Logger LOGGER = Logger.getLogger(Init.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Init.class);
 
     public void start() {
         start(new String[0]);

src/main/java/de/jowisoftware/sshclient/application/Application.java

@@ -1,24 +1,21 @@
 package de.jowisoftware.sshclient.application;
 
-import java.io.File;
-
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
-import org.apache.log4j.Logger;
-
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
-
 import de.jowisoftware.sshclient.application.settings.ApplicationSettings;
 import de.jowisoftware.sshclient.application.settings.KeyManager;
 import de.jowisoftware.sshclient.application.settings.ProfileEvent;
 import de.jowisoftware.sshclient.application.settings.awt.AWTProfile;
 import de.jowisoftware.sshclient.events.EventHub;
 import de.jowisoftware.sshclient.events.ReflectionEventHub;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.*;
+import java.io.File;
 
 public class Application {
-    private static final Logger LOGGER = Logger.getLogger(Application.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Application.class);
 
     public final JSch jsch;
 

src/main/java/de/jowisoftware/sshclient/application/JschLogger.java

@@ -1,9 +1,10 @@
 package de.jowisoftware.sshclient.application;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class JschLogger implements com.jcraft.jsch.Logger {
-    private static final Logger LOGGER = Logger.getLogger(JschLogger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JschLogger.class);
 
     @Override
     public void log(final int level, final String message) {
@@ -21,7 +22,7 @@ public void log(final int level, final String message) {
             LOGGER.warn(message);
             break;
         case FATAL:
-            LOGGER.fatal(message);
+            LOGGER.error(message);
             break;
         }
     }

src/main/java/de/jowisoftware/sshclient/application/arguments/ArgumentParser.java

@@ -1,15 +1,15 @@
 package de.jowisoftware.sshclient.application.arguments;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
 import de.jowisoftware.sshclient.application.settings.ApplicationSettings;
 import de.jowisoftware.sshclient.application.settings.Profile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
 
 public class ArgumentParser<T extends Profile<?>> {
-    private static final Logger LOGGER = Logger.getLogger(ArgumentParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArgumentParser.class);
 
     private final ArgumentParserCallback<T> callbacks;
     private final ApplicationSettings<T> settings;
@@ -59,8 +59,7 @@ private ArgumentResult processArgument(final String arg, final String secondArg)
                 return parseFreeStyle(arg);
             }
         } catch(final RuntimeException e) {
-            LOGGER.warn("Problem while parsing command line argument '" +
-                    arg + "'", e);
+            LOGGER.warn("Problem while parsing command line argument '{}'", arg, e);
         }
         return ArgumentResult.ERROR;
     }

src/main/java/de/jowisoftware/sshclient/application/arguments/FreeStyleConnectArgument.java

@@ -1,11 +1,11 @@
 package de.jowisoftware.sshclient.application.arguments;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import de.jowisoftware.sshclient.application.settings.ApplicationSettings;
 import de.jowisoftware.sshclient.application.settings.Profile;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class FreeStyleConnectArgument<T extends Profile<?>> implements ConnectArgument<T> {
     private static final Pattern ARGUMENT_PATTERN =
             Pattern.compile("^(?:(?:([^:@]+)(?::([^@]+))?)@)?([^:]+)?(?::(\\d+))?$");

src/main/java/de/jowisoftware/sshclient/application/arguments/SessionConnectArgument.java

@@ -1,10 +1,10 @@
 package de.jowisoftware.sshclient.application.arguments;
 
-import java.util.Map;
-
 import de.jowisoftware.sshclient.application.settings.ApplicationSettings;
 import de.jowisoftware.sshclient.application.settings.Profile;
 
+import java.util.Map;
+
 public class SessionConnectArgument<T extends Profile<?>> implements ConnectArgument<T> {
     private final String sessionName;
 

src/main/java/de/jowisoftware/sshclient/application/settings/ApplicationSettings.java

@@ -1,11 +1,11 @@
 package de.jowisoftware.sshclient.application.settings;
 
+import de.jowisoftware.sshclient.encryption.PasswordStorage;
+
 import java.io.File;
 import java.util.List;
 import java.util.Map;
 
-import de.jowisoftware.sshclient.encryption.PasswordStorage;
-
 public interface ApplicationSettings<T extends Profile<?>> {
     Map<String, T> getProfiles();
 
@@ -27,4 +27,4 @@ public interface ApplicationSettings<T extends Profile<?>> {
 
     T newDefaultProfile();
     void setDefaultProfile(final T defaultProfile);
-}
+}

src/main/java/de/jowisoftware/sshclient/application/settings/Profile.java

@@ -1,11 +1,11 @@
 package de.jowisoftware.sshclient.application.settings;
 
+import de.jowisoftware.sshclient.terminal.gfx.GfxInfo;
+
 import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Map;
 
-import de.jowisoftware.sshclient.terminal.gfx.GfxInfo;
-
 public interface Profile<C extends GfxInfo<?>> {
     String getDefaultTitle();
 

src/main/java/de/jowisoftware/sshclient/application/settings/awt/AWTApplicationSettings.java

@@ -1,24 +1,23 @@
 package de.jowisoftware.sshclient.application.settings.awt;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import de.jowisoftware.sshclient.application.settings.persistence.annotations.Persist;
-import de.jowisoftware.sshclient.application.settings.persistence.annotations.TraversalType;
-import org.apache.log4j.Logger;
-
 import de.jowisoftware.sshclient.application.settings.ApplicationSettings;
 import de.jowisoftware.sshclient.application.settings.BellType;
 import de.jowisoftware.sshclient.application.settings.TabState;
+import de.jowisoftware.sshclient.application.settings.persistence.annotations.Persist;
+import de.jowisoftware.sshclient.application.settings.persistence.annotations.TraversalType;
 import de.jowisoftware.sshclient.encryption.CryptoException;
 import de.jowisoftware.sshclient.encryption.PasswordStorage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class AWTApplicationSettings implements ApplicationSettings<AWTProfile> {
-    private static final Logger LOGGER = Logger
-            .getLogger(AWTApplicationSettings.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AWTApplicationSettings.class);
 
     @Persist(traversalType = TraversalType.RECURSIVE)
     private AWTProfile defaultProfile = new AWTProfile();

src/main/java/de/jowisoftware/sshclient/application/settings/persistence/Persister.java

@@ -1,16 +1,16 @@
 package de.jowisoftware.sshclient.application.settings.persistence;
 
-import java.io.File;
-
-import org.apache.log4j.Logger;
-
 import de.jowisoftware.sshclient.application.settings.persistence.annotations.PersistenceAnnotationTraverser;
 import de.jowisoftware.sshclient.application.settings.persistence.xml.DocumentReader;
 import de.jowisoftware.sshclient.application.settings.persistence.xml.XMLDocumentReader;
 import de.jowisoftware.sshclient.application.settings.persistence.xml.XMLDocumentWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
 
 public class Persister {
-    private static final Logger LOGGER = Logger.getLogger(Persister.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Persister.class);
     public static final String VERSION = "2";
 
     private final File settingsFile;

src/main/java/de/jowisoftware/sshclient/application/settings/persistence/ReadCallback.java

@@ -5,16 +5,17 @@
 import de.jowisoftware.sshclient.application.settings.persistence.annotations.PersistenceAnnotationTraverser;
 import de.jowisoftware.sshclient.application.settings.persistence.xml.DocumentReader;
 import de.jowisoftware.sshclient.application.settings.persistence.xml.XMLDocumentReader;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.awt.Color;
+import java.awt.*;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 
 public class ReadCallback implements PersistCallback {
-    private static final Logger LOGGER = Logger.getLogger(ReadCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReadCallback.class);
     private final DocumentReader reader;
 
     public ReadCallback(final DocumentReader reader) {
@@ -45,11 +46,11 @@ public void foundList(final Field field, final Object object, final Persist anno
             while (itemReader != null) {
                 final Object listItem = restoreObject(itemReader, annotation);
                 list.add(listItem);
-                
+
                 itemReader = listReader.nextNode();
             }
         } catch (Exception e) {
-            LOGGER.error("Could not restore map " + field.getName() + " in " + object.getClass().getName(), e);
+            LOGGER.error("Could not restore map {} in {}", field.getName(), object.getClass().getName(), e);
         }
     }
 
@@ -76,7 +77,7 @@ public void foundSubObject(final Field field, final Object object, final String
             PersistenceAnnotationTraverser.traverseObject(subObject, new ReadCallback(reader.readSubNode(name)));
             PersistenceAnnotationTraverser.notifyLoad(subObject);
         } catch (Exception e) {
-            LOGGER.error("Could not restore field " + field.getName() + " in " + object.getClass().getName(), e);
+            LOGGER.error("Could not restore field {} in {}", field.getName(), object.getClass().getName(), e);
         }
     }
 
@@ -96,7 +97,7 @@ public void foundMap(final Field field, final Object object, final Persist annot
                 itemReader = listReader.nextNode();
             }
         } catch (Exception e) {
-            LOGGER.error("Could not restore map " + field.getName() + " in " + object.getClass().getName(), e);
+            LOGGER.error("Could not restore map {} in {}", field.getName(), object.getClass().getName(), e);
         }
     }
 

src/main/java/de/jowisoftware/sshclient/application/settings/persistence/WriteCallback.java

@@ -6,7 +6,7 @@
 import de.jowisoftware.sshclient.application.settings.persistence.xml.DocumentWriter;
 import de.jowisoftware.sshclient.application.settings.persistence.xml.XMLDocumentWriter;
 
-import java.awt.Color;
+import java.awt.*;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;

src/main/java/de/jowisoftware/sshclient/application/settings/persistence/update/SettingsUpdate.java

@@ -1,10 +1,10 @@
 package de.jowisoftware.sshclient.application.settings.persistence.update;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -13,14 +13,10 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
-import org.apache.log4j.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
+import java.io.*;
 
 public class SettingsUpdate {
-    private static final Logger LOGGER = Logger.getLogger(SettingsUpdate.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SettingsUpdate.class);
 
     private final File settingsDir;
 
@@ -70,7 +66,7 @@ private void checkVersion(final String version) {
             // Do not transform anything - this is the newest version
             break;
         default:
-            LOGGER.warn("Unknown version found: " + version);
+            LOGGER.warn("Unknown version found: {}", version);
         }
     }
 

src/main/java/de/jowisoftware/sshclient/application/settings/persistence/xml/XMLDocumentReader.java

@@ -9,7 +9,10 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class XMLDocumentReader implements DocumentReader {
     public class ListReader {

src/main/java/de/jowisoftware/sshclient/application/settings/persistence/xml/XMLDocumentWriter.java

@@ -1,8 +1,8 @@
 package de.jowisoftware.sshclient.application.settings.persistence.xml;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -13,10 +13,9 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 
 public class XMLDocumentWriter implements DocumentWriter {
     public class ListWriter {

src/main/java/de/jowisoftware/sshclient/application/settings/validation/ColorValidator.java

@@ -1,9 +1,10 @@
 package de.jowisoftware.sshclient.application.settings.validation;
 
-import static de.jowisoftware.sshclient.i18n.Translation.t;
 import de.jowisoftware.sshclient.application.settings.Profile;
 import de.jowisoftware.sshclient.terminal.gfx.ColorName;
 
+import static de.jowisoftware.sshclient.i18n.Translation.t;
+
 public class ColorValidator<T extends Profile<?>> implements Validator<T> {
     private static final String COLORFIELD = "gfx.colors";
     private static final String LIGHTCOLORFIELD = "gfx.lightcolors";