diff --git a/pom.xml b/pom.xml index 4c4cb97..e29cddc 100644 --- a/pom.xml +++ b/pom.xml @@ -22,24 +22,34 @@ --> - org.apache.logging.log4j - log4j-api - 2.0-beta9 + org.slf4j + slf4j-api + 1.7.25 - org.apache.logging.log4j - log4j-core - 2.0-beta9 + org.slf4j + jul-to-slf4j + 1.7.25 - com.ovh.ws - jsonizer-json-jackson - 2.2.0 + ch.qos.logback + logback-core + 1.2.3 + + + ch.qos.logback + logback-classic + 1.2.3 + + + com.fasterxml.jackson.core + jackson-databind + 2.7.9.2 ar.com.hjg pngj - 2.0.1 + 2.1.0 org.jdom @@ -49,7 +59,7 @@ commons-cli commons-cli - 1.2 + 1.4 diff --git a/readme_developers.txt b/readme_developers.txt index 60785e5..679cc79 100644 --- a/readme_developers.txt +++ b/readme_developers.txt @@ -41,16 +41,13 @@ This project depends on the following libraries. - JDOM 2.x http://www.jdom.org/ (For JavaDocs, look left.) -- log4j2 - http://logging.apache.org/log4j/2.x/ - (JavaDocs are not available.) - - There was a bug in Java 1.7.0_25 that causes log4j2-beta8 to hang - the moment a Logger object is created. 1.7.0_40 fixed it, 1.6 didn't - have the bug, and log4j2-beta9 will compensate, when it's released. - https://issues.apache.org/jira/browse/LOG4J2-322 - -- Apache Commons CLI 1.2 +- SLF4J + https://www.slf4j.org/ + (For JavaDocs, look left.) +- Logback + https://logback.qos.ch/ + (For JavaDocs, look left.) +- Apache Commons CLI 1.x http://commons.apache.org/proper/commons-cli/ (For JavaDocs, scroll down.) diff --git a/skel_common/backup/auto_update.json b/skel_common/backup/auto_update.json index d448851..84f714f 100644 --- a/skel_common/backup/auto_update.json +++ b/skel_common/backup/auto_update.json @@ -18,7 +18,8 @@ "Edited a comment in boilerplate mod metadata to include AE ships", "Made the comments in boilerplace mod metadata optional", "Fixed omitted Validate warnings for PNG files", - "Added Validate warnings about FTL 1.6.1+ for TTF, MP3, and PNG files" + "Added Validate warnings about FTL 1.6.1+ for TTF, MP3, and PNG files", + "Changed logging framework to SLF4J/Logback" ] }, { diff --git a/skel_common/readme_changelog.txt b/skel_common/readme_changelog.txt index 9832ad9..37edc70 100644 --- a/skel_common/readme_changelog.txt +++ b/skel_common/readme_changelog.txt @@ -5,6 +5,7 @@ Changelog - Made the comments in boilerplace mod metadata optional - Fixed omitted Validate warnings for PNG files - Added Validate warnings about FTL 1.6.1+ for TTF, MP3, and PNG files +- Changed logging framework to SLF4J/Logback 1.9: - Fixed corrupted civilian sector music in FTL 1.6.1+ diff --git a/src/main/java/net/vhati/modmanager/FTLModManager.java b/src/main/java/net/vhati/modmanager/FTLModManager.java index 6c3f239..1f6337d 100644 --- a/src/main/java/net/vhati/modmanager/FTLModManager.java +++ b/src/main/java/net/vhati/modmanager/FTLModManager.java @@ -5,6 +5,8 @@ import java.io.FileInputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.IOException; +import java.nio.charset.Charset; +import java.util.Date; import java.util.Properties; import javax.swing.JFileChooser; import javax.swing.JOptionPane; @@ -13,8 +15,13 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.UIManager.LookAndFeelInfo; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.encoder.PatternLayoutEncoder; +import ch.qos.logback.core.FileAppender; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.bridge.SLF4JBridgeHandler; import net.vhati.modmanager.cli.SlipstreamCLI; import net.vhati.modmanager.core.ComparableVersion; @@ -25,7 +32,7 @@ import net.vhati.modmanager.ui.ManagerFrame; public class FTLModManager { - private static final Logger log = LogManager.getLogger( FTLModManager.class ); + private static final Logger log = LoggerFactory.getLogger( FTLModManager.class ); public static final String APP_NAME = "Slipstream Mod Manager"; public static final ComparableVersion APP_VERSION = new ComparableVersion( "1.9" ); @@ -34,8 +41,42 @@ public class FTLModManager { public static void main( String[] args ) { - if ( args.length > 0 ) SlipstreamCLI.main( args ); + // Redirect any libraries' java.util.Logging messages. + SLF4JBridgeHandler.removeHandlersForRootLogger(); + SLF4JBridgeHandler.install(); + // Doing this here instead of in "logback.xml", allows for conditional log files. + // For example, the app could decide not to or in a different place. + + // Fork log into a file. + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); + + PatternLayoutEncoder encoder = new PatternLayoutEncoder(); + encoder.setContext( lc ); + encoder.setCharset( Charset.forName( "UTF-8" ) ); + encoder.setPattern( "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{5} - %msg%n" ); + encoder.start(); + + FileAppender fileAppender = new FileAppender(); + fileAppender.setContext( lc ); + fileAppender.setName( "LogFile" ); + fileAppender.setFile( new File( "./modman-log.txt" ).getAbsolutePath() ); + fileAppender.setAppend( false ); + fileAppender.setEncoder( encoder ); + fileAppender.start(); + + lc.getLogger( Logger.ROOT_LOGGER_NAME ).addAppender( fileAppender ); + + // Log a welcome message. + log.debug( "Started: {}", new Date() ); + log.debug( "{} v{}", APP_NAME, APP_VERSION ); + log.debug( "OS: {} {}", System.getProperty( "os.name" ), System.getProperty( "os.version" ) ); + log.debug( "VM: {}, {}, {}", System.getProperty( "java.vm.name" ), System.getProperty( "java.version" ), System.getProperty( "os.arch" ) ); + + if ( args.length > 0 ) { + SlipstreamCLI.main( args ); + return; + } // Ensure all popups are triggered from the event dispatch thread. @@ -50,15 +91,12 @@ public class FTLModManager { private static void guiInit() { try { - log.debug( String.format( "%s v%s", APP_NAME, APP_VERSION ) ); - log.debug( String.format( "%s %s", System.getProperty( "os.name" ), System.getProperty( "os.version" ) ) ); - log.debug( String.format( "%s, %s, %s", System.getProperty( "java.vm.name" ), System.getProperty( "java.version" ), System.getProperty( "os.arch" ) ) ); - // Nag if the jar was double-clicked. if ( new File( "./mods/" ).exists() == false ) { String currentPath = new File( "." ).getAbsoluteFile().getParentFile().getAbsolutePath(); + + log.error( String.format( "Slipstream could not find its own folder (Currently in \"%s\"), exiting...", currentPath ) ); showErrorDialog( String.format( "Slipstream could not find its own folder.\nCurrently in: %s\n\nRun one of the following instead of the jar...\nWindows: modman.exe or modman_admin.exe\nLinux/OSX: modman.command or modman-cli.sh\n\nThe Mod Manager will now exit.", currentPath ) ); - System.err.println( String.format( "Slipstream could not find its own folder (Currently in \"%s\"), exiting.", currentPath ) ); throw new ExitException(); } diff --git a/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java b/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java index efd7ec7..d91833d 100644 --- a/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java +++ b/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java @@ -23,8 +23,8 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.ParseException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.ftldat.AbstractPack; import net.vhati.ftldat.FolderPack; @@ -44,7 +44,7 @@ import net.vhati.modmanager.core.SlipstreamConfig; public class SlipstreamCLI { - private static final Logger log = LogManager.getLogger(SlipstreamCLI.class); + private static final Logger log = LoggerFactory.getLogger( SlipstreamCLI.class ); private static File backupDir = new File( "./backup/" ); private static File modsDir = new File( "./mods/" ); diff --git a/src/main/java/net/vhati/modmanager/core/HashThread.java b/src/main/java/net/vhati/modmanager/core/HashThread.java index 136e827..4f043ca 100644 --- a/src/main/java/net/vhati/modmanager/core/HashThread.java +++ b/src/main/java/net/vhati/modmanager/core/HashThread.java @@ -6,8 +6,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.ftldat.PackUtilities; import net.vhati.modmanager.core.HashObserver; @@ -21,7 +21,7 @@ import net.vhati.modmanager.core.HashObserver; */ public class HashThread extends Thread { - private static final Logger log = LogManager.getLogger( HashThread.class ); + private static final Logger log = LoggerFactory.getLogger( HashThread.class ); private List fileList = new ArrayList(); private HashObserver hashObserver = null; diff --git a/src/main/java/net/vhati/modmanager/core/ModPatchThread.java b/src/main/java/net/vhati/modmanager/core/ModPatchThread.java index 45c8dcb..72bddf1 100644 --- a/src/main/java/net/vhati/modmanager/core/ModPatchThread.java +++ b/src/main/java/net/vhati/modmanager/core/ModPatchThread.java @@ -16,8 +16,8 @@ import java.util.zip.ZipInputStream; import org.jdom2.JDOMException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.ftldat.AbstractPack; import net.vhati.ftldat.AbstractPack.RepackResult; @@ -31,7 +31,7 @@ import net.vhati.modmanager.core.ModUtilities; public class ModPatchThread extends Thread { - private static final Logger log = LogManager.getLogger( ModPatchThread.class ); + private static final Logger log = LoggerFactory.getLogger( ModPatchThread.class ); // Other threads can check or set this. public volatile boolean keepRunning = true; diff --git a/src/main/java/net/vhati/modmanager/core/ModUtilities.java b/src/main/java/net/vhati/modmanager/core/ModUtilities.java index 8e2d3e9..b92c826 100644 --- a/src/main/java/net/vhati/modmanager/core/ModUtilities.java +++ b/src/main/java/net/vhati/modmanager/core/ModUtilities.java @@ -36,8 +36,8 @@ import org.jdom2.JDOMException; import org.jdom2.input.JDOMParseException; import org.jdom2.input.SAXBuilder; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.core.EmptyAwareSAXHandlerFactory; import net.vhati.modmanager.core.EOLWriter; @@ -48,7 +48,7 @@ import net.vhati.modmanager.core.SloppyXMLParser; public class ModUtilities { - private static final Logger log = LogManager.getLogger(ModUtilities.class); + private static final Logger log = LoggerFactory.getLogger( ModUtilities.class ); private static Pattern junkFilePtn = Pattern.compile( "[.]DS_Store$|(?:^|/)thumbs[.]db$|(?:^|/)[.]dropbox$|(?:^|/)~|~$|(?:^|/)#.+#$" ); diff --git a/src/main/java/net/vhati/modmanager/core/ModsScanThread.java b/src/main/java/net/vhati/modmanager/core/ModsScanThread.java index a5ce660..be8c9bd 100644 --- a/src/main/java/net/vhati/modmanager/core/ModsScanThread.java +++ b/src/main/java/net/vhati/modmanager/core/ModsScanThread.java @@ -9,8 +9,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.ftldat.PackUtilities; import net.vhati.modmanager.core.ModDB; @@ -27,7 +27,7 @@ import net.vhati.modmanager.xml.JDOMModMetadataReader; */ public class ModsScanThread extends Thread { - private static final Logger log = LogManager.getLogger( ModsScanThread.class ); + private static final Logger log = LoggerFactory.getLogger( ModsScanThread.class ); private List fileList = new ArrayList(); private ModDB newDB; diff --git a/src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java b/src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java index 405ec83..17667d7 100644 --- a/src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java +++ b/src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java @@ -15,8 +15,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.core.AutoUpdateInfo; import net.vhati.modmanager.core.ComparableVersion; @@ -24,7 +24,7 @@ import net.vhati.modmanager.core.ComparableVersion; public class JacksonAutoUpdateReader { - private static final Logger log = LogManager.getLogger( JacksonAutoUpdateReader.class ); + private static final Logger log = LoggerFactory.getLogger( JacksonAutoUpdateReader.class ); public static AutoUpdateInfo parse( File jsonFile ) { @@ -75,7 +75,7 @@ public class JacksonAutoUpdateReader { exception = e; } if ( exception != null ) { - log.error( exception ); + log.error( "Failed to parse info about available updates", exception ); return null; } diff --git a/src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java b/src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java index 3520d76..d1e3228 100644 --- a/src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java +++ b/src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java @@ -10,8 +10,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.core.ModDB; import net.vhati.modmanager.core.ModInfo; @@ -19,7 +19,7 @@ import net.vhati.modmanager.core.ModInfo; public class JacksonCatalogReader { - private static final Logger log = LogManager.getLogger( JacksonCatalogReader.class ); + private static final Logger log = LoggerFactory.getLogger( JacksonCatalogReader.class ); public static ModDB parse( File jsonFile ) { diff --git a/src/main/java/net/vhati/modmanager/json/URLFetcher.java b/src/main/java/net/vhati/modmanager/json/URLFetcher.java index ef425d7..b0d64ec 100644 --- a/src/main/java/net/vhati/modmanager/json/URLFetcher.java +++ b/src/main/java/net/vhati/modmanager/json/URLFetcher.java @@ -18,13 +18,13 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class URLFetcher { - private static final Logger log = LogManager.getLogger( URLFetcher.class ); + private static final Logger log = LoggerFactory.getLogger( URLFetcher.class ); /** diff --git a/src/main/java/net/vhati/modmanager/scraper/ForumScraper.java b/src/main/java/net/vhati/modmanager/scraper/ForumScraper.java index 3800b48..e264bf1 100644 --- a/src/main/java/net/vhati/modmanager/scraper/ForumScraper.java +++ b/src/main/java/net/vhati/modmanager/scraper/ForumScraper.java @@ -53,8 +53,8 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.ParseException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.ftldat.PackUtilities; import net.vhati.modmanager.core.ModDB; @@ -66,7 +66,7 @@ import net.vhati.modmanager.json.JacksonCatalogWriter; public class ForumScraper { - private static final Logger log = LogManager.getLogger( ForumScraper.class ); + private static final Logger log = LoggerFactory.getLogger( ForumScraper.class ); private static final String MASTER_LIST_URL = "https://subsetgames.com/forum/viewtopic.php?f=11&t=2645"; private static final String FORUM_URL_FRAGMENT = "https://subsetgames.com/forum/viewtopic.php"; diff --git a/src/main/java/net/vhati/modmanager/ui/CreateModDialog.java b/src/main/java/net/vhati/modmanager/ui/CreateModDialog.java index 1c82e39..bda5804 100644 --- a/src/main/java/net/vhati/modmanager/ui/CreateModDialog.java +++ b/src/main/java/net/vhati/modmanager/ui/CreateModDialog.java @@ -22,8 +22,8 @@ import javax.swing.ScrollPaneConstants; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.ui.FieldEditorPanel; import net.vhati.modmanager.ui.FieldEditorPanel.ContentType; @@ -33,7 +33,7 @@ import net.vhati.modmanager.xml.JDOMModMetadataWriter; public class CreateModDialog extends JDialog implements ActionListener { - private static final Logger log = LogManager.getLogger( CreateModDialog.class ); + private static final Logger log = LoggerFactory.getLogger( CreateModDialog.class ); protected static final String DIR_NAME = "Directory Name"; protected static final String AUDIO_ROOT = "audio/"; diff --git a/src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java b/src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java index 49461a0..ba437ac 100644 --- a/src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java +++ b/src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java @@ -10,8 +10,8 @@ import java.util.List; import javax.swing.JDialog; import javax.swing.SwingUtilities; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.ftldat.AbstractPack; import net.vhati.ftldat.FolderPack; @@ -21,7 +21,7 @@ import net.vhati.ftldat.PkgPack; public class DatExtractDialog extends ProgressDialog { - private static final Logger log = LogManager.getLogger( DatExtractDialog.class ); + private static final Logger log = LoggerFactory.getLogger( DatExtractDialog.class ); private boolean started = false; diff --git a/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java b/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java index c89384e..256b0ee 100644 --- a/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java +++ b/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java @@ -53,8 +53,8 @@ import javax.swing.UIManager; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.core.AutoUpdateInfo; import net.vhati.modmanager.core.ComparableVersion; @@ -85,7 +85,7 @@ import net.vhati.modmanager.ui.table.ListState; public class ManagerFrame extends JFrame implements ActionListener, ModsScanObserver, Nerfable, Statusbar, Thread.UncaughtExceptionHandler { - private static final Logger log = LogManager.getLogger( ManagerFrame.class ); + private static final Logger log = LoggerFactory.getLogger( ManagerFrame.class ); public static final String CATALOG_URL = "https://raw.github.com/Vhati/Slipstream-Mod-Manager/master/skel_common/backup/current_catalog.json"; public static final String APP_UPDATE_URL = "https://raw.github.com/Vhati/Slipstream-Mod-Manager/master/skel_common/backup/auto_update.json"; diff --git a/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java b/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java index 2fc82bb..a3bbc0d 100644 --- a/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java +++ b/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.concurrent.locks.Lock; import javax.swing.SwingUtilities; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.core.AutoUpdateInfo; import net.vhati.modmanager.core.ModDB; @@ -39,7 +39,7 @@ import net.vhati.modmanager.ui.table.ListState; */ public class ManagerInitThread extends Thread { - private static final Logger log = LogManager.getLogger( ManagerInitThread.class ); + private static final Logger log = LoggerFactory.getLogger( ManagerInitThread.class ); private final ManagerFrame frame; private final SlipstreamConfig appConfig; diff --git a/src/main/java/net/vhati/modmanager/ui/ModInfoArea.java b/src/main/java/net/vhati/modmanager/ui/ModInfoArea.java index 07f7b4d..f7dfae7 100644 --- a/src/main/java/net/vhati/modmanager/ui/ModInfoArea.java +++ b/src/main/java/net/vhati/modmanager/ui/ModInfoArea.java @@ -24,15 +24,15 @@ import javax.swing.text.StyleConstants; import javax.swing.text.StyleContext; import javax.swing.text.StyledDocument; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.ui.Statusbar; public class ModInfoArea extends JScrollPane { - private static final Logger log = LogManager.getLogger( ModInfoArea.class ); + private static final Logger log = LoggerFactory.getLogger( ModInfoArea.class ); private static final String STYLE_REGULAR = "regular"; private static final String STYLE_HYPERLINK = "hyperlink"; diff --git a/src/main/java/net/vhati/modmanager/ui/table/TableRowTransferHandler.java b/src/main/java/net/vhati/modmanager/ui/table/TableRowTransferHandler.java index cdae8f3..cd7208f 100644 --- a/src/main/java/net/vhati/modmanager/ui/table/TableRowTransferHandler.java +++ b/src/main/java/net/vhati/modmanager/ui/table/TableRowTransferHandler.java @@ -8,8 +8,8 @@ import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.TransferHandler; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.ui.table.Reorderable; @@ -21,7 +21,7 @@ import net.vhati.modmanager.ui.table.Reorderable; */ public class TableRowTransferHandler extends TransferHandler { - private static final Logger log = LogManager.getLogger( TableRowTransferHandler.class ); + private static final Logger log = LoggerFactory.getLogger( TableRowTransferHandler.class ); private DataFlavor localIntegerFlavor = null; @@ -36,10 +36,10 @@ public class TableRowTransferHandler extends TransferHandler { this.table = table; try { - localIntegerFlavor = new DataFlavor( DataFlavor.javaJVMLocalObjectMimeType + ";class=\""+ Integer.class.getName() +"\"" ); + localIntegerFlavor = new DataFlavor( String.format( "%s;class=\"%s\"", DataFlavor.javaJVMLocalObjectMimeType, Integer.class.getName() ) ); } catch ( ClassNotFoundException e ) { - log.error( e ); + log.error( "Failed to construct a table row transfer handler", e ); } } @@ -84,7 +84,7 @@ public class TableRowTransferHandler extends TransferHandler { } } catch ( Exception e ) { - log.error( e ); + log.error( "Dragging failed", e ); } return false; } diff --git a/src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java b/src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java index e361cf4..903d455 100644 --- a/src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java +++ b/src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java @@ -14,8 +14,8 @@ import org.jdom2.Element; import org.jdom2.JDOMException; import org.jdom2.input.SAXBuilder; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.vhati.modmanager.core.ModDB; import net.vhati.modmanager.core.ModInfo; @@ -25,7 +25,7 @@ import net.vhati.modmanager.core.ModUtilities.DecodeResult; public class JDOMModMetadataReader { - private static final Logger log = LogManager.getLogger( JDOMModMetadataReader.class ); + private static final Logger log = LoggerFactory.getLogger( JDOMModMetadataReader.class ); public static final String METADATA_INNERPATH = "mod-appendix/metadata.xml"; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml deleted file mode 100644 index ecbfbf8..0000000 --- a/src/main/resources/log4j2.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - %-5level %logger{1} - %msg%throwable%n - - - - - - %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%throwable%n - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..1aebd0a --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,28 @@ + + + + + + + System.err + + info + + + %-5level %logger{0} - %msg%n + + + + + + + + + + + + + + + + \ No newline at end of file