jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trivial code cleanup

Browse source
This commit is contained in:
Vhati 2017-12-11 13:30:24 -05:00
parent ba011d78ee
commit 857fb5d33d
23 changed files with 94 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/net/vhati/modmanager/FTLModManager.java
View file

@ -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 {

20
src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java
View file

@ -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 {

2
src/main/java/net/vhati/modmanager/core/DelayedDeleteHook.java
View file

@ -18,9 +18,11 @@ import java.util.List;
* Runtime.getRuntime().addShutdownHook( deleteHook );
*/
public class DelayedDeleteHook extends Thread {
private LinkedHashSet<Thread> watchedThreads = new LinkedHashSet<Thread>();
private LinkedHashSet<File> doomedFiles = new LinkedHashSet<File>();
public synchronized void addWatchedThread( Thread t ) {
if ( watchedThreads == null )
throw new IllegalStateException( "Shutdown in progress" );

6
src/main/java/net/vhati/modmanager/core/HashThread.java
View file

@ -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.

10
src/main/java/net/vhati/modmanager/core/ModPatchThread.java
View file

@ -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 {

12
src/main/java/net/vhati/modmanager/core/ModUtilities.java
View file

@ -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 {

6
src/main/java/net/vhati/modmanager/core/ModsScanThread.java
View file

@ -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.

6
src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java
View file

@ -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,6 +18,9 @@ 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 {

8
src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java
View file

@ -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,6 +13,9 @@ 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 {
@ -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" );

4
src/main/java/net/vhati/modmanager/json/JacksonCatalogWriter.java
View file

@ -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 {

14
src/main/java/net/vhati/modmanager/scraper/ForumScraper.java
View file

@ -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,6 +56,13 @@ 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 {

6
src/main/java/net/vhati/modmanager/ui/CreateModDialog.java
View file

@ -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 {

6
src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java
View file

@ -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 {

6
src/main/java/net/vhati/modmanager/ui/ManagerFrame.java
View file

@ -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 {

6
src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java
View file

@ -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.

4
src/main/java/net/vhati/modmanager/ui/ModInfoArea.java
View file

@ -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 {

4
src/main/java/net/vhati/modmanager/ui/table/TableRowTransferHandler.java
View file

@ -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.

10
src/main/java/net/vhati/modmanager/xml/JDOMModMetadataReader.java
View file

@ -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,6 +17,11 @@ 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 {