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

Moderate code cleanup

Browse source
This commit is contained in:
Vhati 2017-12-08 17:15:17 -05:00
parent c4637d83d7
commit 4be63eef06
1 changed files with 63 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,13 +66,13 @@ public class FTLModManager {
File configFile = new File( "modman.cfg" ); File configFile = new File( "modman.cfg" );
boolean writeConfig = false; boolean writeConfig = false;
Properties config = new Properties(); Properties props = new Properties();
config.setProperty( SlipstreamConfig.ALLOW_ZIP, "false" ); props.setProperty( SlipstreamConfig.ALLOW_ZIP, "false" );
config.setProperty( SlipstreamConfig.FTL_DATS_PATH, "" ); props.setProperty( SlipstreamConfig.FTL_DATS_PATH, "" );
config.setProperty( SlipstreamConfig.RUN_STEAM_FTL, "false" ); props.setProperty( SlipstreamConfig.RUN_STEAM_FTL, "false" );
config.setProperty( SlipstreamConfig.NEVER_RUN_FTL, "false" ); props.setProperty( SlipstreamConfig.NEVER_RUN_FTL, "false" );
config.setProperty( SlipstreamConfig.USE_DEFAULT_UI, "false" ); props.setProperty( SlipstreamConfig.USE_DEFAULT_UI, "false" );
config.setProperty( SlipstreamConfig.REMEMBER_GEOMETRY, "true" ); props.setProperty( SlipstreamConfig.REMEMBER_GEOMETRY, "true" );
// "update_catalog" doesn't have a default. // "update_catalog" doesn't have a default.
// "update_app" doesn't have a default. // "update_app" doesn't have a default.
// "manager_geometry" doesn't have a default. // "manager_geometry" doesn't have a default.
@ -81,15 +81,15 @@ public class FTLModManager {
InputStream in = null; InputStream in = null;
try { try {
if ( configFile.exists() ) { if ( configFile.exists() ) {
log.trace( "Loading properties from config file." ); log.debug( "Loading config file" );
in = new FileInputStream( configFile ); in = new FileInputStream( configFile );
config.load( new InputStreamReader( in, "UTF-8" ) ); props.load( new InputStreamReader( in, "UTF-8" ) );
} else { } else {
writeConfig = true; // Create a new cfg, but only if necessary. writeConfig = true; // Create a new cfg, but only if necessary.
} }
} }
catch ( IOException e ) { catch ( IOException e ) {
log.error( "Error loading config.", e ); log.error( "Error loading config", e );
showErrorDialog( "Error loading config from "+ configFile.getPath() ); showErrorDialog( "Error loading config from "+ configFile.getPath() );
} }
finally { finally {
@ -97,36 +97,66 @@ public class FTLModManager {
catch ( IOException e ) {} catch ( IOException e ) {}
} }
// Look-and-Feel. SlipstreamConfig appConfig = new SlipstreamConfig( props, configFile );
String useDefaultUI = config.getProperty( SlipstreamConfig.USE_DEFAULT_UI, "false" );
// Look-and-Feel.
boolean useDefaultUI = "true".equals( appConfig.getProperty( SlipstreamConfig.USE_DEFAULT_UI, "false" ) );
if ( !useDefaultUI ) {
LookAndFeel defaultLaf = UIManager.getLookAndFeel();
log.debug( "Default look and feel is: "+ defaultLaf.getName() );
if ( !useDefaultUI.equals("true") ) {
try { try {
log.trace( "Using system Look and Feel" ); log.debug( "Setting system look and feel: "+ UIManager.getSystemLookAndFeelClassName() );
// SystemLaf is risky. It may throw an exception, or lead to graphical bugs.
// Problems are geneally caused by custom Windows themes.
UIManager.setLookAndFeel( UIManager.getSystemLookAndFeelClassName() ); UIManager.setLookAndFeel( UIManager.getSystemLookAndFeelClassName() );
} }
catch ( Exception e ) { catch ( Exception e ) {
log.error( "Error setting system Look and Feel.", e ); log.error( "Failed to set system look and feel", e );
log.info( "Setting '"+ SlipstreamConfig.USE_DEFAULT_UI +"=true' in the config file will prevent this error." ); log.info( "Setting "+ SlipstreamConfig.USE_DEFAULT_UI +"=true in the config file to prevent this error..." );
appConfig.setProperty( SlipstreamConfig.USE_DEFAULT_UI, "true" );
writeConfig = true;
try {
UIManager.setLookAndFeel( defaultLaf );
}
catch ( Exception f ) {
log.error( "Error returning to the default look and feel after failing to set system look and feel", f );
// Write an emergency config and exit.
try {
appConfig.writeConfig();
}
catch ( IOException g ) {
log.error( String.format( "Error writing config to \"%s\"", configFile.getPath(), g ) );
}
System.gc();
return;
}
} }
} }
else { else {
log.debug( "Using default Look and Feel." ); log.debug( "Using default Look and Feel" );
} }
// FTL Resources Path. // FTL Resources Path.
File datsDir = null; File datsDir = null;
String datsPath = config.getProperty( SlipstreamConfig.FTL_DATS_PATH, "" ); String datsPath = appConfig.getProperty( SlipstreamConfig.FTL_DATS_PATH, "" );
if ( datsPath.length() > 0 ) { if ( datsPath.length() > 0 ) {
log.info( "Using FTL dats path from config: "+ datsPath ); log.info( "Using FTL dats path from config: "+ datsPath );
datsDir = new File( datsPath ); datsDir = new File( datsPath );
if ( FTLUtilities.isDatsDirValid( datsDir ) == false ) { if ( FTLUtilities.isDatsDirValid( datsDir ) == false ) {
log.error( "The config's ftl_dats_path does not exist, or it lacks data.dat." ); log.error( "The config's "+ SlipstreamConfig.FTL_DATS_PATH +" does not exist, or it is invalid" );
datsDir = null; datsDir = null;
} }
} else { }
log.trace( "No FTL dats path previously set." ); else {
log.debug( "No "+ SlipstreamConfig.FTL_DATS_PATH +" previously set" );
} }
// Find/prompt for the path to set in the config. // Find/prompt for the path to set in the config.
@ -138,12 +168,12 @@ public class FTLModManager {
} }
if ( datsDir == null ) { if ( datsDir == null ) {
log.debug( "FTL dats path was not located automatically. Prompting user for location." ); log.debug( "FTL dats path was not located automatically. Prompting user for location" );
datsDir = FTLUtilities.promptForDatsDir( null ); datsDir = FTLUtilities.promptForDatsDir( null );
} }
if ( datsDir != null ) { if ( datsDir != null ) {
config.setProperty( SlipstreamConfig.FTL_DATS_PATH, datsDir.getAbsolutePath() ); appConfig.setProperty( SlipstreamConfig.FTL_DATS_PATH, datsDir.getAbsolutePath() );
writeConfig = true; writeConfig = true;
log.info( "FTL dats located at: "+ datsDir.getAbsolutePath() ); log.info( "FTL dats located at: "+ datsDir.getAbsolutePath() );
} }
@ -151,7 +181,7 @@ public class FTLModManager {
if ( datsDir == null ) { if ( datsDir == null ) {
showErrorDialog( "FTL resources were not found.\nThe Mod Manager will now exit." ); showErrorDialog( "FTL resources were not found.\nThe Mod Manager will now exit." );
log.debug( "No FTL dats path found, exiting." ); log.debug( "No FTL dats path found, exiting" );
System.gc(); System.gc();
// System.exit( 1 ); // Don't do this (InterruptedException). Let EDT end gracefully. // System.exit( 1 ); // Don't do this (InterruptedException). Let EDT end gracefully.
@ -160,8 +190,8 @@ public class FTLModManager {
// Prompt if update_catalog is invalid or hasn't been set. // Prompt if update_catalog is invalid or hasn't been set.
boolean askAboutUpdates = false; boolean askAboutUpdates = false;
String catalogUpdateInterval = config.getProperty( SlipstreamConfig.UPDATE_CATALOG ); String catalogUpdateInterval = appConfig.getProperty( SlipstreamConfig.UPDATE_CATALOG );
String appUpdateInterval = config.getProperty( SlipstreamConfig.UPDATE_APP ); String appUpdateInterval = appConfig.getProperty( SlipstreamConfig.UPDATE_APP );
if ( catalogUpdateInterval == null || !catalogUpdateInterval.matches( "^\\d+$" ) ) if ( catalogUpdateInterval == null || !catalogUpdateInterval.matches( "^\\d+$" ) )
askAboutUpdates = true; askAboutUpdates = true;
@ -177,23 +207,22 @@ public class FTLModManager {
int response = JOptionPane.showConfirmDialog( null, message, "Updates", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE ); int response = JOptionPane.showConfirmDialog( null, message, "Updates", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE );
if ( response == JOptionPane.YES_OPTION ) { if ( response == JOptionPane.YES_OPTION ) {
config.setProperty( SlipstreamConfig.UPDATE_CATALOG, "7" ); appConfig.setProperty( SlipstreamConfig.UPDATE_CATALOG, "7" );
config.setProperty( SlipstreamConfig.UPDATE_APP, "4" ); appConfig.setProperty( SlipstreamConfig.UPDATE_APP, "4" );
} }
else { else {
config.setProperty( SlipstreamConfig.UPDATE_CATALOG, "0" ); appConfig.setProperty( SlipstreamConfig.UPDATE_CATALOG, "0" );
config.setProperty( SlipstreamConfig.UPDATE_APP, "0" ); appConfig.setProperty( SlipstreamConfig.UPDATE_APP, "0" );
} }
writeConfig = true;
} }
SlipstreamConfig appConfig = new SlipstreamConfig( config, configFile );
if ( writeConfig ) { if ( writeConfig ) {
try { try {
appConfig.writeConfig(); appConfig.writeConfig();
} }
catch ( IOException e ) { catch ( IOException e ) {
String errorMsg = String.format( "Error writing config to \"%s\".", configFile.getPath() ); String errorMsg = String.format( "Error writing config to \"%s\"", configFile.getPath() );
log.error( errorMsg, e ); log.error( errorMsg, e );
showErrorDialog( errorMsg ); showErrorDialog( errorMsg );
} }
@ -206,7 +235,7 @@ public class FTLModManager {
frame.setVisible( true ); frame.setVisible( true );
} }
catch ( Exception e ) { catch ( Exception e ) {
log.error( "Exception while creating ManagerFrame.", e ); log.error( "Exception while creating ManagerFrame", e );
System.gc(); System.gc();
// System.exit( 1 ); // Don't do this (InterruptedException). Let EDT end gracefully. // System.exit( 1 ); // Don't do this (InterruptedException). Let EDT end gracefully.