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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Loki 2012-01-28 14:30:11 +04:00
commit 4ea776ce76
2 changed files with 3 additions and 2 deletions
Mage.Client/src/main/java/mage/client/dialog
ConnectDialog.javaFeedbackDialog.java

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

@ -372,7 +372,7 @@ public class ConnectDialog extends MageDialog {
private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
BufferedReader in = null;
try {
URL serverListURL = new URL("http://mage.googlecode.com/files/server-list.txt");
URL serverListURL = new URL("http://78.129.251.125/files/server-list.txt");
Connection.ProxyType configProxyType = Connection.ProxyType.valueByText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_TYPE, "None"));

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

@ -253,6 +253,7 @@ public class FeedbackDialog extends javax.swing.JDialog {
if (MageFrame.getSession().sendFeedback(title, type, message, email)) {
JOptionPane.showMessageDialog(null, "Feedback was sent. Thank you!", "Success", JOptionPane.INFORMATION_MESSAGE);
reset();
dialog.setVisible(false);
} else {
JOptionPane.showMessageDialog(null, "Couldn't sent feedback.", "Error", JOptionPane.ERROR_MESSAGE);
}
@ -278,7 +279,7 @@ public class FeedbackDialog extends javax.swing.JDialog {
}
private void reset() {
jTabbedPane1.setSelectedIndex(0);
cbFeedbackType.setSelectedIndex(0);
txtIdeaTitle.setText("");
txtFeedbackMessage.setText("");
txtEmail.setText("");