style: clean up a few method signatures

# Conflicts:
#	server/src/sc/server/Lobby.kt
#	server/src/sc/server/network/ClientManager.java
#	server/src/sc/server/network/NewClientListener.java

Author: xeruf

helpers/test-client/src/sc/TestClient.java

@@ -267,7 +267,7 @@ protected void onObject(ProtocolMessage message) {
                 logger.error("{} crashed, look into {}", player.name, logDir);
                 exit(2);
               }
-            // Max game length: Roundlimit * 2 * 2 seconds, one second buffer per round
+            // Max game length: turns(Roundlimit * 2) * turnlength(2 seconds), one second buffer per round
             if (slept > Constants.ROUND_LIMIT * 5) {
               logger.error("The game seems to hang, exiting!");
               exit(2);

server/test/sc/server/network/MockClient.java

@@ -29,8 +29,7 @@ public MockClient(StringNetworkInterface stringInterface, XStream xStream)
   }
 
   public MockClient() throws IOException {
-    this(new StringNetworkInterface("<protocol>"), Configuration
-            .getXStream());
+    this(new StringNetworkInterface("<protocol>"), Configuration.getXStream());
   }
 
   @Override

server/test/sc/server/roles/AdministratorTest.java

@@ -10,32 +10,27 @@
 import sc.server.network.MockClient;
 import sc.server.network.PacketCallback;
 import sc.server.plugins.TestPlugin;
-import sc.shared.InvalidGameStateException;
-
-import java.io.IOException;
 
 public class AdministratorTest extends AbstractRoleTest {
   private static final String CORRECT_PASSWORD = "this-is-a-secret";
   private static final String WRONG_PASSWORD = "i-am-a-hacker";
 
   @Test
-  public void shouldBecomeAdminWithCorrectPassword() throws IOException,
-          RescuableClientException, InvalidGameStateException {
+  public void shouldBecomeAdminWithCorrectPassword() {
     Client client = connectAsAdmin();
 
     Assert.assertEquals(1, client.getRoles().size());
     Assert.assertEquals(true, client.isAdministrator());
   }
 
   @Test
-  public void shouldNotBecomeAdminWithWrongPassword() throws IOException, InvalidGameStateException {
+  public void shouldNotBecomeAdminWithWrongPassword() {
     Client client = connectClient();
 
     Configuration.set(Configuration.PASSWORD_KEY, CORRECT_PASSWORD);
 
     try {
-      this.lobby.onRequest(client, new PacketCallback(new AuthenticateRequest(
-              WRONG_PASSWORD)));
+      this.lobby.onRequest(client, new PacketCallback(new AuthenticateRequest(WRONG_PASSWORD)));
       Assert.fail("No exception was thrown");
     } catch (RescuableClientException e) {
       // expected
@@ -45,15 +40,14 @@ public void shouldNotBecomeAdminWithWrongPassword() throws IOException, InvalidG
     Assert.assertEquals(false, client.isAdministrator());
   }
 
-  protected MockClient connectAsAdmin() throws InvalidGameStateException {
+  protected MockClient connectAsAdmin() {
     MockClient client = null;
     client = connectClient();
 
     Configuration.set(Configuration.PASSWORD_KEY, CORRECT_PASSWORD);
 
     try {
-      this.lobby.onRequest(client, new PacketCallback(new AuthenticateRequest(
-              CORRECT_PASSWORD)));
+      this.lobby.onRequest(client, new PacketCallback(new AuthenticateRequest(CORRECT_PASSWORD)));
     } catch (RescuableClientException e) {
       Assert.fail("Could not authenticate as admin.");
     }
@@ -62,12 +56,9 @@ protected MockClient connectAsAdmin() throws InvalidGameStateException {
   }
 
   @Test
-  public void shouldBeAbleToPrepareGame() throws RescuableClientException, InvalidGameStateException {
+  public void shouldBeAbleToPrepareGame() throws RescuableClientException {
     Client client = connectAsAdmin();
-
-    this.lobby.onRequest(client, new PacketCallback(new PrepareGameRequest(
-            TestPlugin.TEST_PLUGIN_UUID)));
-
+    this.lobby.onRequest(client, new PacketCallback(new PrepareGameRequest(TestPlugin.TEST_PLUGIN_UUID)));
     Assert.assertEquals(1, this.gameMgr.getGames().size());
   }