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

Fixed more System.exit(1) InterruptedExceptions

Browse source
This commit is contained in:
Vhati 2017-12-07 13:43:49 -05:00
parent 8a934027f1
commit 2ed948468b
2 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger;
public class FTLModManager { public class FTLModManager {
private static final Logger log = LogManager.getLogger(FTLModManager.class); private static final Logger log = LogManager.getLogger( FTLModManager.class );
public static final String APP_NAME = "Slipstream Mod Manager"; public static final String APP_NAME = "Slipstream Mod Manager";
public static final ComparableVersion APP_VERSION = new ComparableVersion( "1.7" ); public static final ComparableVersion APP_VERSION = new ComparableVersion( "1.7" );
@ -48,15 +48,18 @@ public class FTLModManager {
private static void guiInit() { private static void guiInit() {
log.debug( String.format( "%s v%s", APP_NAME, APP_VERSION ) ); 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", 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") ) ); 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. // Nag if the jar was double-clicked.
if ( new File("./mods/").exists() == false ) { if ( new File( "./mods/" ).exists() == false ) {
String currentPath = new File(".").getAbsoluteFile().getParentFile().getAbsolutePath(); String currentPath = new File( "." ).getAbsoluteFile().getParentFile().getAbsolutePath();
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 ) ); 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 ) ); System.err.println( String.format( "Slipstream could not find its own folder (Currently in \"%s\"), exiting.", currentPath ) );
System.exit( 1 );
System.gc();
// System.exit( 1 ); // Don't do this (InterruptedException). Let EDT end gracefully.
return;
} }
@ -148,7 +151,10 @@ 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.exit( 1 );
System.gc();
// System.exit( 1 ); // Don't do this (InterruptedException). Let EDT end gracefully.
return;
} }
// Prompt if update_catalog is invalid or hasn't been set. // Prompt if update_catalog is invalid or hasn't been set.
@ -156,9 +162,9 @@ public class FTLModManager {
String catalogUpdateInterval = config.getProperty( "update_catalog" ); String catalogUpdateInterval = config.getProperty( "update_catalog" );
String appUpdateInterval = config.getProperty( "update_app" ); String appUpdateInterval = config.getProperty( "update_app" );
if ( catalogUpdateInterval == null || !catalogUpdateInterval.matches("^\\d+$") ) if ( catalogUpdateInterval == null || !catalogUpdateInterval.matches( "^\\d+$" ) )
askAboutUpdates = true; askAboutUpdates = true;
if ( appUpdateInterval == null || !appUpdateInterval.matches("^\\d+$") ) if ( appUpdateInterval == null || !appUpdateInterval.matches( "^\\d+$" ) )
askAboutUpdates = true; askAboutUpdates = true;
if ( askAboutUpdates ) { if ( askAboutUpdates ) {
@ -168,7 +174,7 @@ public class FTLModManager {
message += "for the latest mods?\n\n"; message += "for the latest mods?\n\n";
message += "You can change this later in modman.cfg."; message += "You can change this later in modman.cfg.";
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( "update_catalog", "7" ); config.setProperty( "update_catalog", "7" );
config.setProperty( "update_app", "4" ); config.setProperty( "update_app", "4" );
@ -195,11 +201,14 @@ public class FTLModManager {
try { try {
ManagerFrame frame = new ManagerFrame( appConfig, APP_NAME, APP_VERSION, APP_URL, APP_AUTHOR ); ManagerFrame frame = new ManagerFrame( appConfig, APP_NAME, APP_VERSION, APP_URL, APP_AUTHOR );
frame.init(); frame.init();
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.exit(1);
System.gc();
// System.exit( 1 ); // Don't do this (InterruptedException). Let EDT end gracefully.
return;
} }
} }

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

@ -288,7 +288,7 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
} }
System.gc(); System.gc();
//System.exit( 0 ); // Don't interrupt lingering non-daemon threads. //System.exit( 0 ); // Don't do this (InterruptedException). Let EDT end gracefully.
} }
}); });