Closed wrapping streams instead of inner ones ( kartoFlane/Slipstream-Mod-Manager@0e652ab )

This commit is contained in:
Vhati 2013-11-07 06:56:05 -05:00
parent 871c60bae1
commit 80ff1f447c
2 changed files with 8 additions and 8 deletions

View file

@ -501,10 +501,10 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
private void saveModOrder( List<ModFileInfo> sortedMods ) { private void saveModOrder( List<ModFileInfo> sortedMods ) {
FileOutputStream os = null; BufferedWriter bw = null;
try { try {
os = new FileOutputStream( modorderFile ); FileOutputStream os = new FileOutputStream( modorderFile );
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter( os, Charset.forName("UTF-8") )); bw = new BufferedWriter(new OutputStreamWriter( os, Charset.forName("UTF-8") ));
for ( ModFileInfo modFileInfo : sortedMods ) { for ( ModFileInfo modFileInfo : sortedMods ) {
bw.write( modFileInfo.getName() ); bw.write( modFileInfo.getName() );
@ -516,7 +516,7 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
log.error( String.format( "Error writing \"%s\".", modorderFile.getName() ), e ); log.error( String.format( "Error writing \"%s\".", modorderFile.getName() ), e );
} }
finally { finally {
try {if (os != null) os.close();} try {if (bw != null) bw.close();}
catch (Exception e) {} catch (Exception e) {}
} }
} }

View file

@ -170,10 +170,10 @@ public class ManagerInitThread extends Thread {
private List<String> loadModOrder() { private List<String> loadModOrder() {
List<String> result = new ArrayList<String>(); List<String> result = new ArrayList<String>();
FileInputStream is = null; BufferedReader br = null;
try { try {
is = new FileInputStream( modorderFile ); FileInputStream is = new FileInputStream( modorderFile );
BufferedReader br = new BufferedReader(new InputStreamReader( is, Charset.forName("UTF-8") )); br = new BufferedReader(new InputStreamReader( is, Charset.forName("UTF-8") ));
String line; String line;
while ( (line = br.readLine()) != null ) { while ( (line = br.readLine()) != null ) {
result.add( line ); result.add( line );
@ -185,7 +185,7 @@ public class ManagerInitThread extends Thread {
log.error( String.format( "Error reading \"%s\".", modorderFile.getName() ), e ); log.error( String.format( "Error reading \"%s\".", modorderFile.getName() ), e );
} }
finally { finally {
try {if ( is != null ) is.close();} try {if ( br != null ) br.close();}
catch ( Exception e ) {} catch ( Exception e ) {}
} }