github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

fixed client proxy settings

Browse source
This commit is contained in:
BetaSteward 2011-09-09 23:07:55 -04:00
parent cdd0ba6d0c
commit d512fc1021
3 changed files with 13 additions and 4 deletions
Mage.Client/src/main/java
mage/client/dialog
PreferencesDialog.formPreferencesDialog.java
org/mage/plugins/card/images
DownloadPictures.java

3
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
View file

@ -156,9 +156,6 @@
</Border> </Border>
</Property> </Property>
</Properties> </Properties>
<AccessibilityProperties>
<Property name="AccessibleContext.accessibleName" type="java.lang.String" value="Battlefield"/>
</AccessibilityProperties>
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">

12
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
View file

@ -644,6 +644,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
save(prefs, dialog.nonLandPermanentsInOnePile, KEY_PERMANENTS_IN_ONE_PILE, "true", "false", UPDATE_CACHE_POLICY); save(prefs, dialog.nonLandPermanentsInOnePile, KEY_PERMANENTS_IN_ONE_PILE, "true", "false", UPDATE_CACHE_POLICY);
// connection // connection
save(prefs, dialog.cbProxyType, KEY_PROXY_TYPE);
save(prefs, dialog.txtProxyServer, KEY_PROXY_ADDRESS); save(prefs, dialog.txtProxyServer, KEY_PROXY_ADDRESS);
save(prefs, dialog.txtProxyPort, KEY_PROXY_PORT); save(prefs, dialog.txtProxyPort, KEY_PROXY_PORT);
save(prefs, dialog.txtProxyUserName, KEY_PROXY_USERNAME); save(prefs, dialog.txtProxyUserName, KEY_PROXY_USERNAME);
@ -776,6 +777,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
// connection // connection
dialog.cbProxyType.setSelectedItem(Connection.ProxyType.valueOf(MageFrame.getPreferences().get(KEY_PROXY_TYPE, "NONE").toUpperCase())); dialog.cbProxyType.setSelectedItem(Connection.ProxyType.valueOf(MageFrame.getPreferences().get(KEY_PROXY_TYPE, "NONE").toUpperCase()));
load(prefs, dialog.txtProxyServer, KEY_PROXY_ADDRESS, Config.serverName); load(prefs, dialog.txtProxyServer, KEY_PROXY_ADDRESS, Config.serverName);
load(prefs, dialog.txtProxyPort, KEY_PROXY_PORT, Integer.toString(Config.port)); load(prefs, dialog.txtProxyPort, KEY_PROXY_PORT, Integer.toString(Config.port));
load(prefs, dialog.txtProxyUserName, KEY_PROXY_USERNAME, ""); load(prefs, dialog.txtProxyUserName, KEY_PROXY_USERNAME, "");
@ -852,6 +854,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
field.setText(prop); field.setText(prop);
} }
private static void load(Preferences prefs, JComboBox field, String propName, String defaultValue) {
String prop = prefs.get(propName, defaultValue);
field.setSelectedItem(prop);
}
private static void load(Preferences prefs, JCheckBox checkBox, String propName) { private static void load(Preferences prefs, JCheckBox checkBox, String propName) {
load(prefs, checkBox, propName, PHASE_ON); load(prefs, checkBox, propName, PHASE_ON);
} }
@ -871,6 +878,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
prefs.put(propName, textField.getText().trim()); prefs.put(propName, textField.getText().trim());
updateCache(propName, textField.getText().trim()); updateCache(propName, textField.getText().trim());
} }
private static void save(Preferences prefs, JComboBox comboBox, String propName) {
prefs.put(propName, comboBox.getSelectedItem().toString().trim());
updateCache(propName, comboBox.getSelectedItem().toString().trim());
}
public void reset() { public void reset() {
jTabbedPane1.setSelectedIndex(0); jTabbedPane1.setSelectedIndex(0);

2
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
View file

@ -414,7 +414,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
default: p = Proxy.NO_PROXY; break; default: p = Proxy.NO_PROXY; break;
} }
if (!p.equals(Proxy.NO_PROXY)) { if (type != Proxy.Type.DIRECT) {
try { try {
String address = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_ADDRESS, ""); String address = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_ADDRESS, "");
Integer port = Integer.parseInt(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_PORT, "80")); Integer port = Integer.parseInt(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_PORT, "80"));