[vassalengine-svn] SF.net SVN: vassalengine:[8607] VASSAL-src/branches/Brent-3.2-New/src/ VASSAL/chat

[<swa...@us...>]

Revision: 8607
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8607&view=rev
Author:   swampwallaby
Date:     2013-03-29 10:07:56 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
Bug 10016 - P2P Client/Server modes do not work in 3.2.2
 - Interim Fix

Modified Paths:
--------------
    VASSAL-src/branches/Brent-3.2-New/src/VASSAL/chat/DynamicClient.java
    VASSAL-src/branches/Brent-3.2-New/src/VASSAL/chat/ServerAddressBook.java

Modified: VASSAL-src/branches/Brent-3.2-New/src/VASSAL/chat/DynamicClient.java
===================================================================
--- VASSAL-src/branches/Brent-3.2-New/src/VASSAL/chat/DynamicClient.java	2013-03-28 20:46:05 UTC (rev 8606)
+++ VASSAL-src/branches/Brent-3.2-New/src/VASSAL/chat/DynamicClient.java	2013-03-29 10:07:56 UTC (rev 8607)
@@ -18,15 +18,12 @@
  */
 package VASSAL.chat;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 import org.jdesktop.swingworker.SwingWorker;
 
-import VASSAL.build.GameModule;
 import VASSAL.chat.jabber.JabberClientFactory;
 import VASSAL.i18n.Resources;
 import VASSAL.tools.ErrorDialog;
@@ -56,31 +53,31 @@
 
   protected ChatServerConnection buildDelegate() throws IOException {
     ChatServerConnection c = null;
-    Properties p = getServerConfig();
+    final Properties p = ServerAddressBook.getInstance().getCurrentServerProperties();
     c = ChatServerFactory.build(p);
     return c;
   }
 
-  private Properties getServerConfig() throws IOException {
-    HttpRequestWrapper r = new HttpRequestWrapper(serverConfigURL);
-    Properties p = new Properties();
-    p.put("module", GameModule.getGameModule() == null ? "Test" : GameModule.getGameModule().getGameName()); //$NON-NLS-1$ //$NON-NLS-2$
-    p.put("vassalVersion", VASSAL.Info.getVersion()); //$NON-NLS-1$
-    List<String> l = r.doGet(p);
-    if (l.isEmpty()) {
-      throw new IOException(Resources.getString("Server.empty_response")); //$NON-NLS-1$
-    }
-    p = new Properties();
-    final StringBuilder buff = new StringBuilder();
-    for (String s : l) {
-      buff.append(s).append('\n');
-    }
-    p.load(new ByteArrayInputStream(buff.toString().getBytes()));
-    if (overrides != null) {
-      p.putAll(overrides);
-    }
-    return p;
-  }
+//  private Properties getServerConfig() throws IOException {
+//    HttpRequestWrapper r = new HttpRequestWrapper(serverConfigURL);
+//    Properties p = new Properties();
+//    p.put("module", GameModule.getGameModule() == null ? "Test" : GameModule.getGameModule().getGameName()); //$NON-NLS-1$ //$NON-NLS-2$
+//    p.put("vassalVersion", VASSAL.Info.getVersion()); //$NON-NLS-1$
+//    List<String> l = r.doGet(p);
+//    if (l.isEmpty()) {
+//      throw new IOException(Resources.getString("Server.empty_response")); //$NON-NLS-1$
+//    }
+//    p = new Properties();
+//    final StringBuilder buff = new StringBuilder();
+//    for (String s : l) {
+//      buff.append(s).append('\n');
+//    }
+//    p.load(new ByteArrayInputStream(buff.toString().getBytes()));
+//    if (overrides != null) {
+//      p.putAll(overrides);
+//    }
+//    return p;
+//  }
 
   public void setConnected(final boolean connect) {
     if (connect && !isConnected()) {
@@ -114,7 +111,12 @@
     else {
       super.setConnected(connect);
       if (!isConnected()) {
-        setDelegate(new DummyClient());
+        try {
+          setDelegate(buildDelegate());
+        }
+        catch (IOException ex) {
+          ;
+        }
       }
     }
   }

Modified: VASSAL-src/branches/Brent-3.2-New/src/VASSAL/chat/ServerAddressBook.java
===================================================================
--- VASSAL-src/branches/Brent-3.2-New/src/VASSAL/chat/ServerAddressBook.java	2013-03-28 20:46:05 UTC (rev 8606)
+++ VASSAL-src/branches/Brent-3.2-New/src/VASSAL/chat/ServerAddressBook.java	2013-03-29 10:07:56 UTC (rev 8607)
@@ -314,8 +314,11 @@
     updateButtonVisibility();
     myList.repaint();
   }
+  
+  protected Properties getCurrentServerProperties() {
+    return currentEntry.getProperties();
+  }
 
-
   public void showPopup(JComponent source) {
     final JPopupMenu popup = new JPopupMenu();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.