diff --git a/src/main/java/net/vhati/modmanager/FTLModManager.java b/src/main/java/net/vhati/modmanager/FTLModManager.java index 0c1cb89..d20b473 100644 --- a/src/main/java/net/vhati/modmanager/FTLModManager.java +++ b/src/main/java/net/vhati/modmanager/FTLModManager.java @@ -13,15 +13,15 @@ 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 net.vhati.modmanager.cli.SlipstreamCLI; import net.vhati.modmanager.core.ComparableVersion; import net.vhati.modmanager.core.FTLUtilities; import net.vhati.modmanager.core.SlipstreamConfig; import net.vhati.modmanager.ui.ManagerFrame; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class FTLModManager { diff --git a/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java b/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java index bc4341c..efd7ec7 100644 --- a/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java +++ b/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java @@ -16,6 +16,16 @@ import java.util.Properties; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import org.apache.commons.cli.BasicParser; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +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 net.vhati.ftldat.AbstractPack; import net.vhati.ftldat.FolderPack; import net.vhati.ftldat.PkgPack; @@ -31,16 +41,6 @@ import net.vhati.modmanager.core.Report.ReportFormatter; import net.vhati.modmanager.core.Report.ReportMessage; import net.vhati.modmanager.core.SlipstreamConfig; -import org.apache.commons.cli.BasicParser; -import org.apache.commons.cli.OptionBuilder; -import org.apache.commons.cli.Options; -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; - public class SlipstreamCLI { diff --git a/src/main/java/net/vhati/modmanager/core/ComparableVersion.java b/src/main/java/net/vhati/modmanager/core/ComparableVersion.java index 037e826..f09e980 100644 --- a/src/main/java/net/vhati/modmanager/core/ComparableVersion.java +++ b/src/main/java/net/vhati/modmanager/core/ComparableVersion.java @@ -153,7 +153,7 @@ public class ComparableVersion implements Comparable { // Matched groups 1 and 2... or 3. if ( m.group(1) != null ) { - suffixDivider = m.group(1); + suffixDivider = m.group( 1 ); } if ( m.group(2) != null ) { @@ -162,7 +162,7 @@ public class ComparableVersion implements Comparable { suffixNum = -1; } - suffix = m.group(0); + suffix = m.group( 0 ); } else { throw new IllegalArgumentException( "Could not parse version suffix string: "+ s ); @@ -177,7 +177,7 @@ public class ComparableVersion implements Comparable { Matcher m = commentPtn.matcher( s ); if ( m.matches() ) { - comment = m.group(1); + comment = m.group( 1 ); } else { throw new IllegalArgumentException( "Could not parse version comment string: "+ s ); @@ -320,7 +320,7 @@ public class ComparableVersion implements Comparable { List tmpNumbers = new ArrayList( getNumbers().length ); for ( int n : getNumbers() ) - tmpNumbers.add( new Integer(n) ); + tmpNumbers.add( new Integer( n ) ); result = salt * result + tmpNumbers.hashCode(); String tmpSuffix = getSuffix(); diff --git a/src/main/java/net/vhati/modmanager/core/DelayedDeleteHook.java b/src/main/java/net/vhati/modmanager/core/DelayedDeleteHook.java index c14e016..e19ab32 100644 --- a/src/main/java/net/vhati/modmanager/core/DelayedDeleteHook.java +++ b/src/main/java/net/vhati/modmanager/core/DelayedDeleteHook.java @@ -18,9 +18,11 @@ import java.util.List; * Runtime.getRuntime().addShutdownHook( deleteHook ); */ public class DelayedDeleteHook extends Thread { + private LinkedHashSet watchedThreads = new LinkedHashSet(); private LinkedHashSet doomedFiles = new LinkedHashSet(); + public synchronized void addWatchedThread( Thread t ) { if ( watchedThreads == null ) throw new IllegalStateException( "Shutdown in progress" ); diff --git a/src/main/java/net/vhati/modmanager/core/EmptyAwareSAXHandlerFactory.java b/src/main/java/net/vhati/modmanager/core/EmptyAwareSAXHandlerFactory.java index da21a50..8d1269a 100644 --- a/src/main/java/net/vhati/modmanager/core/EmptyAwareSAXHandlerFactory.java +++ b/src/main/java/net/vhati/modmanager/core/EmptyAwareSAXHandlerFactory.java @@ -102,7 +102,7 @@ public class EmptyAwareSAXHandlerFactory implements SAXHandlerFactory { int endTagLine = loc.getLineNumber(); int endTagColumn = loc.getColumnNumber(); - if ( startTagLine != -1 && endTagLine != -1 && startTagLine != endTagLine) { + if ( startTagLine != -1 && endTagLine != -1 && startTagLine != endTagLine ) { twoPartTag = true; } else if ( startTagColumn != -1 && endTagColumn != -1 && startTagColumn != endTagColumn ) { diff --git a/src/main/java/net/vhati/modmanager/core/HashThread.java b/src/main/java/net/vhati/modmanager/core/HashThread.java index 4eef414..136e827 100644 --- a/src/main/java/net/vhati/modmanager/core/HashThread.java +++ b/src/main/java/net/vhati/modmanager/core/HashThread.java @@ -6,12 +6,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.vhati.ftldat.PackUtilities; -import net.vhati.modmanager.core.HashObserver; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import net.vhati.ftldat.PackUtilities; +import net.vhati.modmanager.core.HashObserver; + /** * A thread to calculate MD5 hashes of files in the background. @@ -21,14 +21,14 @@ import org.apache.logging.log4j.Logger; */ public class HashThread extends Thread { - private static final Logger log = LogManager.getLogger(HashThread.class); + private static final Logger log = LogManager.getLogger( HashThread.class ); private List fileList = new ArrayList(); private HashObserver hashObserver = null; public HashThread( File[] files, HashObserver hashObserver ) { - this.fileList.addAll( Arrays.asList(files) ); + this.fileList.addAll( Arrays.asList( files ) ); this.hashObserver = hashObserver; } diff --git a/src/main/java/net/vhati/modmanager/core/ModPatchThread.java b/src/main/java/net/vhati/modmanager/core/ModPatchThread.java index b51b67b..88bef7c 100644 --- a/src/main/java/net/vhati/modmanager/core/ModPatchThread.java +++ b/src/main/java/net/vhati/modmanager/core/ModPatchThread.java @@ -14,6 +14,11 @@ import java.util.regex.Pattern; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.jdom2.JDOMException; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import net.vhati.ftldat.AbstractPack; import net.vhati.ftldat.AbstractPack.RepackResult; import net.vhati.ftldat.FTLPack; @@ -23,11 +28,6 @@ import net.vhati.ftldat.PackUtilities; import net.vhati.modmanager.core.ModPatchObserver; import net.vhati.modmanager.core.ModUtilities; -import org.jdom2.JDOMException; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class ModPatchThread extends Thread { diff --git a/src/main/java/net/vhati/modmanager/core/ModUtilities.java b/src/main/java/net/vhati/modmanager/core/ModUtilities.java index e65718f..efcd165 100644 --- a/src/main/java/net/vhati/modmanager/core/ModUtilities.java +++ b/src/main/java/net/vhati/modmanager/core/ModUtilities.java @@ -27,12 +27,6 @@ import java.util.regex.Pattern; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import net.vhati.modmanager.core.EmptyAwareSAXHandlerFactory; -import net.vhati.modmanager.core.EOLWriter; -import net.vhati.modmanager.core.Report; -import net.vhati.modmanager.core.Report.ReportMessage; -import net.vhati.modmanager.core.SloppyXMLParser; - import ar.com.hjg.pngj.PngReader; import org.jdom2.Content; @@ -45,6 +39,12 @@ import org.jdom2.input.SAXBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import net.vhati.modmanager.core.EmptyAwareSAXHandlerFactory; +import net.vhati.modmanager.core.EOLWriter; +import net.vhati.modmanager.core.Report; +import net.vhati.modmanager.core.Report.ReportMessage; +import net.vhati.modmanager.core.SloppyXMLParser; + public class ModUtilities { diff --git a/src/main/java/net/vhati/modmanager/core/ModsScanThread.java b/src/main/java/net/vhati/modmanager/core/ModsScanThread.java index 510ccf4..a5ce660 100644 --- a/src/main/java/net/vhati/modmanager/core/ModsScanThread.java +++ b/src/main/java/net/vhati/modmanager/core/ModsScanThread.java @@ -9,15 +9,15 @@ 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 net.vhati.ftldat.PackUtilities; import net.vhati.modmanager.core.ModDB; import net.vhati.modmanager.core.ModInfo; import net.vhati.modmanager.core.ModsScanObserver; import net.vhati.modmanager.xml.JDOMModMetadataReader; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - /** * A thread to calculate MD5 hashes of files in the background. @@ -27,7 +27,7 @@ import org.apache.logging.log4j.Logger; */ public class ModsScanThread extends Thread { - private static final Logger log = LogManager.getLogger(ModsScanThread.class); + private static final Logger log = LogManager.getLogger( ModsScanThread.class ); private List fileList = new ArrayList(); private ModDB newDB; @@ -35,7 +35,7 @@ public class ModsScanThread extends Thread { public ModsScanThread( File[] files, ModDB knownDB, ModsScanObserver scanObserver ) { - this.fileList.addAll( Arrays.asList(files) ); + this.fileList.addAll( Arrays.asList( files ) ); this.newDB = new ModDB( knownDB ); this.scanObserver = scanObserver; } diff --git a/src/main/java/net/vhati/modmanager/core/Report.java b/src/main/java/net/vhati/modmanager/core/Report.java index 9f8cd91..b62b7e3 100644 --- a/src/main/java/net/vhati/modmanager/core/Report.java +++ b/src/main/java/net/vhati/modmanager/core/Report.java @@ -127,7 +127,7 @@ public class Report { if ( m.start() - lastEnd > 0 ) buf.append( seq.subSequence( lastEnd, m.start() ) ); - if ( m.group(1).length() > 0 ) { + if ( m.group( 1 ).length() > 0 ) { // At \n, instead of 0-length beginning (^). buf.append( "\n" ); for ( int i=0; i < indentCount; i++ ) { @@ -212,7 +212,7 @@ public class Report { if ( o instanceof ReportMessage == false ) return false; ReportMessage other = (ReportMessage)o; if ( this.type != other.type ) return false; - if ( !this.text.equals(other.text) ) return false; + if ( !this.text.equals( other.text ) ) return false; if ( this.nestedMessages == null ) { if ( other.nestedMessages != null ) diff --git a/src/main/java/net/vhati/modmanager/core/XMLPatcher.java b/src/main/java/net/vhati/modmanager/core/XMLPatcher.java index 6715b5a..bdc143f 100644 --- a/src/main/java/net/vhati/modmanager/core/XMLPatcher.java +++ b/src/main/java/net/vhati/modmanager/core/XMLPatcher.java @@ -303,11 +303,11 @@ public class XMLPatcher { String parOp = node.getAttributeValue( "op" ); - if ( parOp == null || (!parOp.equals("AND") && !parOp.equals("OR")) ) + if ( parOp == null || (!parOp.equals( "AND" ) && !parOp.equals( "OR" )) ) throw new IllegalArgumentException( String.format( "Invalid \"op\" attribute (%s). Must be 'AND' or 'OR'.", getPathToRoot(node) ) ); - boolean isAnd = parOp.equals("AND"); - boolean isOr = parOp.equals("OR"); + boolean isAnd = parOp.equals( "AND" ); + boolean isOr = parOp.equals( "OR" ); Set candidateSet = new HashSet(); for ( Element criteriaNode : node.getChildren() ) { @@ -317,7 +317,7 @@ public class XMLPatcher { } else { candidates = handleModFind( contextNode, criteriaNode ); if ( candidates == null ) - throw new IllegalArgumentException( String.format( "Invalid search criteria <%s> (%s). Must be a or .", criteriaNode.getName(), getPathToRoot(criteriaNode) ) ); + throw new IllegalArgumentException( String.format( "Invalid search criteria <%s> (%s). Must be a or .", criteriaNode.getName(), getPathToRoot( criteriaNode ) ) ); } if ( isOr || candidateSet.isEmpty() ) { @@ -330,7 +330,7 @@ public class XMLPatcher { Map orderedCandidateMap = new TreeMap(); for ( Element candidate : candidateSet ) { int index = contextNode.indexOf( candidate ); - orderedCandidateMap.put( new Integer(index), candidate ); + orderedCandidateMap.put( new Integer( index ), candidate ); } List matchedNodes = new ArrayList( orderedCandidateMap.values() ); @@ -420,7 +420,7 @@ public class XMLPatcher { } if ( !handled ) { - throw new IllegalArgumentException( String.format( "Unrecognized mod tag <%s> (%s).", cmdNode.getName(), getPathToRoot(cmdNode) ) ); + throw new IllegalArgumentException( String.format( "Unrecognized mod tag <%s> (%s).", cmdNode.getName(), getPathToRoot( cmdNode ) ) ); } } } @@ -462,7 +462,7 @@ public class XMLPatcher { } else if ( tmp.equals( "false" ) ) { return false; } else { - throw new IllegalArgumentException( String.format( "Invalid boolean attribute \"%s\" (%s). Must be 'true' or 'false'.", attrName, getPathToRoot(node) ) ); + throw new IllegalArgumentException( String.format( "Invalid boolean attribute \"%s\" (%s). Must be 'true' or 'false'.", attrName, getPathToRoot( node ) ) ); } } @@ -476,7 +476,7 @@ public class XMLPatcher { return Integer.parseInt( tmp ); } catch ( NumberFormatException e ) { - throw new IllegalArgumentException( String.format( "Invalid int attribute \"%s\" (%s).", attrName, getPathToRoot(node) ) ); + throw new IllegalArgumentException( String.format( "Invalid int attribute \"%s\" (%s).", attrName, getPathToRoot( node ) ) ); } } diff --git a/src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java b/src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java index f255664..4000383 100644 --- a/src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java +++ b/src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java @@ -8,9 +8,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import net.vhati.modmanager.core.AutoUpdateInfo; -import net.vhati.modmanager.core.ComparableVersion; - import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.core.JsonParser; @@ -21,10 +18,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import net.vhati.modmanager.core.AutoUpdateInfo; +import net.vhati.modmanager.core.ComparableVersion; + public class JacksonAutoUpdateReader { - private static final Logger log = LogManager.getLogger(JacksonAutoUpdateReader.class); + private static final Logger log = LogManager.getLogger( JacksonAutoUpdateReader.class ); public static AutoUpdateInfo parse( File jsonFile ) { diff --git a/src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java b/src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java index 9b964bd..3520d76 100644 --- a/src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java +++ b/src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java @@ -3,9 +3,6 @@ package net.vhati.modmanager.json; import java.io.File; import java.io.IOException; -import net.vhati.modmanager.core.ModDB; -import net.vhati.modmanager.core.ModInfo; - import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.core.JsonParser; @@ -16,10 +13,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import net.vhati.modmanager.core.ModDB; +import net.vhati.modmanager.core.ModInfo; + public class JacksonCatalogReader { - private static final Logger log = LogManager.getLogger(JacksonCatalogReader.class); + private static final Logger log = LogManager.getLogger( JacksonCatalogReader.class ); public static ModDB parse( File jsonFile ) { @@ -38,7 +38,7 @@ public class JacksonCatalogReader { for ( JsonNode infoNode : catalogNode ) { String threadURL = infoNode.get( "url" ).textValue(); String threadHash = infoNode.get( "thread_hash" ).textValue(); - if ( !threadURL.equals("???") && !threadHash.equals("???") ) + if ( !"???".equals( threadURL ) && !"???".equals( threadHash ) ) modDB.putThreadHash( threadURL, threadHash ); JsonNode versionsNode = infoNode.get( "versions" ); diff --git a/src/main/java/net/vhati/modmanager/json/JacksonCatalogWriter.java b/src/main/java/net/vhati/modmanager/json/JacksonCatalogWriter.java index 4985774..95fd0b1 100644 --- a/src/main/java/net/vhati/modmanager/json/JacksonCatalogWriter.java +++ b/src/main/java/net/vhati/modmanager/json/JacksonCatalogWriter.java @@ -9,13 +9,13 @@ import java.nio.charset.Charset; import java.util.List; import java.util.Map; -import net.vhati.modmanager.core.ModsInfo; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import net.vhati.modmanager.core.ModsInfo; + public class JacksonCatalogWriter { @@ -60,7 +60,7 @@ public class JacksonCatalogWriter { OutputStream os = null; try { os = new FileOutputStream( dstFile ); - OutputStreamWriter writer = new OutputStreamWriter( os, Charset.forName("US-ASCII") ); + OutputStreamWriter writer = new OutputStreamWriter( os, Charset.forName( "US-ASCII" ) ); mapper.writeValue( writer, rootNode ); } finally { diff --git a/src/main/java/net/vhati/modmanager/json/URLFetcher.java b/src/main/java/net/vhati/modmanager/json/URLFetcher.java index 5d32797..e8c251b 100644 --- a/src/main/java/net/vhati/modmanager/json/URLFetcher.java +++ b/src/main/java/net/vhati/modmanager/json/URLFetcher.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; public class URLFetcher { - private static final Logger log = LogManager.getLogger(URLFetcher.class); + private static final Logger log = LogManager.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 dd065e3..92d8494 100644 --- a/src/main/java/net/vhati/modmanager/scraper/ForumScraper.java +++ b/src/main/java/net/vhati/modmanager/scraper/ForumScraper.java @@ -34,13 +34,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.vhati.ftldat.PackUtilities; -import net.vhati.modmanager.core.ModDB; -import net.vhati.modmanager.core.ModInfo; -import net.vhati.modmanager.core.ModsInfo; -import net.vhati.modmanager.json.JacksonCatalogReader; -import net.vhati.modmanager.json.JacksonCatalogWriter; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -63,10 +56,17 @@ import org.apache.commons.cli.ParseException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import net.vhati.ftldat.PackUtilities; +import net.vhati.modmanager.core.ModDB; +import net.vhati.modmanager.core.ModInfo; +import net.vhati.modmanager.core.ModsInfo; +import net.vhati.modmanager.json.JacksonCatalogReader; +import net.vhati.modmanager.json.JacksonCatalogWriter; + public class ForumScraper { - private static final Logger log = LogManager.getLogger(ForumScraper.class); + private static final Logger log = LogManager.getLogger( ForumScraper.class ); private static final String MASTER_LIST_URL = "http://www.ftlgame.com/forum/viewtopic.php?f=11&t=2645"; private static final String FORUM_URL_FRAGMENT = "http://www.ftlgame.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 0b0ae42..51c9561 100644 --- a/src/main/java/net/vhati/modmanager/ui/CreateModDialog.java +++ b/src/main/java/net/vhati/modmanager/ui/CreateModDialog.java @@ -22,14 +22,14 @@ 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 net.vhati.modmanager.ui.FieldEditorPanel; import net.vhati.modmanager.ui.FieldEditorPanel.ContentType; import net.vhati.modmanager.ui.RegexDocument; import net.vhati.modmanager.xml.JDOMModMetadataWriter; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class CreateModDialog extends JDialog implements ActionListener { diff --git a/src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java b/src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java index 30b7d17..49461a0 100644 --- a/src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java +++ b/src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java @@ -10,14 +10,14 @@ 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 net.vhati.ftldat.AbstractPack; import net.vhati.ftldat.FolderPack; import net.vhati.ftldat.FTLPack; import net.vhati.ftldat.PkgPack; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class DatExtractDialog extends ProgressDialog { diff --git a/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java b/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java index 1c53513..cb8c263 100644 --- a/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java +++ b/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java @@ -53,6 +53,9 @@ 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 net.vhati.modmanager.core.AutoUpdateInfo; import net.vhati.modmanager.core.ComparableVersion; import net.vhati.modmanager.core.FTLUtilities; @@ -79,9 +82,6 @@ import net.vhati.modmanager.ui.StatusbarMouseListener; import net.vhati.modmanager.ui.table.ChecklistTablePanel; import net.vhati.modmanager.ui.table.ListState; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class ManagerFrame extends JFrame implements ActionListener, ModsScanObserver, Nerfable, Statusbar, Thread.UncaughtExceptionHandler { diff --git a/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java b/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java index f29d309..2fc82bb 100644 --- a/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java +++ b/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java @@ -15,6 +15,9 @@ 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 net.vhati.modmanager.core.AutoUpdateInfo; import net.vhati.modmanager.core.ModDB; import net.vhati.modmanager.core.ModFileInfo; @@ -25,9 +28,6 @@ import net.vhati.modmanager.json.URLFetcher; import net.vhati.modmanager.ui.ManagerFrame; import net.vhati.modmanager.ui.table.ListState; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - /** * Performs I/O-related setup for ManagerFrame in the background. diff --git a/src/main/java/net/vhati/modmanager/ui/ModInfoArea.java b/src/main/java/net/vhati/modmanager/ui/ModInfoArea.java index 3f663bf..07f7b4d 100644 --- a/src/main/java/net/vhati/modmanager/ui/ModInfoArea.java +++ b/src/main/java/net/vhati/modmanager/ui/ModInfoArea.java @@ -24,11 +24,11 @@ import javax.swing.text.StyleConstants; import javax.swing.text.StyleContext; import javax.swing.text.StyledDocument; -import net.vhati.modmanager.ui.Statusbar; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import net.vhati.modmanager.ui.Statusbar; + public class ModInfoArea extends JScrollPane { 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 b273570..cdae8f3 100644 --- a/src/main/java/net/vhati/modmanager/ui/table/TableRowTransferHandler.java +++ b/src/main/java/net/vhati/modmanager/ui/table/TableRowTransferHandler.java @@ -8,11 +8,11 @@ import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.TransferHandler; -import net.vhati.modmanager.ui.table.Reorderable; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import net.vhati.modmanager.ui.table.Reorderable; + /** * Allows drag and drop reordering of JTable rows. diff --git a/src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java b/src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java index 241c190..e361cf4 100644 --- a/src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java +++ b/src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java @@ -9,11 +9,6 @@ import java.io.StringReader; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import net.vhati.modmanager.core.ModDB; -import net.vhati.modmanager.core.ModInfo; -import net.vhati.modmanager.core.ModUtilities; -import net.vhati.modmanager.core.ModUtilities.DecodeResult; - import org.jdom2.Document; import org.jdom2.Element; import org.jdom2.JDOMException; @@ -22,10 +17,15 @@ import org.jdom2.input.SAXBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import net.vhati.modmanager.core.ModDB; +import net.vhati.modmanager.core.ModInfo; +import net.vhati.modmanager.core.ModUtilities; +import net.vhati.modmanager.core.ModUtilities.DecodeResult; + public class JDOMModMetadataReader { - private static final Logger log = LogManager.getLogger(JDOMModMetadataReader.class); + private static final Logger log = LogManager.getLogger( JDOMModMetadataReader.class ); public static final String METADATA_INNERPATH = "mod-appendix/metadata.xml";