Expanded tabs into spaces

1 files changed, 128 insertions, 128 deletions

diff --git a/java/demo/Glacier2/callback/Client.java b/java/demo/Glacier2/callback/Client.java
index 8f76465789a..2d70db5fa7c 100644
--- a/java/demo/Glacier2/callback/Client.java
+++ b/java/demo/Glacier2/callback/Client.java
@@ -13,18 +13,18 @@ public class Client extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
-	public void
-	run()
-	{
-	    try
-	    {
-		communicator().destroy();
-	    }
-	    catch(Ice.LocalException ex)
-	    {
-		ex.printStackTrace();
-	    }
-	}
+        public void
+        run()
+        {
+            try
+            {
+                communicator().destroy();
+            }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+            }
+        }
     }
 
     private static void
@@ -36,8 +36,8 @@ public class Client extends Ice.Application
             "o: send callback as oneway\n" +
             "O: send callback as batch oneway\n" +
             "f: flush all batch requests\n" +
-	    "v: set/reset override context field\n" +
-	    "F: set/reset fake category\n" +
+            "v: set/reset override context field\n" +
+            "F: set/reset fake category\n" +
             "s: shutdown server\n" +
             "x: exit\n" +
             "?: help\n");
@@ -46,71 +46,71 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
-	//
-	// Since this is an interactive demo we want to clear the
-	// Application installed interrupt callback and install our
-	// own shutdown hook.
-	//
-	setInterruptHook(new ShutdownHook());
+        //
+        // Since this is an interactive demo we want to clear the
+        // Application installed interrupt callback and install our
+        // own shutdown hook.
+        //
+        setInterruptHook(new ShutdownHook());
 
-	Ice.RouterPrx defaultRouter = communicator().getDefaultRouter();
-	if(defaultRouter == null)
-	{
-	    System.err.println("no default router set");
-	    return 1;
-	}
-	
-	Glacier2.RouterPrx router = Glacier2.RouterPrxHelper.checkedCast(defaultRouter);
-	if(router == null)
-	{
-	    System.err.println("configured router is not a Glacier2 router");
-	    return 1;
-	}
+        Ice.RouterPrx defaultRouter = communicator().getDefaultRouter();
+        if(defaultRouter == null)
+        {
+            System.err.println("no default router set");
+            return 1;
+        }
+        
+        Glacier2.RouterPrx router = Glacier2.RouterPrxHelper.checkedCast(defaultRouter);
+        if(router == null)
+        {
+            System.err.println("configured router is not a Glacier2 router");
+            return 1;
+        }
 
         java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
-	while(true)
-	{
-	    System.out.println("This demo accepts any user-id / password combination.");
+        while(true)
+        {
+            System.out.println("This demo accepts any user-id / password combination.");
 
-	    try
-	    {
-		String id;
-		System.out.print("user id: ");
-		System.out.flush();
-		id = in.readLine();
-		
-		String pw;
-		System.out.print("password: ");
-		System.out.flush();
-		pw = in.readLine();
-		
-		try
-		{
-		    router.createSession(id, pw);
-		    break;
-		}
-		catch(Glacier2.PermissionDeniedException ex)
-		{
-		    System.out.println("permission denied:\n" + ex.reason);
-		}
-		catch(Glacier2.CannotCreateSessionException ex)
-		{
-		    System.out.println("cannot create session:\n" + ex.reason);
-		}
-	    }
+            try
+            {
+                String id;
+                System.out.print("user id: ");
+                System.out.flush();
+                id = in.readLine();
+                
+                String pw;
+                System.out.print("password: ");
+                System.out.flush();
+                pw = in.readLine();
+                
+                try
+                {
+                    router.createSession(id, pw);
+                    break;
+                }
+                catch(Glacier2.PermissionDeniedException ex)
+                {
+                    System.out.println("permission denied:\n" + ex.reason);
+                }
+                catch(Glacier2.CannotCreateSessionException ex)
+                {
+                    System.out.println("cannot create session:\n" + ex.reason);
+                }
+            }
             catch(java.io.IOException ex)
             {
                 ex.printStackTrace();
             }
-	}
+        }
 
-	String category = router.getCategoryForClient();
-	Ice.Identity callbackReceiverIdent = new Ice.Identity();
-	callbackReceiverIdent.name = "callbackReceiver";
-	callbackReceiverIdent.category = category;
-	Ice.Identity callbackReceiverFakeIdent = new Ice.Identity();
-	callbackReceiverFakeIdent.name = "callbackReceiver";
-	callbackReceiverFakeIdent.category = "fake";
+        String category = router.getCategoryForClient();
+        Ice.Identity callbackReceiverIdent = new Ice.Identity();
+        callbackReceiverIdent.name = "callbackReceiver";
+        callbackReceiverIdent.category = category;
+        Ice.Identity callbackReceiverFakeIdent = new Ice.Identity();
+        callbackReceiverFakeIdent.name = "callbackReceiver";
+        callbackReceiverFakeIdent.category = "fake";
 
         Ice.ObjectPrx base = communicator().propertyToProxy("Callback.Proxy");
         CallbackPrx twoway = CallbackPrxHelper.checkedCast(base);
@@ -123,14 +123,14 @@ public class Client extends Ice.Application
         adapter.activate();
 
         CallbackReceiverPrx twowayR = CallbackReceiverPrxHelper.uncheckedCast(
-	    adapter.createProxy(callbackReceiverIdent));
+            adapter.createProxy(callbackReceiverIdent));
         CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
 
         menu();
 
         String line = null;
-	String override = null;
-	boolean fake = false;
+        String override = null;
+        boolean fake = false;
         do
         {
             try
@@ -144,73 +144,73 @@ public class Client extends Ice.Application
                 }
                 if(line.equals("t"))
                 {
-		    java.util.Map context = new java.util.HashMap();
-		    context.put("_fwd", "t");
-		    if(override != null)
-		    {
-			context.put("_ovrd", override);
-		    }
+                    java.util.Map context = new java.util.HashMap();
+                    context.put("_fwd", "t");
+                    if(override != null)
+                    {
+                        context.put("_ovrd", override);
+                    }
                     twoway.initiateCallback(twowayR, context);
                 }
                 else if(line.equals("o"))
                 {
-		    java.util.Map context = new java.util.HashMap();
-		    context.put("_fwd", "o");
-		    if(override != null)
-		    {
-			context.put("_ovrd", override);
-		    }
+                    java.util.Map context = new java.util.HashMap();
+                    context.put("_fwd", "o");
+                    if(override != null)
+                    {
+                        context.put("_ovrd", override);
+                    }
                     oneway.initiateCallback(onewayR, context);
                 }
                 else if(line.equals("O"))
                 {
-		    java.util.Map context = new java.util.HashMap();
-		    context.put("_fwd", "O");
-		    if(override != null)
-		    {
-			context.put("_ovrd", override);
-		    } 
-		    batchOneway.initiateCallback(onewayR, context);
+                    java.util.Map context = new java.util.HashMap();
+                    context.put("_fwd", "O");
+                    if(override != null)
+                    {
+                        context.put("_ovrd", override);
+                    } 
+                    batchOneway.initiateCallback(onewayR, context);
                 }
                 else if(line.equals("f"))
                 {
-		    communicator().flushBatchRequests();
+                    communicator().flushBatchRequests();
+                }
+                else if(line.equals("v"))
+                {
+                    if(override == null)
+                    {
+                        override = "some_value";
+                        System.out.println("override context field is now `" + override + "'");
+                    }
+                    else
+                    {
+                        override = null;
+                        System.out.println("override context field is empty");
+                    }
+                }
+                else if(line.equals("F"))
+                {
+                    fake = !fake;
+                    
+                    if(fake)
+                    {
+                        twowayR = CallbackReceiverPrxHelper.uncheckedCast(
+                            twowayR.ice_identity(callbackReceiverFakeIdent));
+                        onewayR = CallbackReceiverPrxHelper.uncheckedCast(
+                            onewayR.ice_identity(callbackReceiverFakeIdent));
+                    }
+                    else
+                    {
+                        twowayR = CallbackReceiverPrxHelper.uncheckedCast(
+                            twowayR.ice_identity(callbackReceiverIdent));
+                        onewayR = CallbackReceiverPrxHelper.uncheckedCast(
+                            onewayR.ice_identity(callbackReceiverIdent));
+                    }
+                    
+                    System.out.println("callback receiver identity: " + 
+                                       communicator().identityToString(twowayR.ice_getIdentity()));
                 }
-		else if(line.equals("v"))
-		{
-		    if(override == null)
-		    {
-			override = "some_value";
-			System.out.println("override context field is now `" + override + "'");
-		    }
-		    else
-		    {
-			override = null;
-			System.out.println("override context field is empty");
-		    }
-		}
-		else if(line.equals("F"))
-		{
-		    fake = !fake;
-		    
-		    if(fake)
-		    {
-			twowayR = CallbackReceiverPrxHelper.uncheckedCast(
-			    twowayR.ice_identity(callbackReceiverFakeIdent));
-			onewayR = CallbackReceiverPrxHelper.uncheckedCast(
-			    onewayR.ice_identity(callbackReceiverFakeIdent));
-		    }
-		    else
-		    {
-			twowayR = CallbackReceiverPrxHelper.uncheckedCast(
-			    twowayR.ice_identity(callbackReceiverIdent));
-			onewayR = CallbackReceiverPrxHelper.uncheckedCast(
-			    onewayR.ice_identity(callbackReceiverIdent));
-		    }
-		    
-		    System.out.println("callback receiver identity: " + 
-				       communicator().identityToString(twowayR.ice_getIdentity()));
-		}
                 else if(line.equals("s"))
                 {
                     twoway.shutdown();