- Cleaned up all demos.

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

3 files changed, 10 insertions, 1 deletions

diff --git a/java/demo/Ice/optional/Client.java b/java/demo/Ice/optional/Client.java
index a65052cde49..e2b3224c61d 100644
--- a/java/demo/Ice/optional/Client.java
+++ b/java/demo/Ice/optional/Client.java
@@ -14,6 +14,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -28,6 +29,7 @@ public class Client extends Ice.Application
         }
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/optional/ContactDBI.java b/java/demo/Ice/optional/ContactDBI.java
index 18370fe1161..10ec853de98 100644
--- a/java/demo/Ice/optional/ContactDBI.java
+++ b/java/demo/Ice/optional/ContactDBI.java
@@ -13,6 +13,7 @@ public class ContactDBI extends _ContactDBDisp
 {
     private java.util.Map<String, Contact> _contacts = new java.util.HashMap<String, Contact>();
 
+    @Override
     public final void
     addContact(String name, Ice.Optional<NumberType> type, Ice.Optional<String> number, Ice.IntOptional dialGroup,
                Ice.Current current)
@@ -34,6 +35,7 @@ public class ContactDBI extends _ContactDBDisp
         _contacts.put(name, contact);
     }
 
+    @Override
     public final void
     updateContact(String name, Ice.Optional<NumberType> type, Ice.Optional<String> number, Ice.IntOptional dialGroup,
                   Ice.Current current)
@@ -56,12 +58,14 @@ public class ContactDBI extends _ContactDBDisp
         }
     }
 
+    @Override
     public final Contact
     query(String name, Ice.Current current)
     {
         return _contacts.get(name);
     }
 
+    @Override
     public final void
     queryDialgroup(String name, Ice.IntOptional dialGroup, Ice.Current current)
     {
@@ -72,6 +76,7 @@ public class ContactDBI extends _ContactDBDisp
         }
     }
 
+    @Override
     public final Ice.Optional<String>
     queryNumber(String name, Ice.Current current)
     {
@@ -84,6 +89,7 @@ public class ContactDBI extends _ContactDBDisp
         return ret;
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
diff --git a/java/demo/Ice/optional/Server.java b/java/demo/Ice/optional/Server.java
index 0554d083b08..6fda9f35aa8 100644
--- a/java/demo/Ice/optional/Server.java
+++ b/java/demo/Ice/optional/Server.java
@@ -7,10 +7,11 @@
 //
 // **********************************************************************
 
-import Demo.*;
+
 
 public class Server extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {