1 files changed, 7 insertions, 35 deletions

diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java
index b27d6eab317..f641c861fb0 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -9,12 +9,12 @@
 
 import Demo.*;
 
-public class Client
+class Client extends Ice.Application
 {
-    private static int
-    run(String[] args, Ice.Communicator communicator)
+    public int
+    run(String[] args)
     {
-        Ice.Properties properties = communicator.getProperties();
+        Ice.Properties properties = communicator().getProperties();
         final String refProperty = "Latency.Ping";
         String ref = properties.getProperty(refProperty);
         if(ref.length() == 0)
@@ -23,8 +23,7 @@ public class Client
             return 1;
         }
 
-        Ice.ObjectPrx base = communicator.stringToProxy(ref);
-        PingPrx ping = PingPrxHelper.checkedCast(base);
+        PingPrx ping = PingPrxHelper.checkedCast(communicator().stringToProxy(ref));
         if(ping == null)
         {
             System.err.println("invalid proxy");
@@ -55,35 +54,8 @@ public class Client
     public static void
     main(String[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.Properties properties = Ice.Util.createProperties();
-            properties.load("config");
-            communicator = Ice.Util.initializeWithProperties(args, properties);
-            status = run(args, communicator);
-        }
-        catch(Ice.LocalException ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
-
+        Client app = new Client();
+        int status = app.main("Client", args, "config");
         System.exit(status);
     }
 }