External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 11:02:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

added quiet closing method in new streamutils class, used to clean up the connectdialog

Browse source
This commit is contained in:
Marc Zwart 2018-03-20 12:46:53 +01:00
parent 0da4e10c49
commit 9912a23007
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
View file

@ -43,6 +43,7 @@ import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Writer; import java.io.Writer;
import java.io.Closeable;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Proxy; import java.net.Proxy;
import java.net.SocketException; import java.net.SocketException;
@ -75,6 +76,7 @@ import mage.client.util.Config;
import mage.client.util.gui.countryBox.CountryItemEditor; import mage.client.util.gui.countryBox.CountryItemEditor;
import mage.client.util.sets.ConstructedFormats; import mage.client.util.sets.ConstructedFormats;
import mage.remote.Connection; import mage.remote.Connection;
import mage.utils.StreamUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -567,6 +569,7 @@ public class ConnectDialog extends MageDialog {
private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
BufferedReader in = null; BufferedReader in = null;
Writer output = null;
try { try {
String serverUrl = PreferencesDialog.getCachedValue(KEY_CONNECTION_URL_SERVER_LIST, "http://xmage.de/files/server-list.txt"); String serverUrl = PreferencesDialog.getCachedValue(KEY_CONNECTION_URL_SERVER_LIST, "http://xmage.de/files/server-list.txt");
if (serverUrl.contains("xmage.info/files/")) { if (serverUrl.contains("xmage.info/files/")) {
@ -620,7 +623,7 @@ public class ConnectDialog extends MageDialog {
} }
List<String> servers = new ArrayList<>(); List<String> servers = new ArrayList<>();
if (in != null) { if (in != null) {
Writer output = null;
if (!URLNotFound) { if (!URLNotFound) {
// write serverlist to be able to read if URL is not available // write serverlist to be able to read if URL is not available
File file = new File("serverlist.txt"); File file = new File("serverlist.txt");
@ -639,10 +642,6 @@ public class ConnectDialog extends MageDialog {
} }
} }
if (output != null) {
output.close();
}
in.close();
} }
if (servers.isEmpty()) { if (servers.isEmpty()) {
JOptionPane.showMessageDialog(null, "Couldn't find any server."); JOptionPane.showMessageDialog(null, "Couldn't find any server.");
@ -670,15 +669,12 @@ public class ConnectDialog extends MageDialog {
} catch (Exception ex) { } catch (Exception ex) {
logger.error(ex, ex); logger.error(ex, ex);
} finally { } finally {
if (in != null) { StreamUtils.closeQuietly(in);
try { StreamUtils.closeQuietly(output);
in.close();
} catch (Exception e) {
}
}
} }
}//GEN-LAST:event_jButton1ActionPerformed }//GEN-LAST:event_jButton1ActionPerformed
private void jProxySettingsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jProxySettingsButtonActionPerformed private void jProxySettingsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jProxySettingsButtonActionPerformed
PreferencesDialog.main(new String[]{PreferencesDialog.OPEN_CONNECTION_TAB}); PreferencesDialog.main(new String[]{PreferencesDialog.OPEN_CONNECTION_TAB});
}//GEN-LAST:event_jProxySettingsButtonActionPerformed }//GEN-LAST:event_jProxySettingsButtonActionPerformed

21
Mage.Common/src/main/java/mage/utils/StreamUtils.java Normal file
View file

@ -0,0 +1,21 @@
package mage.utils;
import java.io.Closeable;
public final class StreamUtils {
/***
* Quietly closes the closable, ignoring nulls and exceptions
* @param c - the closable to be closed
*/
public static void closeQuietly(Closeable c) {
if (c != null) {
try {
c.close();
}
catch (Exception e) {
}
}
}
}