- Cleaned up all demos.

- Fixed all demo warnings.
- Fixed applet and swing demo to use invocation timeout, not connect
  timeouts.

13 files changed, 48 insertions, 6 deletions

diff --git a/java/demo/Database/library/BookI.java b/java/demo/Database/library/BookI.java
index 45a6ead30f0..18a86d7337e 100644
--- a/java/demo/Database/library/BookI.java
+++ b/java/demo/Database/library/BookI.java
@@ -15,6 +15,7 @@ import Demo.*;
 //
 class BookI extends _BookDisp
 {
+    @Override
     public void
     ice_ping(Ice.Current current)
     {
@@ -40,6 +41,7 @@ class BookI extends _BookDisp
         }
     }
 
+    @Override
     public BookDescription
     describe(Ice.Current current)
     {
@@ -66,6 +68,7 @@ class BookI extends _BookDisp
         }
     }
 
+    @Override
     public void
     setTitle(String title, Ice.Current current)
     {
@@ -89,6 +92,7 @@ class BookI extends _BookDisp
         }
     }
 
+    @Override
     public void
     setAuthors(java.util.List<String> authors, Ice.Current current)
     {
@@ -156,6 +160,7 @@ class BookI extends _BookDisp
         }
     }
 
+    @Override
     public void
     destroy(Ice.Current current)
     {
@@ -181,6 +186,7 @@ class BookI extends _BookDisp
         }
     }
 
+    @Override
     public String
     getRenter(Ice.Current current)
         throws BookNotRentedException
@@ -220,6 +226,12 @@ class BookI extends _BookDisp
         }
     }
 
+    //
+    // The context automatically closes the associated statements at the end of
+    // the request.
+    //
+    @SuppressWarnings("resource")
+    @Override
     public void
     rentBook(String name, Ice.Current current)
         throws InvalidCustomerException, BookRentedException
@@ -290,6 +302,7 @@ class BookI extends _BookDisp
         }
     }
 
+    @Override
     public void
     returnBook(Ice.Current current)
         throws BookNotRentedException
@@ -306,7 +319,7 @@ class BookI extends _BookDisp
             {
                 throw new Ice.ObjectNotExistException();
             }
-            Integer renterId = rs.getInt("renter_id");
+            rs.getInt("renter_id");
             if(rs.wasNull())
             {
                 throw new BookNotRentedException();
diff --git a/java/demo/Database/library/BookQueryResultI.java b/java/demo/Database/library/BookQueryResultI.java
index 5fa01c6bfa5..20d9a1e9688 100644
--- a/java/demo/Database/library/BookQueryResultI.java
+++ b/java/demo/Database/library/BookQueryResultI.java
@@ -24,6 +24,7 @@ class BookQueryResultI extends _BookQueryResultDisp
         }
     }
 
+    @Override
     synchronized public java.util.List<BookDescription>
     next(int n, Ice.BooleanHolder destroyed, Ice.Current current)
     {
@@ -59,6 +60,7 @@ class BookQueryResultI extends _BookQueryResultDisp
         return l;
     }
 
+    @Override
     synchronized public void
     destroy(Ice.Current current)
     {
diff --git a/java/demo/Database/library/Client.java b/java/demo/Database/library/Client.java
index 435bd7af97e..68abe0f8a9f 100644
--- a/java/demo/Database/library/Client.java
+++ b/java/demo/Database/library/Client.java
@@ -11,6 +11,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -25,6 +26,7 @@ public class Client extends Ice.Application
         }
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Database/library/ConnectionPool.java b/java/demo/Database/library/ConnectionPool.java
index 069baeea74b..d8879349d25 100644
--- a/java/demo/Database/library/ConnectionPool.java
+++ b/java/demo/Database/library/ConnectionPool.java
@@ -69,6 +69,7 @@ class ConnectionPool
                 // Probe the connection with the database.
                 java.sql.PreparedStatement stmt = conn.prepareStatement("SELECT 1");
                 java.sql.ResultSet rs = stmt.executeQuery();
+                rs.close();
                 stmt.close();
             }
         }
diff --git a/java/demo/Database/library/DispatchInterceptorI.java b/java/demo/Database/library/DispatchInterceptorI.java
index 69d7f1d3068..ad3b356d35d 100644
--- a/java/demo/Database/library/DispatchInterceptorI.java
+++ b/java/demo/Database/library/DispatchInterceptorI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 class DispatchInterceptorI extends Ice.DispatchInterceptor
 {
+    @Override
     public Ice.DispatchStatus 
     dispatch(Ice.Request request)
     {
diff --git a/java/demo/Database/library/Glacier2SessionManagerI.java b/java/demo/Database/library/Glacier2SessionManagerI.java
index e1632ba66f1..8fdff755cfa 100644
--- a/java/demo/Database/library/Glacier2SessionManagerI.java
+++ b/java/demo/Database/library/Glacier2SessionManagerI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 class Glacier2SessionManagerI extends Glacier2._SessionManagerDisp
 {
+    @Override
     public Glacier2.SessionPrx
     create(String userId, Glacier2.SessionControlPrx control, Ice.Current c)
     {
diff --git a/java/demo/Database/library/LibraryI.java b/java/demo/Database/library/LibraryI.java
index 6ef3acfc363..b7f91a89e1a 100644
--- a/java/demo/Database/library/LibraryI.java
+++ b/java/demo/Database/library/LibraryI.java
@@ -14,6 +14,7 @@ import Demo.*;
 //
 class LibraryI extends _LibraryDisp
 {
+    @Override
     public void
     queryByIsbn(String isbn, int n, BookDescriptionSeqHolder first, Ice.IntHolder nrows,
                 BookQueryResultPrxHolder result, Ice.Current current)
@@ -64,6 +65,7 @@ class LibraryI extends _LibraryDisp
         }
     }
 
+    @Override
     public void
     queryByAuthor(String author, int n, BookDescriptionSeqHolder first, Ice.IntHolder nrows,
                   BookQueryResultPrxHolder result, Ice.Current current)
@@ -146,6 +148,7 @@ class LibraryI extends _LibraryDisp
         }
     }
 
+    @Override
     public void
     queryByTitle(String title, int n, BookDescriptionSeqHolder first, Ice.IntHolder nrows,
                 BookQueryResultPrxHolder result, Ice.Current current)
@@ -196,6 +199,7 @@ class LibraryI extends _LibraryDisp
         }
     }
 
+    @Override
     public BookPrx
     createBook(String isbn, String title, java.util.List<String> authors, Ice.Current current)
         throws BookExistsException, InvalidISBNException
diff --git a/java/demo/Database/library/Parser.java b/java/demo/Database/library/Parser.java
index fe5c9dbdf30..28b3578e5e0 100644
--- a/java/demo/Database/library/Parser.java
+++ b/java/demo/Database/library/Parser.java
@@ -54,7 +54,7 @@ class Parser
                 authors.add(st.nextToken().trim());
             }
 
-            BookPrx book = _library.createBook(isbn, title, authors);
+            _library.createBook(isbn, title, authors);
             System.out.println("added new book with isbn " + isbn);
         }
         catch(BookExistsException ex)
@@ -281,7 +281,7 @@ class Parser
             if(_current != null)
             {
                 _current.proxy.rentBook(args.get(0));
-                System.out.println("the book is now rented by `" + (String)args.get(0) + "'");
+                System.out.println("the book is now rented by `" + args.get(0) + "'");
                 _current = _current.proxy.describe();
             }
             else
@@ -443,5 +443,4 @@ class Parser
     private LibraryPrx _library;
 
     private java.io.BufferedReader _in;
-    private boolean _interactive;
 }
diff --git a/java/demo/Database/library/ReapTask.java b/java/demo/Database/library/ReapTask.java
index 3ded348c1a6..ccdc720caff 100644
--- a/java/demo/Database/library/ReapTask.java
+++ b/java/demo/Database/library/ReapTask.java
@@ -38,6 +38,7 @@ class ReapTask implements Runnable
         _timeout = timeout;
     }
 
+    @Override
     synchronized public void
     run()
     {
diff --git a/java/demo/Database/library/RunParser.java b/java/demo/Database/library/RunParser.java
index 691eda79a00..9728da0f6de 100644
--- a/java/demo/Database/library/RunParser.java
+++ b/java/demo/Database/library/RunParser.java
@@ -70,11 +70,13 @@ class RunParser
             final Glacier2SessionPrx sess = Glacier2SessionPrxHelper.uncheckedCast(glacier2session);
             session = new SessionAdapter()
             {
+                @Override
                 public LibraryPrx getLibrary()
                 {
                     return sess.getLibrary();
                 }
 
+                @Override
                 public void destroy()
                 {
                     try
@@ -92,11 +94,13 @@ class RunParser
                     }
                 }
 
+                @Override
                 public void refresh()
                 {
                     sess.refresh();
                 }
 
+                @Override
                 public long getTimeout()
                 {
                     return to;
@@ -117,22 +121,26 @@ class RunParser
             final long timeout = factory.getSessionTimeout()/2;
             session = new SessionAdapter()
             {
+                @Override
                 public LibraryPrx getLibrary()
                 {
                     return sess.getLibrary();
                 }
 
+                @Override
                 public void destroy()
                 {
                     sess.destroy();
                 }
 
+                @Override
                 public void refresh()
                 {
                     sess.refresh();
                 }
 
-                 public long getTimeout()
+                 @Override
+                public long getTimeout()
                  {
                     return timeout;
                 }
@@ -153,6 +161,7 @@ class RunParser
         java.util.concurrent.ScheduledExecutorService executor = java.util.concurrent.Executors.newScheduledThreadPool(1);
         executor.scheduleAtFixedRate(new Runnable()
             {
+                @Override
                 public void
                 run()
                 {
diff --git a/java/demo/Database/library/Server.java b/java/demo/Database/library/Server.java
index e1f7b6816a2..df1e133ad86 100644
--- a/java/demo/Database/library/Server.java
+++ b/java/demo/Database/library/Server.java
@@ -7,12 +7,13 @@
 //
 // **********************************************************************
 
-import Demo.*;
+
 
 class Server extends Ice.Application
 {
     static class LocatorI implements Ice.ServantLocator
     {
+        @Override
         public Ice.Object
         locate(Ice.Current c, Ice.LocalObjectHolder cookie)
         {
@@ -20,11 +21,13 @@ class Server extends Ice.Application
             return _servant;
         }
 
+        @Override
         public void
         finished(Ice.Current c, Ice.Object servant, Object cookie)
         {
         }
 
+        @Override
         public void
         deactivate(String category)
         {
@@ -38,6 +41,7 @@ class Server extends Ice.Application
         private Ice.Object _servant;
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Database/library/SessionFactoryI.java b/java/demo/Database/library/SessionFactoryI.java
index b3c3606719a..080d6e6e349 100644
--- a/java/demo/Database/library/SessionFactoryI.java
+++ b/java/demo/Database/library/SessionFactoryI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 class SessionFactoryI extends _SessionFactoryDisp
 {
+    @Override
     public synchronized SessionPrx
     create(Ice.Current c)
     {
@@ -27,6 +28,7 @@ class SessionFactoryI extends _SessionFactoryDisp
         return proxy;
     }
 
+    @Override
     public long
     getSessionTimeout(Ice.Current c)
     {
diff --git a/java/demo/Database/library/SessionI.java b/java/demo/Database/library/SessionI.java
index 73286804f1f..a6bd290c98a 100644
--- a/java/demo/Database/library/SessionI.java
+++ b/java/demo/Database/library/SessionI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 class SessionI implements _SessionOperations, _Glacier2SessionOperations
 {
+    @Override
     synchronized public LibraryPrx
     getLibrary(Ice.Current c)
     {
@@ -21,6 +22,7 @@ class SessionI implements _SessionOperations, _Glacier2SessionOperations
         return _library;
     }
 
+    @Override
     synchronized public void
     refresh(Ice.Current c)
     {
@@ -41,6 +43,7 @@ class SessionI implements _SessionOperations, _Glacier2SessionOperations
         return 5000;
     }
 
+    @Override
     synchronized public void
     destroy(Ice.Current c)
     {