1 files changed, 111 insertions, 111 deletions

diff --git a/java/demo/IceStorm/clock/Subscriber.java b/java/demo/IceStorm/clock/Subscriber.java
index ebc5833170b..ec5f9502bbd 100644
--- a/java/demo/IceStorm/clock/Subscriber.java
+++ b/java/demo/IceStorm/clock/Subscriber.java
@@ -14,88 +14,88 @@ public class Subscriber extends Ice.Application
     public class ClockI extends _ClockDisp
     {
         public void
-	tick(String date, Ice.Current current)
-	{
-	    System.out.println(date);
-	}
+        tick(String date, Ice.Current current)
+        {
+            System.out.println(date);
+        }
     }
     
     public void
     usage()
     {
-	System.out.println("Usage: " + appName() + " [--batch] [--datagram|--twoway|--ordered|--oneway] [topic]");
+        System.out.println("Usage: " + appName() + " [--batch] [--datagram|--twoway|--ordered|--oneway] [topic]");
     }
 
     public int
     run(String[] args)
     {
         IceStorm.TopicManagerPrx manager = IceStorm.TopicManagerPrxHelper.checkedCast(
-	    communicator().propertyToProxy("IceStorm.TopicManager.Proxy"));
+            communicator().propertyToProxy("IceStorm.TopicManager.Proxy"));
         if(manager == null)
         {
-	    System.err.println("invalid proxy");
+            System.err.println("invalid proxy");
             return 1;
         }
 
         String topicName = "time";
-	boolean datagram = false;
-	boolean twoway = false;
-	boolean ordered = false;
-	boolean oneway = false;
-	boolean batch = false;
-	int optsSet = 0;
-	for(int i = 0; i < args.length; ++i)
-	{
-	    if(args[i].equals("--datagram"))
-	    {
-		datagram = true;
-		++optsSet;
-	    }
-	    else if(args[i].equals("--twoway"))
-	    {
-		twoway = true;
-		++optsSet;
-	    }
-	    else if(args[i].equals("--ordered"))
-	    {
-		ordered = true;
-		++optsSet;
-	    }
-	    else if(args[i].equals("--oneway"))
-	    {
-		oneway = true;
-		++optsSet;
-	    }
-	    else if(args[i].equals("--batch"))
-	    {
-		batch = true;
-	    }
-	    else if(args[i].startsWith("--"))
-	    {
-		usage();
-		return 1;
-	    }
-	    else
-	    {
-		topicName = args[i];
-		break;
-	    }
-	}
+        boolean datagram = false;
+        boolean twoway = false;
+        boolean ordered = false;
+        boolean oneway = false;
+        boolean batch = false;
+        int optsSet = 0;
+        for(int i = 0; i < args.length; ++i)
+        {
+            if(args[i].equals("--datagram"))
+            {
+                datagram = true;
+                ++optsSet;
+            }
+            else if(args[i].equals("--twoway"))
+            {
+                twoway = true;
+                ++optsSet;
+            }
+            else if(args[i].equals("--ordered"))
+            {
+                ordered = true;
+                ++optsSet;
+            }
+            else if(args[i].equals("--oneway"))
+            {
+                oneway = true;
+                ++optsSet;
+            }
+            else if(args[i].equals("--batch"))
+            {
+                batch = true;
+            }
+            else if(args[i].startsWith("--"))
+            {
+                usage();
+                return 1;
+            }
+            else
+            {
+                topicName = args[i];
+                break;
+            }
+        }
 
-	if(batch)
-	{
-	    if(twoway || ordered)
-	    {
-		System.err.println(appName() + ": batch can only be set with oneway or datagram");
-		return 1;
-	    }
-	}
+        if(batch)
+        {
+            if(twoway || ordered)
+            {
+                System.err.println(appName() + ": batch can only be set with oneway or datagram");
+                return 1;
+            }
+        }
 
-	if(optsSet > 1)
-	{
-	    usage();
-	    return 1;
-	}
+        if(optsSet > 1)
+        {
+            usage();
+            return 1;
+        }
 
         IceStorm.TopicPrx topic;
         try
@@ -120,54 +120,54 @@ public class Subscriber extends Ice.Application
         //
         // Add a Servant for the Ice Object.
         //
-	java.util.Map qos = new java.util.HashMap();
-	Ice.ObjectPrx subscriber = adapter.addWithUUID(new ClockI());
-	//
-	// Set up the proxy.
-	//
-	if(datagram)
-	{
-	    subscriber = subscriber.ice_datagram();
-	}
-	else if(twoway)
-	{
-	    // Do nothing to the subscriber proxy. Its already twoway.
-	}
-	else if(ordered)
-	{
-	    // Do nothing to the subscriber proxy. Its already twoway.
-	    qos.put("reliability", "ordered");
-	}
-	else // if(oneway)
-	{
-	    subscriber = subscriber.ice_oneway();
-	}
-	if(batch)
-	{
-	    if(datagram)
-	    {
-		subscriber = subscriber.ice_batchDatagram();
-	    }
-	    else
-	    {
-		subscriber = subscriber.ice_batchOneway();
-	    }
-	}
-	
-	try
-	{
-	    topic.subscribeAndGetPublisher(qos, subscriber);
-	}
-	catch(IceStorm.AlreadySubscribed e)
-	{
-    	    e.printStackTrace();
-	    return 1;
-	}
-	catch(IceStorm.BadQoS e)
-	{
-    	    e.printStackTrace();
-	    return 1;
-	}
+        java.util.Map qos = new java.util.HashMap();
+        Ice.ObjectPrx subscriber = adapter.addWithUUID(new ClockI());
+        //
+        // Set up the proxy.
+        //
+        if(datagram)
+        {
+            subscriber = subscriber.ice_datagram();
+        }
+        else if(twoway)
+        {
+            // Do nothing to the subscriber proxy. Its already twoway.
+        }
+        else if(ordered)
+        {
+            // Do nothing to the subscriber proxy. Its already twoway.
+            qos.put("reliability", "ordered");
+        }
+        else // if(oneway)
+        {
+            subscriber = subscriber.ice_oneway();
+        }
+        if(batch)
+        {
+            if(datagram)
+            {
+                subscriber = subscriber.ice_batchDatagram();
+            }
+            else
+            {
+                subscriber = subscriber.ice_batchOneway();
+            }
+        }
+        
+        try
+        {
+            topic.subscribeAndGetPublisher(qos, subscriber);
+        }
+        catch(IceStorm.AlreadySubscribed e)
+        {
+            e.printStackTrace();
+            return 1;
+        }
+        catch(IceStorm.BadQoS e)
+        {
+            e.printStackTrace();
+            return 1;
+        }
         adapter.activate();
 
         shutdownOnInterrupt();