style(server): improve readability of slot & reservation code

Author: xeruf

server/src/sc/server/gaming/PlayerSlot.java

@@ -37,38 +37,33 @@ public boolean isReserved() {
   }
 
   public synchronized String reserve() {
-    if (isReserved()) {
+    if (isReserved())
       throw new IllegalStateException("Slot already reserved.");
-    } else if (!isEmpty()) {
+    if (!isEmpty())
       throw new IllegalStateException("This slot is already occupied.");
-    } else {
-      this.reserved = true;
-      return ReservationManager.reserve(this);
-    }
+
+    this.reserved = true;
+    return ReservationManager.reserve(this);
   }
 
   public void setClient(IClient client) {
-    if (!isEmpty()) {
+    if (!isEmpty())
       throw new IllegalStateException("This slot is already occupied.");
-    }
 
     this.role = new PlayerRole(client, this);
     client.addRole(this.role);
   }
 
   public void setPlayer(Player player) {
-    if (this.role == null) {
-      throw new IllegalStateException(
-              "Slot isn't linked to a Client yet.");
-    }
+    if (this.role == null)
+      throw new IllegalStateException("Slot isn't linked to a Client yet.");
 
     this.role.setPlayer(player);
   }
 
   public synchronized void free() {
-    if (!this.reserved) {
+    if (!this.reserved)
       throw new IllegalStateException("This slot isn't reserved.");
-    }
 
     this.reserved = false;
   }
@@ -78,9 +73,8 @@ public void setDisplayName(String displayName) {
   }
 
   public String getDisplayName() {
-    if (this.displayName == null) {
+    if (this.displayName == null)
       return "Unknown";
-    }
 
     return this.displayName;
   }
@@ -90,14 +84,12 @@ public SlotDescriptor getDescriptor() {
   }
 
   public void setDescriptor(SlotDescriptor descriptor) {
-    if (descriptor == null) this.descriptor = new SlotDescriptor();
-    else this.descriptor = descriptor;
+    this.descriptor = descriptor != null ? descriptor : new SlotDescriptor();
   }
 
   public IClient getClient() {
-    if (this.role == null) {
+    if (this.role == null)
       return null;
-    }
 
     return this.role.getClient();
   }

server/src/sc/server/gaming/ReservationManager.java

@@ -14,7 +14,7 @@ public final class ReservationManager {
   private static Logger logger = LoggerFactory.getLogger(ReservationManager.class);
   private static Map<String, PlayerSlot> reservations = new HashMap<String, PlayerSlot>();
 
-  /** create Object as singleton */
+  /** Create Object as singleton. */
   private ReservationManager() {
     // singleton
   }
@@ -32,14 +32,12 @@ private ReservationManager() {
   public static synchronized PlayerSlot redeemReservationCode(Client client, String reservation)
       throws RescuableClientException {
     PlayerSlot result = reservations.remove(reservation);
-
-    if (result == null) {
+    if (result == null)
       throw new UnknownReservationException();
-    } else {
-      logger.info("Reservation {} was redeemed.", reservation);
-      result.getRoom().fillSlot(result, client);
-      return result;
-    }
+
+    logger.info("Reservation {} was redeemed.", reservation);
+    result.getRoom().fillSlot(result, client);
+    return result;
   }
 
   /**
@@ -52,32 +50,29 @@ public static synchronized PlayerSlot redeemReservationCode(Client client, Strin
    * @throws RuntimeException if the slot is already reserved
    */
   public synchronized static String reserve(PlayerSlot playerSlot) {
-    if (reservations.containsValue(playerSlot)) {
+    if (reservations.containsValue(playerSlot))
       throw new RuntimeException("This slot is already reserved.");
-    }
 
     String key = generateUniqueId();
     reservations.put(key, playerSlot);
     return key;
   }
 
   /**
-   * Generate a uniqe String ID
+   * Generate a unique String ID.
    *
    * @return the unique ID
    */
   private synchronized static String generateUniqueId() {
-    String key = UUID.randomUUID().toString();
-
-    while (reservations.containsKey(key)) {
+    String key;
+    do {
       key = UUID.randomUUID().toString();
-    }
-
+    } while (reservations.containsKey(key));
     return key;
   }
 
   /**
-   * Remove reservation with given redeem code and free that slot
+   * Remove reservation with given redeem code and free that slot.
    *
    * @param reservation the redeem code
    */