Android test & demo fixes

1 files changed, 7 insertions, 32 deletions

diff --git a/java/test/Ice/admin/Client.java b/java/test/Ice/admin/Client.java
index 824676dfb2e..5a72ed7f080 100644
--- a/java/test/Ice/admin/Client.java
+++ b/java/test/Ice/admin/Client.java
@@ -9,44 +9,19 @@
 
 package test.Ice.admin;
 
-public class Client
+public class Client extends test.Util.Application
 {
-    private static int
-    run(String[] args, Ice.Communicator communicator)
+    public int run(String[] args)
     {
-        AllTests.allTests(communicator);
+        AllTests.allTests(this, getWriter());
+
         return 0;
     }
 
-    public static void
-    main(String[] args)
+    public static void main(String[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            communicator = Ice.Util.initialize(args);
-            status = run(args, communicator);
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch (Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+        Client c = new Client();
+        int status = c.main("Client", args);
 
         System.gc();
         System.exit(status);