bug 4717 - minor fixes to casino demo

5 files changed, 51 insertions, 51 deletions

diff --git a/java/demo/Freeze/casino/BankI.java b/java/demo/Freeze/casino/BankI.java
index 382c9383c92..262738cee41 100644
--- a/java/demo/Freeze/casino/BankI.java
+++ b/java/demo/Freeze/casino/BankI.java
@@ -14,7 +14,7 @@ class BankI extends CasinoStore.PersistentBank
     {
         outstandingChips += chips;
         chipsSold += chips;
-        
+
         CasinoStore.PersistentPlayerPrx player = CasinoStore.PersistentPlayerPrxHelper.uncheckedCast(p);
 
         try
@@ -36,7 +36,7 @@ class BankI extends CasinoStore.PersistentBank
         java.util.Vector<Casino.PlayerPrx> result = new java.util.Vector<Casino.PlayerPrx>();
 
         Freeze.EvictorIterator p = _playerEvictor.getIterator("", 10);
-        
+
         while(p.hasNext())
         {
             Ice.Identity ident = p.next();
@@ -51,7 +51,7 @@ class BankI extends CasinoStore.PersistentBank
     {
         return outstandingChips;
     }
-    
+
     public int
     getEarnings(Ice.Current current)
     {
@@ -64,10 +64,9 @@ class BankI extends CasinoStore.PersistentBank
         return _betResolver.getBetCount();
     }
 
-
     public boolean
     checkAllChips(Ice.Current current)
-    { 
+    {
         int playerTotal = 0;
 
         Casino.PlayerPrx[] players = getPlayers(current);
@@ -102,7 +101,7 @@ class BankI extends CasinoStore.PersistentBank
         outstandingChips += amount;
         BetI betI = new BetI(amount, closeTime, _prx, _betEvictor, _bankEdge);
 
-        CasinoStore.PersistentBetPrx newBet = 
+        CasinoStore.PersistentBetPrx newBet =
             CasinoStore.PersistentBetPrxHelper.uncheckedCast(_betEvictor.add(betI, ident));
 
         _betResolver.add(newBet, closeTime);
@@ -132,7 +131,7 @@ class BankI extends CasinoStore.PersistentBank
             assert false;
             throw new Freeze.DatabaseException("returnAllChips: player does not exist");
         }
-        
+
         if(count != 0)
         {
             try
@@ -166,8 +165,8 @@ class BankI extends CasinoStore.PersistentBank
     {
     }
 
-    BankI(CasinoStore.PersistentBankPrx prx, 
-          Freeze.TransactionalEvictor evictor, Freeze.TransactionalEvictor playerEvictor, 
+    BankI(CasinoStore.PersistentBankPrx prx,
+          Freeze.TransactionalEvictor evictor, Freeze.TransactionalEvictor playerEvictor,
           Freeze.TransactionalEvictor betEvictor, BetResolver betResolver, int bankEdge)
     {
         chipsSold = 0;
@@ -175,10 +174,9 @@ class BankI extends CasinoStore.PersistentBank
         init(prx, evictor, playerEvictor, betEvictor, betResolver, bankEdge);
     }
 
-
-    void 
+    void
     init(CasinoStore.PersistentBankPrx prx,
-         Freeze.TransactionalEvictor evictor, Freeze.TransactionalEvictor playerEvictor, 
+         Freeze.TransactionalEvictor evictor, Freeze.TransactionalEvictor playerEvictor,
          Freeze.TransactionalEvictor betEvictor, BetResolver betResolver, int bankEdge)
     {
         _prx = prx;
@@ -189,13 +187,13 @@ class BankI extends CasinoStore.PersistentBank
         _bankEdge = bankEdge;
     }
 
-    private CasinoStore.PersistentBetPrx[] 
+    private CasinoStore.PersistentBetPrx[]
     getBets(Ice.ObjectAdapter adapter)
     {
         java.util.Vector<CasinoStore.PersistentBetPrx> result = new java.util.Vector<CasinoStore.PersistentBetPrx>();
 
         Freeze.EvictorIterator p = _betEvictor.getIterator("", 100);
-        
+
         while(p.hasNext())
         {
             Ice.Identity ident = p.next();
diff --git a/java/demo/Freeze/casino/BetI.java b/java/demo/Freeze/casino/BetI.java
index dde5c04a926..82b3f3be7ab 100644
--- a/java/demo/Freeze/casino/BetI.java
+++ b/java/demo/Freeze/casino/BetI.java
@@ -9,21 +9,23 @@
 
 class BetI extends CasinoStore.PersistentBet
 {
-    public int 
+    public int
     getAmount(Ice.Current current)
     {
         return amount;
     }
 
-    public void 
-    accept(Casino.PlayerPrx p, Ice.Current current) throws Casino.OutOfChipsException
+    public void
+    accept(Casino.PlayerPrx p, Ice.Current current)
+        throws Casino.OutOfChipsException
     {
-        CasinoStore.PersistentPlayerPrx player = CasinoStore.PersistentPlayerPrxHelper.uncheckedCast(p);
-        if(player == null)
+        if(p == null)
         {
             throw new Casino.OutOfChipsException();
         }
-        
+
+        CasinoStore.PersistentPlayerPrx player = CasinoStore.PersistentPlayerPrxHelper.uncheckedCast(p);
+
         try
         {
             player.withdraw(amount);
@@ -35,7 +37,7 @@ class BetI extends CasinoStore.PersistentBet
         }
     }
 
-    public int 
+    public int
     getChipsInPlay(Ice.Current current)
     {
         return amount * potentialWinners.size();
@@ -61,14 +63,14 @@ class BetI extends CasinoStore.PersistentBet
         // Pick a winner using random
         //
         int winnerIndex = random % (size + (_bankEdge - 1));
-        
+
         if(winnerIndex >= size)
         {
             winnerIndex = 0;
         }
-        
-        CasinoStore.WinnerPrx winner = (CasinoStore.WinnerPrx)potentialWinners.elementAt(winnerIndex);
-        
+
+        CasinoStore.WinnerPrx winner = potentialWinners.elementAt(winnerIndex);
+
         try
         {
             winner.win(amount * size);
@@ -78,10 +80,10 @@ class BetI extends CasinoStore.PersistentBet
             //
             // Goes to the bank
             //
-            winner = (CasinoStore.WinnerPrx)potentialWinners.elementAt(0);
+            winner = potentialWinners.elementAt(0);
             winner.win(amount * size);
         }
-        
+
         //
         // Self-destroys
         //
@@ -109,6 +111,6 @@ class BetI extends CasinoStore.PersistentBet
         _bankEdge = bankEdge;
     }
 
-    private Freeze.TransactionalEvictor _evictor;    
+    private Freeze.TransactionalEvictor _evictor;
     private int _bankEdge;
 }
diff --git a/java/demo/Freeze/casino/BetResolver.java b/java/demo/Freeze/casino/BetResolver.java
index 8709c105af2..bf59bad0b88 100644
--- a/java/demo/Freeze/casino/BetResolver.java
+++ b/java/demo/Freeze/casino/BetResolver.java
@@ -25,7 +25,7 @@ class BetResolver
     {
         java.util.TimerTask task = new java.util.TimerTask()
             {
-                public void 
+                public void
                 run()
                 {
                     //
diff --git a/java/demo/Freeze/casino/Client.java b/java/demo/Freeze/casino/Client.java
index 92e6c83fae1..439c56a2915 100644
--- a/java/demo/Freeze/casino/Client.java
+++ b/java/demo/Freeze/casino/Client.java
@@ -17,18 +17,18 @@ public class Client extends Ice.Application
     static final int betCount1 = 100;
     static final int betCount2 = 20;
 
-    private void 
+    private void
     printBalances(Casino.PlayerPrx[] players)
     {
         for(int i = 0; i < players.length; ++i)
         {
             Casino.PlayerPrx player = players[i];
-            
+
             if(player != null)
             {
                 try
                 {
-                    System.out.println(player.ice_getIdentity().name + ": " + player.getChips() + " chips"); 
+                    System.out.println(player.ice_getIdentity().name + ": " + player.getChips() + " chips");
                 }
                 catch(Ice.ObjectNotExistException one)
                 {
@@ -57,20 +57,20 @@ public class Client extends Ice.Application
 
         Casino.BankPrx bank = Casino.BankPrxHelper.
             uncheckedCast(communicator().propertyToProxy("Bank.Proxy"));
-        
+
         Casino.PlayerPrx[] players = bank.getPlayers();
         System.out.println("ok");
 
         System.out.println("Starting balances");
         printBalances(players);
-       
+
         System.out.println("Current bank earnings: " + bank.getEarnings() + " chips");
 
         System.out.println("All chips accounted for? " + (bank.checkAllChips() ? "yes" : "no"));
-        
+
         System.out.print("Each player buys 3,000 chips... ");
         System.out.flush();
-        
+
         for(int i = 0; i < players.length; ++i)
         {
             Casino.PlayerPrx player = players[i];
@@ -78,7 +78,7 @@ public class Client extends Ice.Application
             {
                 if(!bank.buyChips(3000, player))
                 {
-                    System.out.print("(" + player.ice_getIdentity().name + "is gone) ");
+                    System.out.print("(" + player.ice_getIdentity().name + " is gone) ");
                     players[i] = null;
                 }
             }
@@ -86,7 +86,7 @@ public class Client extends Ice.Application
         System.out.println("ok");
 
         System.out.println("All chips accounted for? " + (bank.checkAllChips() ? "yes" : "no"));
-            
+
         System.out.print("Create " + betCount1 + " 10-chips bets... ");
         System.out.flush();
 
@@ -111,7 +111,7 @@ public class Client extends Ice.Application
                     catch(Casino.OutOfChipsException ex)
                     {
                         System.out.print("(" + player.ice_getIdentity().name + " is out) ");
-                        
+
                         players[i] = null;
                     }
                 }
@@ -120,7 +120,7 @@ public class Client extends Ice.Application
         System.out.println(" ok");
 
         System.out.println("Live bets: " + bank.getLiveBetCount());
-       
+
         int index = random.nextInt(players.length);
         Casino.PlayerPrx gonner = players[index];
         players[index] = null;
@@ -142,9 +142,9 @@ public class Client extends Ice.Application
         }
 
         System.out.println("All chips accounted for? " + (bank.checkAllChips() ? "yes" : "no"));
-        
+
         System.out.println("Sleep for 2 seconds");
-        
+
         try
         {
             Thread.sleep(2000);
@@ -154,7 +154,6 @@ public class Client extends Ice.Application
         }
         System.out.println("Live bets: " + bank.getLiveBetCount());
 
-
         System.out.print("Create " + betCount2 + " 10-chips bets... ");
         System.out.flush();
 
@@ -179,14 +178,14 @@ public class Client extends Ice.Application
                     catch(Casino.OutOfChipsException ex)
                     {
                         System.out.print("(" + player.ice_getIdentity().name + " is out) ");
-                        
+
                         players[i] = null;
                     }
                 }
             }
         }
         System.out.println(" ok");
-        
+
         System.out.println("Live bets: " + bank.getLiveBetCount());
         System.out.println("Sleep for 10 seconds");
         try
@@ -197,10 +196,10 @@ public class Client extends Ice.Application
         {
         }
         System.out.println("Live bets: " + bank.getLiveBetCount());
-        
+
         System.out.println("Ending balances");
         printBalances(players);
-       
+
         System.out.println("Current bank earnings: " + bank.getEarnings() + " chips");
 
         System.out.println("All chips accounted for? " + (bank.checkAllChips() ? "yes" : "no"));
diff --git a/java/demo/Freeze/casino/PlayerI.java b/java/demo/Freeze/casino/PlayerI.java
index f9ab709cdb1..dff2417c5fd 100644
--- a/java/demo/Freeze/casino/PlayerI.java
+++ b/java/demo/Freeze/casino/PlayerI.java
@@ -22,8 +22,9 @@ class PlayerI extends CasinoStore.PersistentPlayer
         _evictor.remove(current.id);
     }
 
-    public void 
-    withdraw(int count, Ice.Current current) throws Casino.OutOfChipsException
+    public void
+    withdraw(int count, Ice.Current current)
+        throws Casino.OutOfChipsException
     {
         int newBalance = chips - count;
         if(newBalance < 0)
@@ -40,8 +41,8 @@ class PlayerI extends CasinoStore.PersistentPlayer
         chips += count;
     }
 
-    void 
-    init(CasinoStore.PersistentPlayerPrx myPrx, Freeze.TransactionalEvictor evictor, 
+    void
+    init(CasinoStore.PersistentPlayerPrx myPrx, Freeze.TransactionalEvictor evictor,
          CasinoStore.PersistentBankPrx bank)
     {
         _myPrx = myPrx;