Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs files

52 files changed, 317 insertions, 317 deletions

diff --git a/java/demo/Glacier2/chat/Client.java b/java/demo/Glacier2/chat/Client.java
index e69fc6ce320..44cf755a125 100644
--- a/java/demo/Glacier2/chat/Client.java
+++ b/java/demo/Glacier2/chat/Client.java
@@ -297,7 +297,7 @@ public class Client extends JFrame
         fieldPanel.setLayout(new GridLayout(0, 1));
         fieldPanel.add(_hostField);
         fieldPanel.add(_userNameField);
-        fieldPanel.add(_passwordField);    	
+        fieldPanel.add(_passwordField);         
         _connectionPanel.add(labelPanel);
         _connectionPanel.add(fieldPanel);
 
diff --git a/java/demo/Glacier2/voip/Server.java b/java/demo/Glacier2/voip/Server.java
index f2caef8113d..264533c911b 100644
--- a/java/demo/Glacier2/voip/Server.java
+++ b/java/demo/Glacier2/voip/Server.java
@@ -124,7 +124,7 @@ public class Server extends Ice.Application
             return proxy;
         }
     };
-	
+        
     public int
     run(String[] args)
     {
diff --git a/java/demo/Ice/serialize/Client.java b/java/demo/Ice/serialize/Client.java
index f3d290f5060..a4d9f034286 100644
--- a/java/demo/Ice/serialize/Client.java
+++ b/java/demo/Ice/serialize/Client.java
@@ -62,11 +62,11 @@ public class Client extends Ice.Application
             return 1;
         }
 
-	MyGreeting greeting = new MyGreeting();
-	greeting.text = "Hello there!";
-	MyGreeting nullGreeting = null;
+        MyGreeting greeting = new MyGreeting();
+        greeting.text = "Hello there!";
+        MyGreeting nullGreeting = null;
 
-	boolean sendNull = false;
+        boolean sendNull = false;
 
         menu();
 
@@ -86,14 +86,14 @@ public class Client extends Ice.Application
                 }
                 if(line.equals("g"))
                 {
-		    if(sendNull)
-		    {
-			greet.sendGreeting(nullGreeting);
-		    }
-		    else
-		    {
-		        greet.sendGreeting(greeting);
-		    }
+                    if(sendNull)
+                    {
+                        greet.sendGreeting(nullGreeting);
+                    }
+                    else
+                    {
+                        greet.sendGreeting(greeting);
+                    }
                 }
                 else if(line.equals("t"))
                 {
diff --git a/java/demo/Ice/serialize/GreetI.java b/java/demo/Ice/serialize/GreetI.java
index 45218116458..0073c9ee72b 100644
--- a/java/demo/Ice/serialize/GreetI.java
+++ b/java/demo/Ice/serialize/GreetI.java
@@ -15,19 +15,19 @@ public class GreetI extends _GreetDisp
     sendGreeting(MyGreeting greeting, Ice.Current current)
     {
         if(greeting != null)
-	{
-	    System.out.println(greeting.text);
-	}
-	else
-	{
-	    System.out.println("Received null greeting");
-	}
+        {
+            System.out.println(greeting.text);
+        }
+        else
+        {
+            System.out.println("Received null greeting");
+        }
     }
 
     public void
     shutdown(Ice.Current current)
     {
         System.out.println("Shutting down...");
-	current.adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 }
diff --git a/java/demo/Ice/serialize/Server.java b/java/demo/Ice/serialize/Server.java
index 6cf3453d761..5a768a315b8 100644
--- a/java/demo/Ice/serialize/Server.java
+++ b/java/demo/Ice/serialize/Server.java
@@ -30,8 +30,8 @@ public class Server extends Ice.Application
     public static void
     main(String[] args)
     {
-	Server app = new Server();
-	int status = app.main("Server", args, "config.server");
+        Server app = new Server();
+        int status = app.main("Server", args, "config.server");
         System.exit(status);
     }
 }
diff --git a/java/src/Freeze/BackgroundSaveEvictorI.java b/java/src/Freeze/BackgroundSaveEvictorI.java
index ef6d3ea9463..f2ccdfaa854 100644
--- a/java/src/Freeze/BackgroundSaveEvictorI.java
+++ b/java/src/Freeze/BackgroundSaveEvictorI.java
@@ -228,10 +228,10 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor,
                 element.status = dead;
                 element.rec = new ObjectRecord();
 
-		if(store.keepStats())
-		{
-		    element.rec.stats = new Statistics();
-		}
+                if(store.keepStats())
+                {
+                    element.rec.stats = new Statistics();
+                }
 
                 Object o = store.cache().putIfAbsent(ident, element);
 
@@ -280,13 +280,13 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor,
                                 ObjectRecord rec = element.rec;
 
                                 rec.servant = servant;
-				
-				if(store.keepStats())
-				{
-				    rec.stats.creationTime = IceInternal.Time.currentMonotonicTimeMillis();
-				    rec.stats.lastSaveTime = 0;
-				    rec.stats.avgSaveTime = 0;
-				}
+                                
+                                if(store.keepStats())
+                                {
+                                    rec.stats.creationTime = IceInternal.Time.currentMonotonicTimeMillis();
+                                    rec.stats.lastSaveTime = 0;
+                                    rec.stats.avgSaveTime = 0;
+                                }
 
                                 addToModifiedQueue(element);
                                 break;
@@ -1177,10 +1177,10 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor,
                         }
 
                         long saveStart = 0;
-			if(_trace >= 1)
-			{
-			    saveStart = IceInternal.Time.currentMonotonicTimeMillis();
-			}
+                        if(_trace >= 1)
+                        {
+                            saveStart = IceInternal.Time.currentMonotonicTimeMillis();
+                        }
                         String txnId = null;
 
                         try
@@ -1466,12 +1466,12 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor,
 
         if(element.status != destroyed)
         {
-	    boolean keepStats = obj.store.keepStats();
+            boolean keepStats = obj.store.keepStats();
 
-	    if(keepStats)
-	    {
-		updateStats(element.rec.stats, streamStart);
-	    }
+            if(keepStats)
+            {
+                updateStats(element.rec.stats, streamStart);
+            }
             obj.value = ObjectStore.marshalValue(element.rec, _communicator, _encoding, keepStats);
         }
         return obj;
diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java
index 31d253bf276..be0d54395e4 100644
--- a/java/src/Freeze/EvictorIteratorI.java
+++ b/java/src/Freeze/EvictorIteratorI.java
@@ -58,10 +58,10 @@ class EvictorIteratorI implements EvictorIterator
     private java.util.Iterator<Ice.Identity>
     nextBatch()
     {
-	if(!_more)
+        if(!_more)
         {
-	    return null;
-	}
+            return null;
+        }
 
         EvictorI.DeactivateController deactivateController = _store.evictor().deactivateController();
         deactivateController.lock();
diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java
index 6ca9b493261..82ccc40ac55 100644
--- a/java/src/Freeze/ObjectStore.java
+++ b/java/src/Freeze/ObjectStore.java
@@ -22,7 +22,7 @@ class ObjectStore implements IceUtil.Store
         _indices = indices;
         _communicator = evictor.communicator();
         _encoding = evictor.encoding();
-	_keepStats = false;
+        _keepStats = false;
 
         if(facet.equals(""))
         {
@@ -56,18 +56,18 @@ class ObjectStore implements IceUtil.Store
             CatalogData catalogData = catalog.get(evictor.filename());
 
             if(catalogData != null)
-	    {
-		if(catalogData.evictor)
-		{
-		    _keepStats = catalogData.value.isEmpty();
-		}
-		else
-		{
-		    DatabaseException ex = new DatabaseException();
-		    ex.message = _evictor.errorPrefix() + evictor.filename() + " is not an evictor database";
-		    throw ex;
-		}
-	    }
+            {
+                if(catalogData.evictor)
+                {
+                    _keepStats = catalogData.value.isEmpty();
+                }
+                else
+                {
+                    DatabaseException ex = new DatabaseException();
+                    ex.message = _evictor.errorPrefix() + evictor.filename() + " is not an evictor database";
+                    throw ex;
+                }
+            }
 
             com.sleepycat.db.Environment dbEnv = evictor.dbEnv().getEnv();
 
@@ -329,14 +329,14 @@ class ObjectStore implements IceUtil.Store
             new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), encoding, true, false);
         os.startWriteEncaps();
 
-	if(keepStats)
-	{
-	    v.__write(os);
-	}
-	else
-	{
-	    os.writeObject(v.servant);
-	}
+        if(keepStats)
+        {
+            v.__write(os);
+        }
+        else
+        {
+            os.writeObject(v.servant);
+        }
         os.writePendingObjects();
         os.endWriteEncaps();
         IceInternal.Buffer buf = os.prepareWrite();
@@ -358,18 +358,18 @@ class ObjectStore implements IceUtil.Store
         buf.b.position(0);
         ObjectRecord rec = new ObjectRecord();
         is.startReadEncaps();
-	if(keepStats)
-	{
-	    rec.__read(is);
-	    is.readPendingObjects();
-	}
-	else
-	{
-	    Ice.ObjectHolder holder = new Ice.ObjectHolder();
-	    is.readObject(holder);
-	    is.readPendingObjects();
-	    rec.servant = holder.value;
-	}
+        if(keepStats)
+        {
+            rec.__read(is);
+            is.readPendingObjects();
+        }
+        else
+        {
+            Ice.ObjectHolder holder = new Ice.ObjectHolder();
+            is.readObject(holder);
+            is.readPendingObjects();
+            rec.servant = holder.value;
+        }
         is.endReadEncaps();
         return rec;
     }
@@ -401,7 +401,7 @@ class ObjectStore implements IceUtil.Store
     final boolean
     keepStats()
     {
-	return _keepStats;
+        return _keepStats;
     }
 
     final EvictorI
@@ -567,7 +567,7 @@ class ObjectStore implements IceUtil.Store
         com.sleepycat.db.DatabaseEntry dbValue = new com.sleepycat.db.DatabaseEntry(marshalValue(objectRecord, 
                                                                                                  _communicator,
                                                                                                  _encoding,
-												 _keepStats));
+                                                                                                 _keepStats));
 
         try
         {
diff --git a/java/src/Freeze/TransactionalEvictorContext.java b/java/src/Freeze/TransactionalEvictorContext.java
index 434a63b773a..a0fe2af0ad6 100644
--- a/java/src/Freeze/TransactionalEvictorContext.java
+++ b/java/src/Freeze/TransactionalEvictorContext.java
@@ -179,10 +179,10 @@ class TransactionalEvictorContext implements Ice.DispatchInterceptorAsyncCallbac
                 {
                     if(!_readOnly && !_removed)
                     {
-			if(_store.keepStats())
-			{
-			    EvictorI.updateStats(_rec.stats, IceInternal.Time.currentMonotonicTimeMillis());
-			}
+                        if(_store.keepStats())
+                        {
+                            EvictorI.updateStats(_rec.stats, IceInternal.Time.currentMonotonicTimeMillis());
+                        }
                         _store.update(_current.id, _rec, _tx);
 
                         if(_trace >= 3)
diff --git a/java/src/Freeze/TransactionalEvictorI.java b/java/src/Freeze/TransactionalEvictorI.java
index d1dbc185e82..3b389fe07f8 100644
--- a/java/src/Freeze/TransactionalEvictorI.java
+++ b/java/src/Freeze/TransactionalEvictorI.java
@@ -61,7 +61,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor
         _deactivateController.lock();
         try
         {
-	    ObjectStore store = findStore(facet, _createDb);
+            ObjectStore store = findStore(facet, _createDb);
             if(store == null)
             {
                 NotFoundException ex = new NotFoundException();
@@ -70,24 +70,24 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor
             }
 
             long currentTime = 0;
-	    ObjectRecord rec;
-
-	    if(store.keepStats())
-	    {
-		currentTime = IceInternal.Time.currentMonotonicTimeMillis();
-		rec = new ObjectRecord(servant, new Statistics(currentTime, 0, 0));
-	    }
-	    else
-	    {
-		rec = new ObjectRecord(servant, null);
-	    }
+            ObjectRecord rec;
+
+            if(store.keepStats())
+            {
+                currentTime = IceInternal.Time.currentMonotonicTimeMillis();
+                rec = new ObjectRecord(servant, new Statistics(currentTime, 0, 0));
+            }
+            else
+            {
+                rec = new ObjectRecord(servant, null);
+            }
 
             TransactionI tx = beforeQuery();
 
-	    if(store.keepStats())
-	    {
-		updateStats(rec.stats, currentTime);
-	    }
+            if(store.keepStats())
+            {
+                updateStats(rec.stats, currentTime);
+            }
 
             if(!store.insert(ident, rec, tx))
             {
@@ -362,10 +362,10 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor
 
                 int operationAttributes = sample.ice_operationAttributes(current.operation);
 
-		if(operationAttributes < 0)
-		{
-		    throw new Ice.OperationNotExistException();
-		}
+                if(operationAttributes < 0)
+                {
+                    throw new Ice.OperationNotExistException();
+                }
 
                 boolean readOnly = (operationAttributes & 0x1) == 0;
 
@@ -411,7 +411,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor
                     default:
                     {
                         assert false;
-			throw new Ice.OperationNotExistException();
+                        throw new Ice.OperationNotExistException();
                     }
                 }
 
diff --git a/java/src/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/SessionFactoryHelper.java
index e7526510f80..d7761b797fa 100644
--- a/java/src/Glacier2/SessionFactoryHelper.java
+++ b/java/src/Glacier2/SessionFactoryHelper.java
@@ -224,7 +224,7 @@ public class SessionFactoryHelper
     synchronized public void
     setConnectContext(final java.util.Map<String, String> context)
     {
-	_context = context;
+        _context = context;
     }
 
     /**
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index f08532fc6f4..a7d73df9330 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -886,12 +886,12 @@ public final class ObjectAdapterI implements ObjectAdapter
         if(unknownProps.size() != 0 && properties.getPropertyAsIntWithDefault("Ice.Warn.UnknownProperties", 1) > 0)
         {
             StringBuffer message = new StringBuffer("found unknown properties for object adapter `");
-	    message.append(_name);
-	    message.append("':");
+            message.append(_name);
+            message.append("':");
             for(String p : unknownProps)
             {
-		message.append("\n    ");
-		message.append(p);
+                message.append("\n    ");
+                message.append(p);
             }
             _instance.initializationData().logger.warning(message.toString());
         }
@@ -1283,14 +1283,14 @@ public final class ObjectAdapterI implements ObjectAdapter
         if(_instance.traceLevels().network >= 1)
         {
             StringBuffer s = new StringBuffer("published endpoints for object adapter `");
-	    s.append(_name);
-	    s.append("':\n");
+            s.append(_name);
+            s.append("':\n");
             boolean first = true;
             for(IceInternal.EndpointI endpoint : endpoints)
             {
                 if(!first)
                 {
-		    s.append(":");
+                    s.append(":");
                 }
                 s.append(endpoint.toString());
                 first = false;
diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java
index a793da76921..738140f1f0b 100644
--- a/java/src/IceGridGUI/Application/Communicator.java
+++ b/java/src/IceGridGUI/Application/Communicator.java
@@ -699,24 +699,24 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
                     TemplateDescriptor templateDescriptor
                         = getRoot().findServiceTemplateDescriptor(descriptor.template);
 
-		    if(templateDescriptor == null)
-		    {
-			throw new UpdateFailedException("Cannot find template descriptor '" +
-							descriptor.template + 
-							"' referenced by service-instance");
-		    }
+                    if(templateDescriptor == null)
+                    {
+                        throw new UpdateFailedException("Cannot find template descriptor '" +
+                                                        descriptor.template + 
+                                                        "' referenced by service-instance");
+                    }
 
                     serviceResolver = new Utils.Resolver(getResolver(),
                                                          descriptor.parameterValues,
                                                          templateDescriptor.parameterDefaults);
 
                     ServiceDescriptor serviceDescriptor = (ServiceDescriptor)templateDescriptor.descriptor;
-		    
-		    //
-		    // If it's not null, it's a bug in the provider of this descriptor, e.g.
-		    // the icegridadmin parsing code. 
-		    //
-		    assert serviceDescriptor != null;
+                    
+                    //
+                    // If it's not null, it's a bug in the provider of this descriptor, e.g.
+                    // the icegridadmin parsing code. 
+                    //
+                    assert serviceDescriptor != null;
 
                     serviceName = serviceResolver.substitute(serviceDescriptor.name);
                     serviceResolver.put("service", serviceName);
diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/Application/Node.java
index 45b3d3963ed..5cb26dea3a0 100644
--- a/java/src/IceGridGUI/Application/Node.java
+++ b/java/src/IceGridGUI/Application/Node.java
@@ -542,12 +542,12 @@ class Node extends TreeNode implements PropertySetParent
         //
         TemplateDescriptor templateDescriptor = root.findServerTemplateDescriptor(instanceDescriptor.template);
 
-	if(templateDescriptor == null)
-	{
-	    throw new UpdateFailedException("Cannot find template descriptor '" +
-					    instanceDescriptor.template + 
-					    "' referenced by server-instance");
-	}
+        if(templateDescriptor == null)
+        {
+            throw new UpdateFailedException("Cannot find template descriptor '" +
+                                            instanceDescriptor.template + 
+                                            "' referenced by server-instance");
+        }
         ServerDescriptor serverDescriptor = (ServerDescriptor)templateDescriptor.descriptor;
 
         assert serverDescriptor != null;
diff --git a/java/src/IceGridGUI/Application/NodeEditor.java b/java/src/IceGridGUI/Application/NodeEditor.java
index d49201d8d71..91dfc9b6cde 100644
--- a/java/src/IceGridGUI/Application/NodeEditor.java
+++ b/java/src/IceGridGUI/Application/NodeEditor.java
@@ -173,7 +173,7 @@ class NodeEditor extends Editor
         _loadFactor.setToolTipText("<html>A floating point value.<br>"
                                    + "When not specified, IceGrid uses 1.0 divided by the<br>"
                                    + "<i>number of threads</i> on all platforms except Windows;<br>"
-				   + "on Windows, IceGrid uses 1.0.<html>");
+                                   + "on Windows, IceGrid uses 1.0.<html>");
     }
 
     protected void appendProperties(DefaultFormBuilder builder)
diff --git a/java/src/IceGridGUI/Application/UpdateFailedException.java b/java/src/IceGridGUI/Application/UpdateFailedException.java
index 80fe91e88d8..c194e0c22e1 100755..100644
--- a/java/src/IceGridGUI/Application/UpdateFailedException.java
+++ b/java/src/IceGridGUI/Application/UpdateFailedException.java
@@ -13,12 +13,12 @@ public class UpdateFailedException extends Exception
 {
     UpdateFailedException(TreeNode parent, String id)
     {
-	_message = parent.getFullId().toString() + " has already a child with '" + id + "' as ID.";
+        _message = parent.getFullId().toString() + " has already a child with '" + id + "' as ID.";
     }
 
     UpdateFailedException(String message)
     {
-	_message = message;
+        _message = message;
     }
     
     public String toString()
diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java
index e4200a58eb5..0d0108c04c0 100644
--- a/java/src/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/Coordinator.java
@@ -475,10 +475,10 @@ public class Coordinator
             _serviceMenu = new JMenu("Service");
             _serviceMenu.setEnabled(false);
             toolsMenu.add(_serviceMenu);
-	    _serviceMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.START));
-	    _serviceMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.STOP));
-	    _serviceMenu.addSeparator();
-	    _serviceMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.RETRIEVE_LOG));
+            _serviceMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.START));
+            _serviceMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.STOP));
+            _serviceMenu.addSeparator();
+            _serviceMenu.add(_liveActionsForMenu.get(IceGridGUI.LiveDeployment.TreeNode.RETRIEVE_LOG));
 
             //
             // Help menu
@@ -3339,9 +3339,9 @@ public class Coordinator
         _serverMenu.setEnabled(availableActions[IceGridGUI.LiveDeployment.TreeNode.OPEN_DEFINITION]);
 
         _serviceMenu.setEnabled(node instanceof IceGridGUI.LiveDeployment.Service &&
-				(availableActions[IceGridGUI.LiveDeployment.TreeNode.RETRIEVE_LOG] ||
-				 availableActions[IceGridGUI.LiveDeployment.TreeNode.START] ||
-				 availableActions[IceGridGUI.LiveDeployment.TreeNode.STOP]));
+                                (availableActions[IceGridGUI.LiveDeployment.TreeNode.RETRIEVE_LOG] ||
+                                 availableActions[IceGridGUI.LiveDeployment.TreeNode.START] ||
+                                 availableActions[IceGridGUI.LiveDeployment.TreeNode.STOP]));
     }
 
     public void showActions(IceGridGUI.Application.TreeNode node)
diff --git a/java/src/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/LiveDeployment/GraphView.java
index f042e3c8dc9..7e899d09c35 100644
--- a/java/src/IceGridGUI/LiveDeployment/GraphView.java
+++ b/java/src/IceGridGUI/LiveDeployment/GraphView.java
@@ -1338,7 +1338,7 @@ public class GraphView extends JFrame implements MetricsFieldContext
         }
 
         public Class getColumnClass(int columnIndex)
-	    {
+            {
             switch(columnIndex)
             {
                 case 0: // Node Name
@@ -1398,7 +1398,7 @@ public class GraphView extends JFrame implements MetricsFieldContext
                     return null;
                 }
             }
-	    }
+            }
 
         public Object getValueAt(int rowIndex, int columnIndex)
         {
diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
index ae0bcbd8019..a1c8ab94de9 100644
--- a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
+++ b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
@@ -622,8 +622,8 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
         {
             if(_tables.get(entry.getKey()) != null)
             {
-		        continue;
-	        }
+                        continue;
+                }
 
             IceMX.Metrics[] objects = entry.getValue();
             if(objects == null || objects.length == 0)
@@ -972,10 +972,10 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
             return false;
         }
 
-	    public Class getColumnClass(int index)
-	    {
-	        return _fields.get(index).getColumnClass();
-	    }
+            public Class getColumnClass(int index)
+            {
+                return _fields.get(index).getColumnClass();
+            }
 
         public Map<Integer, MetricsField> getMetricFields()
         {
@@ -1032,7 +1032,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
         //
         // Name for display.
         //
-	    public String getColumnName();
+            public String getColumnName();
 
         //
         // ToolTip
@@ -1042,7 +1042,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
         //
         // The Java class correspoding to the field, is used in the table models.
         //
-	    public Class getColumnClass();
+            public Class getColumnClass();
 
         //
         // Renderer used by JTable to render the field.
@@ -1052,7 +1052,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
         //
         // Return the value of the field for the given metrics object.
         //
-	    public Object getValue(IceMX.Metrics m, long timestamp);
+            public Object getValue(IceMX.Metrics m, long timestamp);
 
         //
         // Set up a field identical to this but without the transient data.
@@ -1224,10 +1224,10 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
             _cellRenderer = new FormatedNumberRenderer(format);
         }
 
-	    public Class getColumnClass()
-	    {
-	        return Float.class;
-	    }
+            public Class getColumnClass()
+            {
+                return Float.class;
+            }
 
         public TableCellRenderer getCellRenderer()
         {
@@ -1259,8 +1259,8 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
             }
         } 
 
-	    private double _scaleFactor = 1.0d;
-	    private String _columnName;
+            private double _scaleFactor = 1.0d;
+            private String _columnName;
         private TableCellRenderer _cellRenderer;
         private final Map<String, IceMX.Metrics> _deltas = new HashMap<String, IceMX.Metrics>();
     }
@@ -1275,10 +1275,10 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
     {
         public DeltaAverageMetricsField(MetricsView node, String prefix, String metricsName, String fieldName,
                                         Field field)
-	    {
+            {
             super(node, prefix, metricsName, fieldName, field);
             setFormat("#0.000"); // Set the default format
-	    }
+            }
 
         public void setFormat(String format)
         {
@@ -1407,8 +1407,8 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
             return _cellRenderer;
         }
 
-	    public Object getValue(final IceMX.Metrics m, long timestamp)
-	    {
+            public Object getValue(final IceMX.Metrics m, long timestamp)
+            {
             JButton button = new JButton(Integer.toString(m.failures));
             if(m.failures > 0)
             {
@@ -1520,7 +1520,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
                 button.setEnabled(false);
             }
             return button;
-	    }
+            }
 
         private static final TableCellRenderer _cellRenderer = new ButtonRenderer();
     }
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 1f81029f920..c52e05cf242 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -1117,8 +1117,8 @@ public final class Instance
                 StringBuffer message = new StringBuffer("The following properties were set but never read:");
                 for(String p : unusedProperties)
                 {
-		    message.append("\n    ");
-		    message.append(p);
+                    message.append("\n    ");
+                    message.append(p);
                 }
                 _initData.logger.warning(message.toString());
             }
diff --git a/java/src/IceInternal/MetricsAdminI.java b/java/src/IceInternal/MetricsAdminI.java
index 1a7b79065a3..539e80ac5a8 100644
--- a/java/src/IceInternal/MetricsAdminI.java
+++ b/java/src/IceInternal/MetricsAdminI.java
@@ -47,12 +47,12 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper
         if(unknownProps.size() != 0 && properties.getPropertyAsIntWithDefault("Ice.Warn.UnknownProperties", 1) > 0)
         {
             StringBuffer message = new StringBuffer("found unknown IceMX properties for `");
-	    message.append(prefix.substring(0, prefix.length() - 1));
-	    message.append("':");
+            message.append(prefix.substring(0, prefix.length() - 1));
+            message.append("':");
             for(String p : unknownProps)
             {
-		message.append("\n    ");
-		message.append(p);
+                message.append("\n    ");
+                message.append(p);
             }
             Ice.Util.getProcessLogger().warning(message.toString());
         }
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index 6da0808aaaf..058c4fd88ba 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -1096,14 +1096,14 @@ public final class Network
     private static boolean
     isValidAddr(java.net.InetAddress addr, int protocol)
     {
-	 byte[] bytes = null;
-	 if(addr != null)
-	 {
-	     bytes = addr.getAddress();
-	 }
-	 return bytes != null && 
-	       ((bytes.length == 16 && protocol == EnableIPv6) ||
-	        (bytes.length == 4 && protocol == EnableIPv4));
+         byte[] bytes = null;
+         if(addr != null)
+         {
+             bytes = addr.getAddress();
+         }
+         return bytes != null && 
+               ((bytes.length == 16 && protocol == EnableIPv6) ||
+                (bytes.length == 4 && protocol == EnableIPv4));
     }
 
     public static String
diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index f6e5dc7ea01..0d17f73b754 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -428,9 +428,9 @@ public final class ReferenceFactory
                 StringBuffer msg = new StringBuffer("Proxy contains unknown endpoints:");
                 for(String e : unknownEndpoints)
                 {
-		    msg.append(" `");
-		    msg.append(e);
-		    msg.append("'");
+                    msg.append(" `");
+                    msg.append(e);
+                    msg.append("'");
                 }
                 _instance.initializationData().logger.warning(msg.toString());
             }
@@ -705,12 +705,12 @@ public final class ReferenceFactory
         if(unknownProps.size() != 0)
         {
             StringBuffer message = new StringBuffer("found unknown properties for proxy '");
-	    message.append(prefix);
-	    message.append("':");
+            message.append(prefix);
+            message.append("':");
             for(String s : unknownProps)
             {
-		message.append("\n    ");
-		message.append(s);
+                message.append("\n    ");
+                message.append(s);
             }
             _instance.initializationData().logger.warning(message.toString());
         }
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index ca0da43319e..412211bd080 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -39,7 +39,7 @@ class TcpAcceptor implements Acceptor
         if(_traceLevels.network >= 1)
         {
             StringBuffer s = new StringBuffer("listening for tcp connections at ");
-	    s.append(toString());
+            s.append(toString());
 
             java.util.List<String> interfaces = 
                 Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), _instance.protocolSupport(),
diff --git a/java/src/IceInternal/Timer.java b/java/src/IceInternal/Timer.java
index fe643e1e089..03a180d7f3f 100644
--- a/java/src/IceInternal/Timer.java
+++ b/java/src/IceInternal/Timer.java
@@ -290,25 +290,25 @@ public final class Timer extends Thread
             return 0;
         }
 
-	public boolean
-	equals(Object obj)
-	{
-	    if(this == obj)
-	    {
-	        return true;
-	    }
-	    if(obj instanceof Token)
-	    {
-		return compareTo((Token)obj) == 0;
-	    }
-	    return false;
-	}
-
-	public int
-	hashCode()
-	{
-	     return id ^ (int)scheduledTime;
-	}
+        public boolean
+        equals(Object obj)
+        {
+            if(this == obj)
+            {
+                return true;
+            }
+            if(obj instanceof Token)
+            {
+                return compareTo((Token)obj) == 0;
+            }
+            return false;
+        }
+
+        public int
+        hashCode()
+        {
+             return id ^ (int)scheduledTime;
+        }
 
         long scheduledTime;
         int id; // Since we can't compare references, we need to use another id.
diff --git a/java/src/IceSSL/AcceptorI.java b/java/src/IceSSL/AcceptorI.java
index ac01fdc9f8c..25b3412265e 100644
--- a/java/src/IceSSL/AcceptorI.java
+++ b/java/src/IceSSL/AcceptorI.java
@@ -39,7 +39,7 @@ final class AcceptorI implements IceInternal.Acceptor
         if(_instance.networkTraceLevel() >= 1)
         {
             StringBuffer s = new StringBuffer("listening for ssl connections at ");
-	    s.append(toString());
+            s.append(toString());
 
             java.util.List<String> interfaces = 
                 IceInternal.Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), 
diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java
index 76f89e2fc64..8c057070c59 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/Freeze/evictor/Client.java
@@ -579,17 +579,17 @@ public class Client extends test.Util.Application
         {
         }
 
-	//
-	// Call an operation that does not exist on the servant
-	//    
-	try
-	{
-	    int balance = AccountPrxHelper.uncheckedCast(servants[0]).getBalance();
-	    test(false);
-	}
-	catch(Ice.OperationNotExistException ex)
-	{
-	}
+        //
+        // Call an operation that does not exist on the servant
+        //    
+        try
+        {
+            int balance = AccountPrxHelper.uncheckedCast(servants[0]).getBalance();
+            test(false);
+        }
+        catch(Ice.OperationNotExistException ex)
+        {
+        }
 
         //
         // Remove all facets
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java
index 8f88d18d802..cfb6c7fe620 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorI.java
@@ -78,11 +78,11 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
                                                                true);
         }
 
-	//
-	// Check that we can get an iterator on a non-existing facet
-	//
-	Freeze.EvictorIterator p = _evictor.getIterator("foo", 1);
-	test(p.hasNext() == false);
+        //
+        // Check that we can get an iterator on a non-existing facet
+        //
+        Freeze.EvictorIterator p = _evictor.getIterator("foo", 1);
+        test(p.hasNext() == false);
 
         initializer.init(this, _evictor);
 
diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java
index 572ff0989ab..036358df2c1 100644
--- a/java/test/Glacier2/router/Client.java
+++ b/java/test/Glacier2/router/Client.java
@@ -468,8 +468,8 @@ public class Client extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Client c = new Client();
-    	int status = c.main("Client", args);
+        Client c = new Client();
+        int status = c.main("Client", args);
         
         System.gc();
         System.exit(status);
diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java
index de0b09b36ef..ecdc6935faf 100644
--- a/java/test/Ice/adapterDeactivation/AllTests.java
+++ b/java/test/Ice/adapterDeactivation/AllTests.java
@@ -28,7 +28,7 @@ public class AllTests
     public static TestIntfPrx
     allTests(Ice.Communicator communicator, java.io.PrintWriter out)
     {
-	out.print("testing stringToProxy... ");
+        out.print("testing stringToProxy... ");
         out.flush();
         String ref = "test:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/adapterDeactivation/Client.java b/java/test/Ice/adapterDeactivation/Client.java
index 6930d16f4d5..b78b88a3dd6 100644
--- a/java/test/Ice/adapterDeactivation/Client.java
+++ b/java/test/Ice/adapterDeactivation/Client.java
@@ -30,7 +30,7 @@ public class Client extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Client app = new Client();
+        Client app = new Client();
         int result = app.main("Client", args);
         System.gc();
         System.exit(result);
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java
index 0e4f6d36ea7..fdba37a4548 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/Ice/adapterDeactivation/Server.java
@@ -36,7 +36,7 @@ public class Server extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Server app = new Server();
+        Server app = new Server();
         int result = app.main("Server", args);
 
         System.gc();
diff --git a/java/test/Ice/ami/Server.java b/java/test/Ice/ami/Server.java
index f9e38e63dec..bf2512c1c79 100644
--- a/java/test/Ice/ami/Server.java
+++ b/java/test/Ice/ami/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
     public int
     run(String[] args)
     {
-    	Ice.Communicator communicator = communicator();
+        Ice.Communicator communicator = communicator();
 
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
         Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
@@ -41,7 +41,7 @@ public class Server extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Server app = new Server();
+        Server app = new Server();
         int result = app.main("Server", args);
         System.gc();
         System.exit(result);
diff --git a/java/test/Ice/background/Client.java b/java/test/Ice/background/Client.java
index c640a8024c0..722f6855f41 100644
--- a/java/test/Ice/background/Client.java
+++ b/java/test/Ice/background/Client.java
@@ -60,7 +60,7 @@ public class Client extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Client app = new Client();
+        Client app = new Client();
         int result = app.main("Client", args);
         System.gc();
         System.exit(result);
diff --git a/java/test/Ice/background/Collocated.java b/java/test/Ice/background/Collocated.java
index 8aadec2213c..34e930c8d04 100644
--- a/java/test/Ice/background/Collocated.java
+++ b/java/test/Ice/background/Collocated.java
@@ -16,66 +16,66 @@ public class Collocated
     public static void
     main(String[] args)
     {
-    	final Client client = new Client();
-    	final Server server = new Server();
-	Thread t = new Thread(new Runnable()
-	{
-	    public void run()
-	    {
-		String[] args =
-		{
-		    "--Ice.NullHandleAbort=1",
-		    "--Ice.Warn.Connections=1",
-		    "--Ice.ThreadPool.Server.Size=1",
-		    "--Ice.ThreadPool.Server.SizeMax=3",
-		    "--Ice.ThreadPool.Server.SizeWarn=0",
-		    "--Ice.PrintAdapterReady=1",
-		    "--Ice.ServerIdleTime=30",
-		    "--Ice.Default.Host=127.0.0.1"
-		};
-		server.setServerReadyListener(new test.Util.Application.ServerReadyListener()
-		{
-		    public void serverReady()
-		    {
-			_clientThread = new Thread(new Runnable()
-			{
-			    public void run()
-			    {
-				String[] args =
-				{
-				    "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1", "--Ice.Default.Host=127.0.0.1"
-				};
-				client.main("Client", args);
-			    }
-			});
-			_clientThread.start();
-		    }
-		});
+        final Client client = new Client();
+        final Server server = new Server();
+        Thread t = new Thread(new Runnable()
+        {
+            public void run()
+            {
+                String[] args =
+                {
+                    "--Ice.NullHandleAbort=1",
+                    "--Ice.Warn.Connections=1",
+                    "--Ice.ThreadPool.Server.Size=1",
+                    "--Ice.ThreadPool.Server.SizeMax=3",
+                    "--Ice.ThreadPool.Server.SizeWarn=0",
+                    "--Ice.PrintAdapterReady=1",
+                    "--Ice.ServerIdleTime=30",
+                    "--Ice.Default.Host=127.0.0.1"
+                };
+                server.setServerReadyListener(new test.Util.Application.ServerReadyListener()
+                {
+                    public void serverReady()
+                    {
+                        _clientThread = new Thread(new Runnable()
+                        {
+                            public void run()
+                            {
+                                String[] args =
+                                {
+                                    "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1", "--Ice.Default.Host=127.0.0.1"
+                                };
+                                client.main("Client", args);
+                            }
+                        });
+                        _clientThread.start();
+                    }
+                });
 
-		result = server.main("Server", args);
-		if(_clientThread != null)
-		{
-		    while(_clientThread.isAlive())
-		    {
-			try
-			{
-			    _clientThread.join();
-			}
-			catch(InterruptedException e1)
-			{
-			}
-		    }
-		}
-	    }
-	});
-	t.start();
-	try
-	{
-	    t.join();
-	}
-	catch(InterruptedException ex)
-	{
-	}
+                result = server.main("Server", args);
+                if(_clientThread != null)
+                {
+                    while(_clientThread.isAlive())
+                    {
+                        try
+                        {
+                            _clientThread.join();
+                        }
+                        catch(InterruptedException e1)
+                        {
+                        }
+                    }
+                }
+            }
+        });
+        t.start();
+        try
+        {
+            t.join();
+        }
+        catch(InterruptedException ex)
+        {
+        }
         System.gc();
         System.exit(result);
     }
diff --git a/java/test/Ice/background/Server.java b/java/test/Ice/background/Server.java
index 648229d8d33..34c012e2e73 100644
--- a/java/test/Ice/background/Server.java
+++ b/java/test/Ice/background/Server.java
@@ -141,7 +141,7 @@ public class Server extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Server app = new Server();
+        Server app = new Server();
         int result = app.main("Server", args);
         System.gc();
         System.exit(result);
diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java
index e21d1bc8ef4..65c84f0b2cc 100644
--- a/java/test/Ice/binding/AllTests.java
+++ b/java/test/Ice/binding/AllTests.java
@@ -102,7 +102,7 @@ public class AllTests
         String ref = "communicator:default -p 12010";
         RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(ref));
 
-		out.print("testing binding with single endpoint... ");
+                out.print("testing binding with single endpoint... ");
         out.flush();
         {
             RemoteObjectAdapterPrx adapter = com.createObjectAdapter("Adapter", "default");
diff --git a/java/test/Ice/binding/Server.java b/java/test/Ice/binding/Server.java
index 5579fbe0035..d45c49a02cd 100644
--- a/java/test/Ice/binding/Server.java
+++ b/java/test/Ice/binding/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
     public int
     run(String[] args)
     {
-    	Ice.Communicator communicator = communicator();
+        Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Identity id = communicator.stringToIdentity("communicator");
         adapter.add(new RemoteCommunicatorI(), id);
@@ -35,7 +35,7 @@ public class Server extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Server app = new Server();
+        Server app = new Server();
         int result = app.main("Server", args);
         System.gc();
         System.exit(result);
diff --git a/java/test/Ice/checksum/Client.java b/java/test/Ice/checksum/Client.java
index 29de6990009..f1f662592b9 100644
--- a/java/test/Ice/checksum/Client.java
+++ b/java/test/Ice/checksum/Client.java
@@ -16,7 +16,7 @@ public class Client extends test.Util.Application
     public int
     run(String[] args)
     {
-	Ice.Communicator communicator = communicator();
+        Ice.Communicator communicator = communicator();
         ChecksumPrx checksum = AllTests.allTests(communicator, false, getWriter());
         checksum.shutdown();
         return 0;
@@ -34,8 +34,8 @@ public class Client extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Client c = new Client();
-    	int status = c.main("Client", args);
+        Client c = new Client();
+        int status = c.main("Client", args);
         
         System.gc();
         System.exit(status);
diff --git a/java/test/Ice/checksum/Server.java b/java/test/Ice/checksum/Server.java
index c4f249372de..3a5225764ca 100644
--- a/java/test/Ice/checksum/Server.java
+++ b/java/test/Ice/checksum/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
     public int
     run(String[] args)
     {
-	Ice.Communicator communicator = communicator();
+        Ice.Communicator communicator = communicator();
         communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ChecksumI();
@@ -34,8 +34,8 @@ public class Server extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Server c = new Server();
-    	int status = c.main("Server", args);
+        Server c = new Server();
+        int status = c.main("Server", args);
         
         System.gc();
         System.exit(status);
diff --git a/java/test/Ice/dispatcher/Server.java b/java/test/Ice/dispatcher/Server.java
index b6d268e4bd6..980dd7aaaad 100644
--- a/java/test/Ice/dispatcher/Server.java
+++ b/java/test/Ice/dispatcher/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
     public int
     run(String[] args)
     {
-    	Ice.Communicator communicator = communicator();
+        Ice.Communicator communicator = communicator();
 
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
         Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
@@ -53,7 +53,7 @@ public class Server extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Server app = new Server();
+        Server app = new Server();
         int result = app.main("Server", args);
         app.terminate();
         System.gc();
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index 1da9731cff0..7d8b27b602e 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -14,7 +14,7 @@ public class Collocated extends test.Util.Application
     public int
     run(String[] args)
     {
-    	Ice.Communicator communicator = communicator();
+        Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ThrowerI();
         adapter.add(object, communicator.stringToIdentity("thrower"));
@@ -36,7 +36,7 @@ public class Collocated extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Collocated app = new Collocated();
+        Collocated app = new Collocated();
         int result = app.main("Collocated", args);
         System.gc();
         System.exit(result);
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java
index 9932421b963..6cff107412c 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/Ice/facets/AllTests.java
@@ -35,7 +35,7 @@ public class AllTests
     public static GPrx
     allTests(Ice.Communicator communicator, PrintWriter out)
     {
-		out.print("testing Ice.Admin.Facets property... ");
+                out.print("testing Ice.Admin.Facets property... ");
         test(communicator.getProperties().getPropertyAsList("Ice.Admin.Facets").length == 0);
         communicator.getProperties().setProperty("Ice.Admin.Facets", "foobar");
         String[] facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index 984d5954fcb..80db5140566 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -25,7 +25,7 @@ public class Client extends test.Util.Application
     {
         PrintWriter out = getWriter();
         
-    	Ice.Communicator communicator = communicator();
+        Ice.Communicator communicator = communicator();
         java.util.List<Integer> ports = new java.util.ArrayList<Integer>(args.length);
         for(String arg : args)
         {
@@ -56,7 +56,7 @@ public class Client extends test.Util.Application
 
         if(ports.isEmpty())
         {
-			out.println("Client: no ports specified");
+                        out.println("Client: no ports specified");
             usage();
             return 1;
         }
diff --git a/java/test/Ice/interceptor/Client.java b/java/test/Ice/interceptor/Client.java
index b2b2bd78472..bea4345026c 100644
--- a/java/test/Ice/interceptor/Client.java
+++ b/java/test/Ice/interceptor/Client.java
@@ -115,7 +115,7 @@ public class Client extends test.Util.Application
     private int
     runAmd(MyObjectPrx prx, AMDInterceptorI interceptor, PrintWriter out)
     {
-		out.print("testing simple interceptor... ");
+                out.print("testing simple interceptor... ");
         out.flush();
         test(interceptor.getLastOperation() == null);
         test(interceptor.getLastStatus() == null);
@@ -201,7 +201,7 @@ public class Client extends test.Util.Application
         oa.activate();
        
         PrintWriter out = getWriter();
-		out.println("Collocation optimization on");
+                out.println("Collocation optimization on");
         int rs = run(prx, interceptor);
         if(rs == 0)
         {
diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java
index e42ac1c167e..1e955dd02d5 100644
--- a/java/test/Ice/objects/AllTests.java
+++ b/java/test/Ice/objects/AllTests.java
@@ -41,7 +41,7 @@ public class AllTests
     public static InitialPrx
     allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out)
     {
-		out.print("testing stringToProxy... ");
+                out.print("testing stringToProxy... ");
         out.flush();
         String ref = "initial:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/packagemd/AllTests.java b/java/test/Ice/packagemd/AllTests.java
index ed6cc29c751..525f02f51e5 100644
--- a/java/test/Ice/packagemd/AllTests.java
+++ b/java/test/Ice/packagemd/AllTests.java
@@ -33,7 +33,7 @@ public class AllTests
     public static InitialPrx
     allTests(Ice.Communicator communicator, PrintWriter out)
     {
-		out.print("testing stringToProxy... ");
+                out.print("testing stringToProxy... ");
         out.flush();
         String ref = "initial:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/servantLocator/AllTests.java b/java/test/Ice/servantLocator/AllTests.java
index 572c876e90d..aa23d04b40a 100644
--- a/java/test/Ice/servantLocator/AllTests.java
+++ b/java/test/Ice/servantLocator/AllTests.java
@@ -194,7 +194,7 @@ public class AllTests
     public static TestIntfPrx
     allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out)
     {
-		out.print("testing stringToProxy... ");
+                out.print("testing stringToProxy... ");
         out.flush();
         String ref = "asm:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/slicing/exceptions/AllTests.java b/java/test/Ice/slicing/exceptions/AllTests.java
index e3e0c6dcfb2..331b6b15770 100644
--- a/java/test/Ice/slicing/exceptions/AllTests.java
+++ b/java/test/Ice/slicing/exceptions/AllTests.java
@@ -673,7 +673,7 @@ public class AllTests
     public static TestIntfPrx
     allTests(Ice.Communicator communicator, boolean collocated, java.io.PrintWriter out)
     {
-		out.print("testing stringToProxy... ");
+                out.print("testing stringToProxy... ");
         out.flush();
         String ref = "Test:default -p 12010 -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index d6129f47b7e..0f7d46a55ef 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -173,7 +173,7 @@ public class Client extends test.Util.Application
     public int
     run(String[] args)
     {
-    	Ice.Communicator comm = communicator();
+        Ice.Communicator comm = communicator();
         MyClassFactoryWrapper factoryWrapper = new MyClassFactoryWrapper();
         comm.addObjectFactory(factoryWrapper, MyClass.ice_staticId());
         comm.addObjectFactory(new MyInterfaceFactory(), _MyInterfaceDisp.ice_staticId());
diff --git a/java/test/Ice/udp/Server.java b/java/test/Ice/udp/Server.java
index dd6bfb15adb..55c515cf267 100644
--- a/java/test/Ice/udp/Server.java
+++ b/java/test/Ice/udp/Server.java
@@ -46,7 +46,7 @@ public class Server extends test.Util.Application
     protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
     {
         Ice.InitializationData initData = new Ice.InitializationData();
-	initData.properties = Ice.Util.createProperties(argsH);
+        initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
diff --git a/java/test/IceGrid/simple/Server.java b/java/test/IceGrid/simple/Server.java
index 5f113d3dd56..c14745a05b4 100644
--- a/java/test/IceGrid/simple/Server.java
+++ b/java/test/IceGrid/simple/Server.java
@@ -50,8 +50,8 @@ public class Server extends test.Util.Application
     public static void
     main(String[] args)
     {
-    	Server c = new Server();
-    	int status = c.main("test.IceGrid.simple.Server", args);
+        Server c = new Server();
+        int status = c.main("test.IceGrid.simple.Server", args);
         
         System.gc();
         System.exit(status);