- Cleaned up all demos.

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

67 files changed, 181 insertions, 36 deletions

diff --git a/java/demo/Ice/applet/HelloApplet.java b/java/demo/Ice/applet/HelloApplet.java
index dc284d0a064..1291e116f04 100644
--- a/java/demo/Ice/applet/HelloApplet.java
+++ b/java/demo/Ice/applet/HelloApplet.java
@@ -14,6 +14,7 @@ import javax.swing.event.*;
 
 public class HelloApplet extends JApplet
 {
+    @Override
     public void init()
     {
         //
@@ -23,6 +24,7 @@ public class HelloApplet extends JApplet
         {
             SwingUtilities.invokeAndWait(new Runnable()
             {
+                @Override
                 public void run()
                 {
                     initUI();
@@ -45,6 +47,7 @@ public class HelloApplet extends JApplet
             initData.properties.load("config.applet");
             initData.dispatcher = new Ice.Dispatcher()
             {
+                @Override
                 public void
                 dispatch(Runnable runnable, Ice.Connection connection)
                 {
@@ -59,16 +62,19 @@ public class HelloApplet extends JApplet
         }
     }
 
+    @Override
     public void start()
     {
         // Nothing to do.
     }
 
+    @Override
     public void stop()
     {
         // Nothing to do.
     }
 
+    @Override
     public void destroy()
     {
         //
@@ -95,7 +101,7 @@ public class HelloApplet extends JApplet
         JLabel l1 = new JLabel("Hostname");
         _hostname = new JTextField();
         JLabel l2 = new JLabel("Mode");
-        _mode = new JComboBox();
+        _mode = new JComboBox<String>();
         JLabel l3 = new JLabel("Timeout");
         _timeoutSlider = new JSlider(0, MAX_TIME);
         _timeoutLabel = new JLabel("0.0");
@@ -107,7 +113,6 @@ public class HelloApplet extends JApplet
         _shutdown = new JButton("Shutdown");
         _flush = new JButton("Flush");
         _flush.setEnabled(false);
-        JPanel statusPanel = new JPanel();
         JSeparator statusPanelSeparator = new JSeparator();
         _status = new JLabel();
         _status.setText("Ready");
@@ -122,10 +127,11 @@ public class HelloApplet extends JApplet
             "Twoway", "Twoway Secure", "Oneway", "Oneway Batch", "Oneway Secure", "Oneway Secure Batch", "Datagram",
             "Datagram Batch"
         };
-        _mode.setModel(new DefaultComboBoxModel(modes));
+        _mode.setModel(new DefaultComboBoxModel<String>(modes));
 
         _hello.addActionListener(new ActionListener()
         {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
                 sayHello();
@@ -133,6 +139,7 @@ public class HelloApplet extends JApplet
         });
         _shutdown.addActionListener(new ActionListener()
         {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
                 shutdown();
@@ -140,6 +147,7 @@ public class HelloApplet extends JApplet
         });
         _flush.addActionListener(new ActionListener()
         {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
                 flush();
@@ -147,6 +155,7 @@ public class HelloApplet extends JApplet
         });
         _mode.addActionListener(new ActionListener()
         {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
                 changeDeliveryMode(_mode.getSelectedIndex());
@@ -340,7 +349,7 @@ public class HelloApplet extends JApplet
         int timeout = _timeoutSlider.getValue();
         if(timeout != 0)
         {
-            prx = prx.ice_timeout(timeout);
+            prx = prx.ice_invocationTimeout(timeout);
         }
         return Demo.HelloPrxHelper.uncheckedCast(prx);
     }
@@ -464,6 +473,7 @@ public class HelloApplet extends JApplet
     {
         _communicator.begin_flushBatchRequests(new Ice.Callback_Communicator_flushBatchRequests()
             {
+                @Override
                 public void exception(final Ice.LocalException ex)
                 {
                     handleException(ex);
@@ -519,6 +529,7 @@ public class HelloApplet extends JApplet
             _label = label;
         }
 
+        @Override
         public void stateChanged(ChangeEvent ce)
         {
             float value = (float)(_slider.getValue() / 1000.0);
@@ -532,7 +543,7 @@ public class HelloApplet extends JApplet
     private static final int MAX_TIME = 5000; // 5 seconds
 
     private JTextField _hostname;
-    private JComboBox _mode;
+    private JComboBox<String> _mode;
     private JSlider _timeoutSlider;
     private JLabel _timeoutLabel;
     private JSlider _delaySlider;
diff --git a/java/demo/Ice/async/Client.java b/java/demo/Ice/async/Client.java
index e0bbad6ecf7..035ec75cf05 100644
--- a/java/demo/Ice/async/Client.java
+++ b/java/demo/Ice/async/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -67,6 +68,7 @@ public class Client extends Ice.Application
             "?: help\n");
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/async/HelloI.java b/java/demo/Ice/async/HelloI.java
index 31b7fd7706d..e51a90976de 100644
--- a/java/demo/Ice/async/HelloI.java
+++ b/java/demo/Ice/async/HelloI.java
@@ -17,6 +17,7 @@ public class HelloI extends _HelloDisp
         _workQueue = workQueue;
     }
 
+    @Override
     public void
     sayHello_async(AMD_Hello_sayHello cb, int delay, Ice.Current current)
     {
@@ -31,6 +32,7 @@ public class HelloI extends _HelloDisp
         }
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
diff --git a/java/demo/Ice/async/Server.java b/java/demo/Ice/async/Server.java
index 02db1f88529..6fbc9291c5b 100644
--- a/java/demo/Ice/async/Server.java
+++ b/java/demo/Ice/async/Server.java
@@ -7,12 +7,13 @@
 //
 // **********************************************************************
 
-import Demo.*;
+
 
 public class Server extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -21,6 +22,7 @@ public class Server extends Ice.Application
         }
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/async/WorkQueue.java b/java/demo/Ice/async/WorkQueue.java
index b3181ac1252..98e3eb43603 100644
--- a/java/demo/Ice/async/WorkQueue.java
+++ b/java/demo/Ice/async/WorkQueue.java
@@ -17,6 +17,7 @@ public class WorkQueue extends Thread
         int delay;
     }
 
+    @Override
     public synchronized void
     run()
     {
@@ -38,7 +39,7 @@ public class WorkQueue extends Thread
                 //
                 // Get next work item.
                 //
-                CallbackEntry entry = (CallbackEntry)_callbacks.getFirst();
+                CallbackEntry entry = _callbacks.getFirst();
 
                 //
                 // Wait for the amount of time indicated in delay to
diff --git a/java/demo/Ice/bidir/CallbackReceiverI.java b/java/demo/Ice/bidir/CallbackReceiverI.java
index 9e3117dc597..f840d1f2a4b 100644
--- a/java/demo/Ice/bidir/CallbackReceiverI.java
+++ b/java/demo/Ice/bidir/CallbackReceiverI.java
@@ -15,6 +15,7 @@ class CallbackReceiverI extends _CallbackReceiverDisp
     {
     }
 
+    @Override
     public void
     callback(int num, Ice.Current current)
     {
diff --git a/java/demo/Ice/bidir/CallbackSenderI.java b/java/demo/Ice/bidir/CallbackSenderI.java
index d214ced1be9..66919cf6642 100644
--- a/java/demo/Ice/bidir/CallbackSenderI.java
+++ b/java/demo/Ice/bidir/CallbackSenderI.java
@@ -25,6 +25,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable
         this.notify();
     }
 
+    @Override
     synchronized public void
     addClient(Ice.Identity ident, Ice.Current current)
     {
@@ -35,6 +36,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable
         _clients.add(client);
     }
 
+    @Override
     public void
     run()
     {
diff --git a/java/demo/Ice/bidir/Client.java b/java/demo/Ice/bidir/Client.java
index 97727c2bb72..352c9d47812 100644
--- a/java/demo/Ice/bidir/Client.java
+++ b/java/demo/Ice/bidir/Client.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class Client extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/bidir/Server.java b/java/demo/Ice/bidir/Server.java
index 5049483e377..b2de19bf1d0 100644
--- a/java/demo/Ice/bidir/Server.java
+++ b/java/demo/Ice/bidir/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/callback/CallbackReceiverI.java b/java/demo/Ice/callback/CallbackReceiverI.java
index fc998dcb407..17bba2555c8 100644
--- a/java/demo/Ice/callback/CallbackReceiverI.java
+++ b/java/demo/Ice/callback/CallbackReceiverI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public final class CallbackReceiverI extends _CallbackReceiverDisp
 {
+    @Override
     public void
     callback(Ice.Current current)
     {
diff --git a/java/demo/Ice/callback/CallbackSenderI.java b/java/demo/Ice/callback/CallbackSenderI.java
index 55b4e2fd516..2f51659cb53 100644
--- a/java/demo/Ice/callback/CallbackSenderI.java
+++ b/java/demo/Ice/callback/CallbackSenderI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public final class CallbackSenderI extends _CallbackSenderDisp
 {
+    @Override
     public void
     initiateCallback(CallbackReceiverPrx proxy, Ice.Current current)
     {
@@ -25,6 +26,7 @@ public final class CallbackSenderI extends _CallbackSenderDisp
         }
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index 950c3702207..105a538339c 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -38,6 +39,7 @@ public class Client extends Ice.Application
             "?: help\n");
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java
index d04e09b9e8a..b11845054e0 100644
--- a/java/demo/Ice/callback/Server.java
+++ b/java/demo/Ice/callback/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/context/Client.java b/java/demo/Ice/context/Client.java
index 3b808b05199..25b5e058d6b 100644
--- a/java/demo/Ice/context/Client.java
+++ b/java/demo/Ice/context/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)
     {
diff --git a/java/demo/Ice/context/ContextI.java b/java/demo/Ice/context/ContextI.java
index 1fb3287747c..1cc4d2cd545 100644
--- a/java/demo/Ice/context/ContextI.java
+++ b/java/demo/Ice/context/ContextI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class ContextI extends _ContextDisp
 {
+    @Override
     public void
     call(Ice.Current current)
     {
@@ -27,6 +28,7 @@ public class ContextI extends _ContextDisp
         System.out.println();
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
diff --git a/java/demo/Ice/context/Server.java b/java/demo/Ice/context/Server.java
index a9152ade77a..99018fb538d 100644
--- a/java/demo/Ice/context/Server.java
+++ b/java/demo/Ice/context/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/hello/Client.java b/java/demo/Ice/hello/Client.java
index 688644c92c1..795ac57b76f 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -46,6 +47,7 @@ public class Client extends Ice.Application
             "?: help\n");
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/hello/HelloI.java b/java/demo/Ice/hello/HelloI.java
index eecfd43e409..8c1fff4f6e8 100644
--- a/java/demo/Ice/hello/HelloI.java
+++ b/java/demo/Ice/hello/HelloI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class HelloI extends _HelloDisp
 {
+    @Override
     public void
     sayHello(int delay, Ice.Current current)
     {
@@ -18,7 +19,8 @@ public class HelloI extends _HelloDisp
         {
             try
             {
-                Thread.currentThread().sleep(delay);
+                Thread.currentThread();
+                Thread.sleep(delay);
             }
             catch(InterruptedException ex1)
             {
@@ -27,6 +29,7 @@ public class HelloI extends _HelloDisp
         System.out.println("Hello World!");
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java
index 9af67c58f7c..5af6abd51fa 100644
--- a/java/demo/Ice/hello/Server.java
+++ b/java/demo/Ice/hello/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/interrupt/Client.java b/java/demo/Ice/interrupt/Client.java
index 93af8923cd0..cb666ef6839 100644
--- a/java/demo/Ice/interrupt/Client.java
+++ b/java/demo/Ice/interrupt/Client.java
@@ -21,6 +21,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java
index 2554415b001..19dbea5efbb 100644
--- a/java/demo/Ice/invoke/Client.java
+++ b/java/demo/Ice/invoke/Client.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-import Demo.*;
+
 
 public class Client extends Ice.Application
 {
@@ -32,6 +32,7 @@ public class Client extends Ice.Application
 
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -46,6 +47,7 @@ public class Client extends Ice.Application
         }
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/invoke/PrinterI.java b/java/demo/Ice/invoke/PrinterI.java
index 8e8c455a865..ec6308dd9a6 100644
--- a/java/demo/Ice/invoke/PrinterI.java
+++ b/java/demo/Ice/invoke/PrinterI.java
@@ -9,6 +9,7 @@
 
 public class PrinterI extends Ice.Blobject
 {
+    @Override
     public boolean
     ice_invoke(byte[] inParams, Ice.ByteSeqHolder outParams, Ice.Current current)
     {
diff --git a/java/demo/Ice/invoke/Server.java b/java/demo/Ice/invoke/Server.java
index e02185c1a4c..b216d93bf74 100644
--- a/java/demo/Ice/invoke/Server.java
+++ b/java/demo/Ice/invoke/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/latency/Client.java b/java/demo/Ice/latency/Client.java
index 7e98b6d08a1..b88c3102083 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 class Client extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {
@@ -53,7 +54,7 @@ if((i % 100) == 0) System.out.println("" + i);
         }
 
         long tv2 = System.currentTimeMillis();
-        double total = (double)(tv2 - tv1);
+        double total = tv2 - tv1;
         double perPing = total / repetitions;
 
         System.out.println("time for " + repetitions + " pings: " + total + "ms");
diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java
index 91135b81845..2d8df970b08 100644
--- a/java/demo/Ice/latency/Server.java
+++ b/java/demo/Ice/latency/Server.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class Server extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/minimal/HelloI.java b/java/demo/Ice/minimal/HelloI.java
index d1cb7c6b597..bbfe02d6792 100644
--- a/java/demo/Ice/minimal/HelloI.java
+++ b/java/demo/Ice/minimal/HelloI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class HelloI extends _HelloDisp
 {
+    @Override
     public void
     sayHello(Ice.Current current)
     {
diff --git a/java/demo/Ice/minimal/Server.java b/java/demo/Ice/minimal/Server.java
index 9eeecf883f8..6bb8e700cd9 100644
--- a/java/demo/Ice/minimal/Server.java
+++ b/java/demo/Ice/minimal/Server.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-import Demo.*;
+
 
 public class Server
 {
diff --git a/java/demo/Ice/multicast/Client.java b/java/demo/Ice/multicast/Client.java
index 0283f2d654a..568ea80d686 100644
--- a/java/demo/Ice/multicast/Client.java
+++ b/java/demo/Ice/multicast/Client.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class Client extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/multicast/DiscoverI.java b/java/demo/Ice/multicast/DiscoverI.java
index c66b9571f6a..19b265edde8 100644
--- a/java/demo/Ice/multicast/DiscoverI.java
+++ b/java/demo/Ice/multicast/DiscoverI.java
@@ -16,6 +16,7 @@ public class DiscoverI extends _DiscoverDisp
         _obj = obj;
     }
 
+    @Override
     public void
     lookup(DiscoverReplyPrx reply, Ice.Current current)
     {
diff --git a/java/demo/Ice/multicast/DiscoverReplyI.java b/java/demo/Ice/multicast/DiscoverReplyI.java
index b9625e73762..7fc8e95250c 100644
--- a/java/demo/Ice/multicast/DiscoverReplyI.java
+++ b/java/demo/Ice/multicast/DiscoverReplyI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class DiscoverReplyI extends _DiscoverReplyDisp
 {
+    @Override
     public synchronized void
     reply(Ice.ObjectPrx obj, Ice.Current current)
     {
diff --git a/java/demo/Ice/multicast/HelloI.java b/java/demo/Ice/multicast/HelloI.java
index d1cb7c6b597..bbfe02d6792 100644
--- a/java/demo/Ice/multicast/HelloI.java
+++ b/java/demo/Ice/multicast/HelloI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class HelloI extends _HelloDisp
 {
+    @Override
     public void
     sayHello(Ice.Current current)
     {
diff --git a/java/demo/Ice/multicast/Server.java b/java/demo/Ice/multicast/Server.java
index 0cc9598d677..9df210c3ecb 100644
--- a/java/demo/Ice/multicast/Server.java
+++ b/java/demo/Ice/multicast/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/nested/Client.java b/java/demo/Ice/nested/Client.java
index 82c0f166c42..885743b1d43 100644
--- a/java/demo/Ice/nested/Client.java
+++ b/java/demo/Ice/nested/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -33,6 +34,7 @@ public class Client extends Ice.Application
         }
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java
index 3622b7933a6..7234bf687b9 100644
--- a/java/demo/Ice/nested/NestedI.java
+++ b/java/demo/Ice/nested/NestedI.java
@@ -16,6 +16,7 @@ class NestedI extends _NestedDisp
         _self = self;
     }
 
+    @Override
     public void
     nestedCall(int level, NestedPrx proxy, Ice.Current current)
     {
diff --git a/java/demo/Ice/nested/Server.java b/java/demo/Ice/nested/Server.java
index 2ccead73772..cb340924679 100644
--- a/java/demo/Ice/nested/Server.java
+++ b/java/demo/Ice/nested/Server.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class Server extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {
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)
     {
diff --git a/java/demo/Ice/plugin/Client.java b/java/demo/Ice/plugin/Client.java
index ed71bf74eaf..02a08e83950 100644
--- a/java/demo/Ice/plugin/Client.java
+++ b/java/demo/Ice/plugin/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -38,6 +39,7 @@ public class Client extends Ice.Application
             "?: help\n");
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/plugin/HelloI.java b/java/demo/Ice/plugin/HelloI.java
index 8b156060124..13a0ff852d9 100644
--- a/java/demo/Ice/plugin/HelloI.java
+++ b/java/demo/Ice/plugin/HelloI.java
@@ -11,12 +11,14 @@ import Demo.*;
 
 public class HelloI extends _HelloDisp
 {
+    @Override
     public void
     sayHello(Ice.Current current)
     {
         current.adapter.getCommunicator().getLogger().print("Hello World!");
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
diff --git a/java/demo/Ice/plugin/HelloPluginFactoryI.java b/java/demo/Ice/plugin/HelloPluginFactoryI.java
index 951bec921bf..5a2754e694d 100644
--- a/java/demo/Ice/plugin/HelloPluginFactoryI.java
+++ b/java/demo/Ice/plugin/HelloPluginFactoryI.java
@@ -7,11 +7,12 @@
 //
 // **********************************************************************
 
-import Ice.PluginFactory;
+
 
 public class HelloPluginFactoryI implements Ice.PluginFactory
 {
-     public Ice.Plugin
+     @Override
+    public Ice.Plugin
      create(Ice.Communicator communicator, String name, String[] args)
      {
          return new HelloPluginI(communicator);
diff --git a/java/demo/Ice/plugin/HelloPluginI.java b/java/demo/Ice/plugin/HelloPluginI.java
index f5c92687202..a4aa88ae4d7 100644
--- a/java/demo/Ice/plugin/HelloPluginI.java
+++ b/java/demo/Ice/plugin/HelloPluginI.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-import Demo.*;
+
 
 public class HelloPluginI implements Ice.Plugin
 {
@@ -17,6 +17,7 @@ public class HelloPluginI implements Ice.Plugin
         _communicator = communicator;
     }
 
+    @Override
     public void
     initialize()
     {
@@ -25,6 +26,7 @@ public class HelloPluginI implements Ice.Plugin
         adapter.activate();
     }
 
+    @Override
     public void
     destroy()
     {
diff --git a/java/demo/Ice/plugin/LoggerI.java b/java/demo/Ice/plugin/LoggerI.java
index 9e9eb79ec29..0d14f0640e9 100644
--- a/java/demo/Ice/plugin/LoggerI.java
+++ b/java/demo/Ice/plugin/LoggerI.java
@@ -7,34 +7,39 @@
 //
 // **********************************************************************
 
-import Ice.Logger;
+
 
 public class LoggerI implements Ice.Logger
 {
+    @Override
     public void
     print(String message)
     {
         System.out.println("PRINT: " + message);
     }
     
+    @Override
     public void
     trace(String category, String message)
     {
         System.out.println("TRACE(" + category + "): " + message);
     }
     
+    @Override
     public void
     warning(String message)
     {
         System.out.println("WARNING: " + message);
     }
 
+    @Override
     public void
     error(String message)
     {
         System.out.println("ERROR: " + message);
     }
 
+    @Override
     public Ice.Logger
     cloneWithPrefix(String prefix)
     {
diff --git a/java/demo/Ice/plugin/LoggerPluginFactoryI.java b/java/demo/Ice/plugin/LoggerPluginFactoryI.java
index 5e22eda154e..bc25f1f9806 100644
--- a/java/demo/Ice/plugin/LoggerPluginFactoryI.java
+++ b/java/demo/Ice/plugin/LoggerPluginFactoryI.java
@@ -7,12 +7,12 @@
 //
 // **********************************************************************
 
-import Ice.PluginFactory;
-import Ice.LoggerPlugin;
+
 
 public class LoggerPluginFactoryI implements Ice.PluginFactory
 {
-     public Ice.Plugin
+     @Override
+    public Ice.Plugin
      create(Ice.Communicator communicator, String name, String[] args)
      {
          return new Ice.LoggerPlugin(communicator, new LoggerI());
diff --git a/java/demo/Ice/plugin/Server.java b/java/demo/Ice/plugin/Server.java
index 679bfec5ebd..b756419085c 100644
--- a/java/demo/Ice/plugin/Server.java
+++ b/java/demo/Ice/plugin/Server.java
@@ -9,6 +9,7 @@
 
 public class Server extends Ice.Application
 {
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/properties/Client.java b/java/demo/Ice/properties/Client.java
index fdd5dd37b79..72bc1c4fe8b 100644
--- a/java/demo/Ice/properties/Client.java
+++ b/java/demo/Ice/properties/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -52,6 +53,7 @@ public class Client extends Ice.Application
         }
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/properties/Server.java b/java/demo/Ice/properties/Server.java
index e2ec029602d..cc371df7ead 100644
--- a/java/demo/Ice/properties/Server.java
+++ b/java/demo/Ice/properties/Server.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-import Demo.*;
+
 
 public class Server extends Ice.Application
 {
@@ -22,6 +22,7 @@ public class Server extends Ice.Application
             _called = false;
         }
 
+        @Override
         public synchronized java.util.Map<String, String> getChanges(Ice.Current current)
         {
             //
@@ -43,11 +44,13 @@ public class Server extends Ice.Application
             return _changes;
         }
 
+        @Override
         public void shutdown(Ice.Current current)
         {
             current.adapter.getCommunicator().shutdown();
         }
 
+        @Override
         public synchronized void updated(java.util.Map<String, String> changes)
         {
             _changes = changes;
@@ -59,6 +62,7 @@ public class Server extends Ice.Application
         private boolean _called;
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/serialize/Client.java b/java/demo/Ice/serialize/Client.java
index 54654fbe532..c7cf071138c 100644
--- a/java/demo/Ice/serialize/Client.java
+++ b/java/demo/Ice/serialize/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -39,6 +40,7 @@ public class Client extends Ice.Application
             "?: help\n");
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/serialize/GreetI.java b/java/demo/Ice/serialize/GreetI.java
index e618aa09d5b..99bd50c8b19 100644
--- a/java/demo/Ice/serialize/GreetI.java
+++ b/java/demo/Ice/serialize/GreetI.java
@@ -11,6 +11,7 @@ import Demo.*;
 
 public class GreetI extends _GreetDisp
 {
+    @Override
     public void
     sendGreeting(MyGreeting greeting, Ice.Current current)
     {
@@ -24,6 +25,7 @@ public class GreetI extends _GreetDisp
         }
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
diff --git a/java/demo/Ice/serialize/Server.java b/java/demo/Ice/serialize/Server.java
index f2d2dd6050a..7e60b478bf7 100644
--- a/java/demo/Ice/serialize/Server.java
+++ b/java/demo/Ice/serialize/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/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)
     {
diff --git a/java/demo/Ice/swing/Client.java b/java/demo/Ice/swing/Client.java
index 94893709544..b2465443656 100644
--- a/java/demo/Ice/swing/Client.java
+++ b/java/demo/Ice/swing/Client.java
@@ -9,6 +9,7 @@
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 import javax.swing.event.*;
 
@@ -18,6 +19,7 @@ public class Client extends JFrame
     {
         SwingUtilities.invokeLater(new Runnable()
         {
+            @Override
             public void run()
             {
                 try
@@ -72,6 +74,7 @@ public class Client extends JFrame
             initData.properties.load("config.client");
             initData.dispatcher = new Ice.Dispatcher()
             {
+                @Override
                 public void
                 dispatch(Runnable runnable, Ice.Connection connection)
                 {
@@ -90,7 +93,7 @@ public class Client extends JFrame
         JLabel l1 = new JLabel("Hostname");
         _hostname = new JTextField();
         JLabel l2 = new JLabel("Mode");
-        _mode = new JComboBox();
+        _mode = new JComboBox<String>();
         JLabel l3 = new JLabel("Timeout");
         _timeoutSlider = new JSlider(0, MAX_TIME);
         _timeoutLabel = new JLabel("0.0");
@@ -102,7 +105,6 @@ public class Client extends JFrame
         _shutdown = new JButton("Shutdown");
         _flush = new JButton("Flush");
         _flush.setEnabled(false);
-        JPanel statusPanel = new JPanel();
         JSeparator statusPanelSeparator = new JSeparator();
         _status = new JLabel();
         _status.setText("Ready");
@@ -117,10 +119,11 @@ public class Client extends JFrame
             "Twoway", "Twoway Secure", "Oneway", "Oneway Batch", "Oneway Secure", "Oneway Secure Batch", "Datagram",
             "Datagram Batch"
         };
-        _mode.setModel(new DefaultComboBoxModel(modes));
+        _mode.setModel(new DefaultComboBoxModel<String>(modes));
 
         _hello.addActionListener(new ActionListener()
         {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
                 sayHello();
@@ -128,6 +131,7 @@ public class Client extends JFrame
         });
         _shutdown.addActionListener(new ActionListener()
         {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
                 shutdown();
@@ -135,6 +139,7 @@ public class Client extends JFrame
         });
         _flush.addActionListener(new ActionListener()
         {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
                 flush();
@@ -142,6 +147,7 @@ public class Client extends JFrame
         });
         _mode.addActionListener(new ActionListener()
         {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
                 changeDeliveryMode(_mode.getSelectedIndex());
@@ -270,10 +276,11 @@ public class Client extends JFrame
         gridBagConstraints.insets = new Insets(0, 5, 5, 5);
         cp.add(_status, gridBagConstraints);
 
-        setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 
         _shutdownHook = new Thread("Shutdown hook")
             {
+                @Override
                 public void run()
                 {
                     destroyCommunicator();
@@ -293,6 +300,7 @@ public class Client extends JFrame
 
         addWindowListener(new WindowAdapter()
         {
+            @Override
             public void windowClosing(WindowEvent e)
             {
                 destroyCommunicator();
@@ -389,7 +397,7 @@ public class Client extends JFrame
         int timeout = _timeoutSlider.getValue();
         if(timeout != 0)
         {
-            prx = prx.ice_timeout(timeout);
+            prx = prx.ice_invocationTimeout(timeout);
         }
         return Demo.HelloPrxHelper.uncheckedCast(prx);
     }
@@ -510,6 +518,7 @@ public class Client extends JFrame
     {
         _communicator.begin_flushBatchRequests(new Ice.Callback_Communicator_flushBatchRequests()
             {
+                @Override
                 public void exception(final Ice.LocalException ex)
                 {
                     handleException(ex);
@@ -571,6 +580,7 @@ public class Client extends JFrame
             _label = label;
         }
 
+        @Override
         public void stateChanged(ChangeEvent ce)
         {
             float value = (float)(_slider.getValue() / 1000.0);
@@ -591,7 +601,7 @@ public class Client extends JFrame
     private static final int MAX_TIME = 5000; // 5 seconds
 
     private JTextField _hostname;
-    private JComboBox _mode;
+    private JComboBox<String> _mode;
     private JSlider _timeoutSlider;
     private JLabel _timeoutLabel;
     private JSlider _delaySlider;
diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java
index 3d9d219be0a..e0ef6e74aa8 100644
--- a/java/demo/Ice/throughput/Client.java
+++ b/java/demo/Ice/throughput/Client.java
@@ -13,6 +13,7 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
+        @Override
         public void
         run()
         {
@@ -51,6 +52,7 @@ public class Client extends Ice.Application
         "?: help\n");
     }
 
+    @Override
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java
index b54d967cf20..a1dd6d06984 100644
--- a/java/demo/Ice/throughput/Server.java
+++ b/java/demo/Ice/throughput/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/throughput/ThroughputI.java b/java/demo/Ice/throughput/ThroughputI.java
index bd6a8cb4102..1b745375917 100644
--- a/java/demo/Ice/throughput/ThroughputI.java
+++ b/java/demo/Ice/throughput/ThroughputI.java
@@ -40,6 +40,7 @@ public final class ThroughputI extends _ThroughputDisp
         }
     }
 
+    @Override
     public boolean
     needsWarmup(Ice.Current current)
     {
@@ -47,12 +48,14 @@ public final class ThroughputI extends _ThroughputDisp
         return _needsWarmup;
     }
 
+    @Override
     public void
     startWarmup(Ice.Current current)
     {
         _warmup = true;
     }
 
+    @Override
     public void
     endWarmup(Ice.Current current)
     {
@@ -60,11 +63,13 @@ public final class ThroughputI extends _ThroughputDisp
         _needsWarmup = false;
     }
 
+    @Override
     public void
     sendByteSeq(byte[] seq, Ice.Current current)
     {
     }
 
+    @Override
     public byte[]
     recvByteSeq(Ice.Current current)
     {
@@ -78,17 +83,20 @@ public final class ThroughputI extends _ThroughputDisp
         }
     }
 
+    @Override
     public byte[]
     echoByteSeq(byte[] seq, Ice.Current current)
     {
         return seq;
     }
 
+    @Override
     public void
     sendStringSeq(String[] seq, Ice.Current current)
     {
     }
 
+    @Override
     public String[]
     recvStringSeq(Ice.Current current)
     {
@@ -102,17 +110,20 @@ public final class ThroughputI extends _ThroughputDisp
         }
     }
 
+    @Override
     public String[]
     echoStringSeq(String[] seq, Ice.Current current)
     {
         return seq;
     }
 
+    @Override
     public void
     sendStructSeq(StringDouble[] seq, Ice.Current current)
     {
     }
 
+    @Override
     public StringDouble[]
     recvStructSeq(Ice.Current current)
     {
@@ -126,17 +137,20 @@ public final class ThroughputI extends _ThroughputDisp
         }
     }
 
+    @Override
     public StringDouble[]
     echoStructSeq(StringDouble[] seq, Ice.Current current)
     {
         return seq;
     }
 
+    @Override
     public void
     sendFixedSeq(Fixed[] seq, Ice.Current current)
     {
     }
 
+    @Override
     public Fixed[]
     recvFixedSeq(Ice.Current current)
     {
@@ -150,12 +164,14 @@ public final class ThroughputI extends _ThroughputDisp
         }
     }
 
+    @Override
     public Fixed[]
     echoFixedSeq(Fixed[] seq, Ice.Current current)
     {
         return seq;
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
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)
     {