- Cleaned up all demos.

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

7 files changed, 15 insertions, 1 deletions

diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index e1b1e1f80ef..986b3a1260a 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -40,6 +41,7 @@ public class Client extends Ice.Application
         }
     }
 
+    @Override
     public int
     run(String[] args)
     {
@@ -84,7 +86,6 @@ public class Client extends Ice.Application
 
         PrinterHolder printer = new PrinterHolder();
         PrinterPrxHolder printerProxy = new PrinterPrxHolder();
-        boolean gotException = false;
         try
         {
             initial.getPrinter(printer, printerProxy);
diff --git a/java/demo/Ice/value/ClientPrinterI.java b/java/demo/Ice/value/ClientPrinterI.java
index e409c09b5f3..066a397e767 100644
--- a/java/demo/Ice/value/ClientPrinterI.java
+++ b/java/demo/Ice/value/ClientPrinterI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 class ClientPrinterI extends ClientPrinter
 {
+    @Override
     public void
     printBackwards(Ice.Current current)
     {
diff --git a/java/demo/Ice/value/DerivedPrinterI.java b/java/demo/Ice/value/DerivedPrinterI.java
index 8647b4caea8..4ee48ca8545 100644
--- a/java/demo/Ice/value/DerivedPrinterI.java
+++ b/java/demo/Ice/value/DerivedPrinterI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 class DerivedPrinterI extends DerivedPrinter
 {
+    @Override
     public void
     printBackwards(Ice.Current current)
     {
@@ -24,6 +25,7 @@ class DerivedPrinterI extends DerivedPrinter
         System.out.println(new String(arr));
     }
 
+    @Override
     public void
     printUppercase(Ice.Current current)
     {
diff --git a/java/demo/Ice/value/InitialI.java b/java/demo/Ice/value/InitialI.java
index 25ef1ac0cf8..99ebb69148c 100644
--- a/java/demo/Ice/value/InitialI.java
+++ b/java/demo/Ice/value/InitialI.java
@@ -23,12 +23,14 @@ class InitialI extends _InitialDisp
         adapter.addWithUUID(_derivedPrinter);
     }
 
+    @Override
     public Simple
     getSimple(Ice.Current current)
     {
         return _simple;
     }
 
+    @Override
     public void
     getPrinter(PrinterHolder impl, PrinterPrxHolder proxy, Ice.Current current)
     {
@@ -36,12 +38,14 @@ class InitialI extends _InitialDisp
         proxy.value = _printerProxy;
     }
 
+    @Override
     public Printer
     getDerivedPrinter(Ice.Current current)
     {
         return _derivedPrinter;
     }
 
+    @Override
     public Printer
     updatePrinterMessage(Printer printer, Ice.Current current)
     {
@@ -49,6 +53,7 @@ class InitialI extends _InitialDisp
         return printer;
     }
 
+    @Override
     public void
     throwDerivedPrinter(Ice.Current current)
         throws DerivedPrinterException
@@ -58,6 +63,7 @@ class InitialI extends _InitialDisp
         throw ex;
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
diff --git a/java/demo/Ice/value/ObjectFactory.java b/java/demo/Ice/value/ObjectFactory.java
index 97655323330..800cb4beb96 100644
--- a/java/demo/Ice/value/ObjectFactory.java
+++ b/java/demo/Ice/value/ObjectFactory.java
@@ -9,6 +9,7 @@
 
 class ObjectFactory implements Ice.ObjectFactory
 {
+    @Override
     public Ice.Object
     create(String type)
     {
@@ -31,6 +32,7 @@ class ObjectFactory implements Ice.ObjectFactory
         return null;
     }
 
+    @Override
     public void
     destroy()
     {
diff --git a/java/demo/Ice/value/PrinterI.java b/java/demo/Ice/value/PrinterI.java
index e65c43c34f1..720a8b034d8 100644
--- a/java/demo/Ice/value/PrinterI.java
+++ b/java/demo/Ice/value/PrinterI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 class PrinterI extends Printer
 {
+    @Override
     public void
     printBackwards(Ice.Current current)
     {
diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java
index a8f0f59fcf6..33368a75ea8 100644
--- a/java/demo/Ice/value/Server.java
+++ b/java/demo/Ice/value/Server.java
@@ -9,6 +9,7 @@
 
 public class Server extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {