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

Renamed JacksonGrognakCatalogReader to JacksonCatalogReader

Browse source
This commit is contained in:
Vhati 2013-09-19 13:10:32 -04:00
parent 5cd19480ad
commit d04370fd81
4 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/vhati/modmanager/json/JacksonGrognakCatalogReader.java → src/main/java/net/vhati/modmanager/json/JacksonCatalogReader.java
View file

@ -17,9 +17,9 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
public class JacksonGrognakCatalogReader { public class JacksonCatalogReader {
private static final Logger log = LogManager.getLogger(JacksonGrognakCatalogReader.class); private static final Logger log = LogManager.getLogger(JacksonCatalogReader.class);
public static ModDB parse( File jsonFile ) { public static ModDB parse( File jsonFile ) {

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

@ -38,7 +38,7 @@ import net.vhati.ftldat.FTLDat;
import net.vhati.modmanager.core.ModDB; import net.vhati.modmanager.core.ModDB;
import net.vhati.modmanager.core.ModInfo; import net.vhati.modmanager.core.ModInfo;
import net.vhati.modmanager.core.ModsInfo; import net.vhati.modmanager.core.ModsInfo;
import net.vhati.modmanager.json.JacksonGrognakCatalogReader; import net.vhati.modmanager.json.JacksonCatalogReader;
import net.vhati.modmanager.json.JacksonCatalogWriter; import net.vhati.modmanager.json.JacksonCatalogWriter;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
@ -164,7 +164,7 @@ public class ForumScraper {
log.info( "Loading json catalog..." ); log.info( "Loading json catalog..." );
File srcFile = new File( cmdline.getOptionValue( "load-json" ) ); File srcFile = new File( cmdline.getOptionValue( "load-json" ) );
ModDB newDB = JacksonGrognakCatalogReader.parse( srcFile ); ModDB newDB = JacksonCatalogReader.parse( srcFile );
if ( newDB != null ) modDB = newDB; if ( newDB != null ) modDB = newDB;
} }

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

@ -14,15 +14,10 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.io.BufferedReader;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@ -79,8 +74,6 @@ import net.vhati.modmanager.core.ModUtilities;
import net.vhati.modmanager.core.Report; import net.vhati.modmanager.core.Report;
import net.vhati.modmanager.core.Report.ReportFormatter; import net.vhati.modmanager.core.Report.ReportFormatter;
import net.vhati.modmanager.core.SlipstreamConfig; import net.vhati.modmanager.core.SlipstreamConfig;
import net.vhati.modmanager.json.JacksonAutoUpdateReader;
import net.vhati.modmanager.json.JacksonGrognakCatalogReader;
import net.vhati.modmanager.json.JacksonCatalogWriter; import net.vhati.modmanager.json.JacksonCatalogWriter;
import net.vhati.modmanager.json.URLFetcher; import net.vhati.modmanager.json.URLFetcher;
import net.vhati.modmanager.ui.ChecklistTableModel; import net.vhati.modmanager.ui.ChecklistTableModel;

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

@ -19,7 +19,7 @@ import net.vhati.modmanager.core.AutoUpdateInfo;
import net.vhati.modmanager.core.ModDB; import net.vhati.modmanager.core.ModDB;
import net.vhati.modmanager.core.SlipstreamConfig; import net.vhati.modmanager.core.SlipstreamConfig;
import net.vhati.modmanager.json.JacksonAutoUpdateReader; import net.vhati.modmanager.json.JacksonAutoUpdateReader;
import net.vhati.modmanager.json.JacksonGrognakCatalogReader; import net.vhati.modmanager.json.JacksonCatalogReader;
import net.vhati.modmanager.json.URLFetcher; import net.vhati.modmanager.json.URLFetcher;
import net.vhati.modmanager.ui.ManagerFrame; import net.vhati.modmanager.ui.ManagerFrame;
@ -75,7 +75,7 @@ public class ManagerInitThread extends Thread {
private void init() throws InterruptedException { private void init() throws InterruptedException {
if ( metadataFile.exists() ) { if ( metadataFile.exists() ) {
// Load cached metadata first, before scanning for new info. // Load cached metadata first, before scanning for new info.
ModDB cachedDB = JacksonGrognakCatalogReader.parse( metadataFile ); ModDB cachedDB = JacksonCatalogReader.parse( metadataFile );
if ( cachedDB != null ) frame.setLocalModDB( cachedDB ); if ( cachedDB != null ) frame.setLocalModDB( cachedDB );
} }
@ -194,7 +194,7 @@ public class ManagerInitThread extends Thread {
private void reloadCatalog() { private void reloadCatalog() {
ModDB currentDB = JacksonGrognakCatalogReader.parse( catalogFile ); ModDB currentDB = JacksonCatalogReader.parse( catalogFile );
if ( currentDB != null ) frame.setCatalogModDB( currentDB ); if ( currentDB != null ) frame.setCatalogModDB( currentDB );
} }