[Freecol-developers] [PATCH] client: control: ConnectController: clean out dead code

[Enrico Weigelt, metux IT consult]

---
 .../sf/freecol/client/control/ConnectController.java   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/net/sf/freecol/client/control/ConnectController.java 
b/src/net/sf/freecol/client/control/ConnectController.java
index 50eb9aa83d2..0ef34de6e53 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -129,7 +129,7 @@ public final class ConnectController extends 
FreeColClientHolder {
                 }
             }
         }
-            
+
         logger.info("Logout begin for client " + player.getName()
             + ": " + reason.toString());
         return askServer().logout(player, reason);
@@ -480,21 +480,13 @@ public final class ConnectController extends 
FreeColClientHolder {
             try { Thread.sleep(1000); } catch (InterruptedException ie) {}
         }
         askServer().disconnect();
-        
+
         switch (fcc.getServerState()) {
         case PRE_GAME: case LOAD_GAME:
             // Name is good
             break;
 
         case IN_GAME:
-            /*
-            // Disable this check if you need to debug a multiplayer client.
-            if 
(FreeColDebugger.isInDebugMode(FreeColDebugger.DebugMode.MENUS)) {
-                getGUI().showErrorMessage(StringTemplate
-                    .template("client.debugConnect"));
-                return false;
-            }
-            */
             // Find the players, choose one.
             List<String> names = fcc.getVacantPlayerNames();
             if (names.isEmpty()) return false;
@@ -523,7 +515,7 @@ public final class ConnectController extends 
FreeColClientHolder {
      */
     public void mainTitle() {
         final FreeColClient fcc = getFreeColClient();
-        
+
         if (fcc.isMapEditor()) fcc.setMapEditor(false);
 
         if (fcc.isLoggedIn()) {
@@ -532,12 +524,12 @@ public final class ConnectController extends 
FreeColClientHolder {
             }
             return;
         }
-            
+
         fcc.stopServer();
         getGUI().removeInGameComponents();
         getGUI().mainTitle();
     }
-    
+
     /**
      * Reset to the NewPanel (except in the map editor).
      */
-- 
2.11.0.rc0.7.gbe5a750


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers