Merge branch 'master' into slim

FreeCol · Jan 6, 2020 · d25a3a7 · d25a3a7
2 parents abf8c2f + 4a66f88
commit d25a3a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/net/sf/freecol/common/networking/ServerAPI.java b/src/net/sf/freecol/common/networking/ServerAPI.java
@@ -201,7 +201,6 @@ private boolean ask(Message message) {
             }
         }
         return false;
-
     }
 
 

diff --git a/src/net/sf/freecol/server/control/InGameController.java b/src/net/sf/freecol/server/control/InGameController.java
@@ -3797,6 +3797,8 @@ public ChangeSet spySettlement(ServerPlayer serverPlayer, Unit unit,
                                    Settlement settlement) {
         ChangeSet cs = new ChangeSet();
 
+        logger.info("Spy settlement for " + unit.getId()
+            + " at " + settlement.getId() + "(" + settlement.getName() + ")");
         cs.addSpy(unit, settlement);
         unit.setMovesLeft(0);
         cs.addPartial(See.only(serverPlayer), unit,
@@ -3814,7 +3816,6 @@ public ChangeSet spySettlement(ServerPlayer serverPlayer, Unit unit,
      */
     public ChangeSet trainUnitInEurope(ServerPlayer serverPlayer,
                                        UnitType type) {
-
         Europe europe = serverPlayer.getEurope();
         if (europe == null) {
             return serverPlayer.clientError("No Europe to train in.");

diff --git a/test/src/net/sf/freecol/client/ClientTestHelper.java b/test/src/net/sf/freecol/client/ClientTestHelper.java
@@ -40,7 +40,8 @@ public class ClientTestHelper {
 
     private static FreeColClient client = null;
 
-    public static FreeColClient startClient(FreeColServer freeColServer, Specification specification) {
+    public static FreeColClient startClient(FreeColServer freeColServer,
+                                            Specification specification) {
         // This is not ideal, but headless mode allows cutting off
         // some excessive resource loading, especially in the sound
         // tests where the resource manager is exercised.
@@ -52,18 +53,16 @@ public static FreeColClient startClient(FreeColServer freeColServer, Specificati
         Messages.loadMessageBundle(FreeCol.getLocale());
 
         logger.info("Debug value: " + FreeColDebugger.isInDebugMode());
-
         client = FreeColClient.startTestClient(specification);
         assertNotNull(client);
 
         ConnectController connectController = client.getConnectController();
         client.setFreeColServer(freeColServer);
         client.setSinglePlayer(true);
 
-        assertTrue(connectController.requestLogin("test",
-                   freeColServer.getHost(),
-                   freeColServer.getPort()));
-
+        boolean ok = connectController.requestLogin("test",
+            freeColServer.getHost(), freeColServer.getPort());
+        assertTrue("test login", ok);
         connectController.startSinglePlayerGame(specification);
         return client;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -201,7 +201,6 @@ private boolean ask(Message message) { @@
                 }
             }
             return false;
         }
@@ Expand Down @@