- Cleaned up all demos.

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

6 files changed, 13 insertions, 1 deletions

diff --git a/java/demo/Ice/session/Client.java b/java/demo/Ice/session/Client.java
index 060e7a20ddf..5ab10738338 100644
--- a/java/demo/Ice/session/Client.java
+++ b/java/demo/Ice/session/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -41,6 +42,7 @@ public class Client extends Ice.Application
             "?:     help\n");
     }
 
+    @Override
     public int
     run(String[] args)
     {
@@ -88,6 +90,7 @@ public class Client extends Ice.Application
             _session = factory.create(name);
             _executor.scheduleAtFixedRate(new Runnable()
             {
+                @Override
                 public void
                 run()
                 {
diff --git a/java/demo/Ice/session/HelloI.java b/java/demo/Ice/session/HelloI.java
index d2b801f1e79..828b9cafee6 100644
--- a/java/demo/Ice/session/HelloI.java
+++ b/java/demo/Ice/session/HelloI.java
@@ -18,6 +18,7 @@ public class HelloI extends _HelloDisp
         _id = id;
     }
 
+    @Override
     public void
     sayHello(Ice.Current current)
     {
diff --git a/java/demo/Ice/session/ReapTask.java b/java/demo/Ice/session/ReapTask.java
index 39b8bb1fad5..5bb07c01a58 100644
--- a/java/demo/Ice/session/ReapTask.java
+++ b/java/demo/Ice/session/ReapTask.java
@@ -23,6 +23,7 @@ class ReapTask implements Runnable
         SessionI session;
     }
 
+    @Override
     synchronized public void
     run()
     {
diff --git a/java/demo/Ice/session/Server.java b/java/demo/Ice/session/Server.java
index 4f8582a0775..9e32d4d9849 100644
--- a/java/demo/Ice/session/Server.java
+++ b/java/demo/Ice/session/Server.java
@@ -7,10 +7,11 @@
 //
 // **********************************************************************
 
-import Demo.*;
+
 
 public class Server extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/session/SessionFactoryI.java b/java/demo/Ice/session/SessionFactoryI.java
index 0695713b271..5ce2c405e7b 100644
--- a/java/demo/Ice/session/SessionFactoryI.java
+++ b/java/demo/Ice/session/SessionFactoryI.java
@@ -16,6 +16,7 @@ class SessionFactoryI extends _SessionFactoryDisp
         _reaper = reaper;
     }
 
+    @Override
     public synchronized SessionPrx
     create(String name, Ice.Current c)
     {
@@ -25,6 +26,7 @@ class SessionFactoryI extends _SessionFactoryDisp
         return proxy;
     }
 
+    @Override
     public void
     shutdown(Ice.Current c)
     {
diff --git a/java/demo/Ice/session/SessionI.java b/java/demo/Ice/session/SessionI.java
index 5a9fa225b2b..0ecb774a9ea 100644
--- a/java/demo/Ice/session/SessionI.java
+++ b/java/demo/Ice/session/SessionI.java
@@ -19,6 +19,7 @@ class SessionI extends _SessionDisp
         System.out.println("The session " + _name + " is now created.");
     }
 
+    @Override
     synchronized public HelloPrx
     createHello(Ice.Current c)
     {
@@ -31,6 +32,7 @@ class SessionI extends _SessionDisp
         return hello;
     }
 
+    @Override
     synchronized public void
     refresh(Ice.Current c)
     {
@@ -41,6 +43,7 @@ class SessionI extends _SessionDisp
         _timestamp = System.currentTimeMillis();
     }
 
+    @Override
     synchronized public String
     getName(Ice.Current c)
     {
@@ -51,6 +54,7 @@ class SessionI extends _SessionDisp
         return _name;
     }
     
+    @Override
     synchronized public void
     destroy(Ice.Current c)
     {