Expanded tabs into spaces

1 files changed, 215 insertions, 215 deletions

diff --git a/java/src/IceGridGUI/Application/ServiceInstance.java b/java/src/IceGridGUI/Application/ServiceInstance.java
index d5a93f5e7aa..00b2af1a22d 100755
--- a/java/src/IceGridGUI/Application/ServiceInstance.java
+++ b/java/src/IceGridGUI/Application/ServiceInstance.java
@@ -21,49 +21,49 @@ class ServiceInstance extends TreeNode implements Service, Cloneable
     static public ServiceInstanceDescriptor
     copyDescriptor(ServiceInstanceDescriptor instanceDescriptor)
     {
-	ServiceInstanceDescriptor copy = (ServiceInstanceDescriptor)
-	    instanceDescriptor.clone();
-
-	copy.propertySet = PropertySet.copyDescriptor(copy.propertySet);
-	
-	if(copy.descriptor != null)
-	{
-	    copy.descriptor = PlainService.copyDescriptor((ServiceDescriptor)copy.descriptor);
-	}
-	return copy;
+        ServiceInstanceDescriptor copy = (ServiceInstanceDescriptor)
+            instanceDescriptor.clone();
+
+        copy.propertySet = PropertySet.copyDescriptor(copy.propertySet);
+        
+        if(copy.descriptor != null)
+        {
+            copy.descriptor = PlainService.copyDescriptor((ServiceDescriptor)copy.descriptor);
+        }
+        return copy;
     }
     
     static public java.util.List
     copyDescriptors(java.util.List descriptors)
     {
-	java.util.List copy = new java.util.LinkedList();
-	java.util.Iterator p = descriptors.iterator();
-	while(p.hasNext())
-	{
-	    copy.add(copyDescriptor(
-			 (ServiceInstanceDescriptor)p.next()));
-	}
-	return copy;
+        java.util.List copy = new java.util.LinkedList();
+        java.util.Iterator p = descriptors.iterator();
+        while(p.hasNext())
+        {
+            copy.add(copyDescriptor(
+                         (ServiceInstanceDescriptor)p.next()));
+        }
+        return copy;
     }
 
     public Component getTreeCellRendererComponent(
-	    JTree tree,
-	    Object value,
-	    boolean sel,
-	    boolean expanded,
-	    boolean leaf,
-	    int row,
-	    boolean hasFocus) 
+            JTree tree,
+            Object value,
+            boolean sel,
+            boolean expanded,
+            boolean leaf,
+            int row,
+            boolean hasFocus) 
     {
-	if(_cellRenderer == null)
-	{
-	    _cellRenderer = new DefaultTreeCellRenderer();
-	    _cellRenderer.setLeafIcon(
-		Utils.getIcon("/icons/16x16/service.png"));
-	}
-
-	return _cellRenderer.getTreeCellRendererComponent(
-	    tree, value, sel, expanded, leaf, row, hasFocus);
+        if(_cellRenderer == null)
+        {
+            _cellRenderer = new DefaultTreeCellRenderer();
+            _cellRenderer.setLeafIcon(
+                Utils.getIcon("/icons/16x16/service.png"));
+        }
+
+        return _cellRenderer.getTreeCellRendererComponent(
+            tree, value, sel, expanded, leaf, row, hasFocus);
     }
 
     //
@@ -71,283 +71,283 @@ class ServiceInstance extends TreeNode implements Service, Cloneable
     //
     public boolean[] getAvailableActions()
     {
-	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = !_ephemeral;
-	
-	if(((TreeNode)_parent).getAvailableActions()[PASTE])
-	{
-	    actions[PASTE] = true;
-	}
-
-	actions[DELETE] = true;
-
-	if(_parent instanceof Server && !_ephemeral)
-	{
-	    actions[SHOW_VARS] = true;
-	    actions[SUBSTITUTE_VARS] = true;
-	}
-	
-	actions[MOVE_UP] = canMove(true);
-	actions[MOVE_DOWN] = canMove(false);
-	return actions;
+        boolean[] actions = new boolean[ACTION_COUNT];
+        actions[COPY] = !_ephemeral;
+        
+        if(((TreeNode)_parent).getAvailableActions()[PASTE])
+        {
+            actions[PASTE] = true;
+        }
+
+        actions[DELETE] = true;
+
+        if(_parent instanceof Server && !_ephemeral)
+        {
+            actions[SHOW_VARS] = true;
+            actions[SUBSTITUTE_VARS] = true;
+        }
+        
+        actions[MOVE_UP] = canMove(true);
+        actions[MOVE_DOWN] = canMove(false);
+        return actions;
     }
     public JPopupMenu getPopupMenu()
     {
-	ApplicationActions actions = getCoordinator().getActionsForPopup();
-	if(_popup == null)
-	{
-	    _popup = new JPopupMenu();
-	    _popup.add(actions.get(MOVE_UP));
-	    _popup.add(actions.get(MOVE_DOWN));
-	}
-	actions.setTarget(this);
-	return _popup;
+        ApplicationActions actions = getCoordinator().getActionsForPopup();
+        if(_popup == null)
+        {
+            _popup = new JPopupMenu();
+            _popup.add(actions.get(MOVE_UP));
+            _popup.add(actions.get(MOVE_DOWN));
+        }
+        actions.setTarget(this);
+        return _popup;
     }
     public void copy()
     {
-	getCoordinator().setClipboard(copyDescriptor(_descriptor));
-	getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true);
+        getCoordinator().setClipboard(copyDescriptor(_descriptor));
+        getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true);
     }
 
     public void paste()
     {
-	((TreeNode)_parent).paste();
+        ((TreeNode)_parent).paste();
     }
     
     public void moveUp()
     {
-	move(true);
+        move(true);
     }
     public void moveDown()
     {
-	move(false);
+        move(false);
     }
    
     public Object getDescriptor()
     {
-	return _descriptor;
+        return _descriptor;
     }
 
     public Object saveDescriptor()
     {
-	//
-	// Must be a shallow copy
-	//
-	ServiceInstanceDescriptor saved = 
-	    (ServiceInstanceDescriptor)_descriptor.clone();
-	
-
-	assert saved.descriptor == null;
-	return saved;
+        //
+        // Must be a shallow copy
+        //
+        ServiceInstanceDescriptor saved = 
+            (ServiceInstanceDescriptor)_descriptor.clone();
+        
+
+        assert saved.descriptor == null;
+        return saved;
     }
 
     public void restoreDescriptor(Object savedDescriptor)
     {
-	ServiceInstanceDescriptor sd = (ServiceInstanceDescriptor)savedDescriptor;
-	_descriptor.template = sd.template;
-	_descriptor.parameterValues = sd.parameterValues;
-	_descriptor.propertySet = sd.propertySet;
+        ServiceInstanceDescriptor sd = (ServiceInstanceDescriptor)savedDescriptor;
+        _descriptor.template = sd.template;
+        _descriptor.parameterValues = sd.parameterValues;
+        _descriptor.propertySet = sd.propertySet;
     }
 
     public void destroy()
     {
-	((Communicator)_parent).getServices().destroyChild(this);
+        ((Communicator)_parent).getServices().destroyChild(this);
     }
 
     public Editor getEditor()
     {
-	if(_editor == null)
-	{
-	    _editor = (ServiceInstanceEditor)getRoot().
-		getEditor(ServiceInstanceEditor.class, this);
-	}
-	_editor.show(this);
-	return _editor;
+        if(_editor == null)
+        {
+            _editor = (ServiceInstanceEditor)getRoot().
+                getEditor(ServiceInstanceEditor.class, this);
+        }
+        _editor.show(this);
+        return _editor;
     }
 
     protected Editor createEditor()
     {
-	return new ServiceInstanceEditor();
+        return new ServiceInstanceEditor();
     }
 
     public String toString()
     {
-	if(_displayString != null)
-	{
-	    return _displayString;
-	}
-	else
-	{
-	    return super.toString();
-	}
+        if(_displayString != null)
+        {
+            return _displayString;
+        }
+        else
+        {
+            return super.toString();
+        }
     }
     
     private boolean canMove(boolean up)
     {
-	if(_ephemeral)
-	{
-	    return false;
-	}
-	else
-	{
-	    return ((Communicator)_parent).getServices().canMove(this, up);
-	}
+        if(_ephemeral)
+        {
+            return false;
+        }
+        else
+        {
+            return ((Communicator)_parent).getServices().canMove(this, up);
+        }
     }
 
     private void move(boolean up)
     {
-	assert canMove(up);
-	((Communicator)_parent).getServices().move(this, up);
+        assert canMove(up);
+        ((Communicator)_parent).getServices().move(this, up);
     }
     
     Editable getEnclosingEditable()
     {
-	return ((Communicator)_parent).getEnclosingEditable();
+        return ((Communicator)_parent).getEnclosingEditable();
     }
 
     static private class Backup
     {
-	java.util.Map parameterValues;
-	ServiceInstance clone;
+        java.util.Map parameterValues;
+        ServiceInstance clone;
     }
 
     public Object rebuild(java.util.List editables) 
-	throws UpdateFailedException
+        throws UpdateFailedException
     {
-	Backup backup = new Backup();
-
-	//
-	// Fix-up _descriptor if necessary
-	//
-	if(_descriptor.template.length() > 0)
-	{
-	    TemplateDescriptor templateDescriptor 
-		= getRoot().findServiceTemplateDescriptor(_descriptor.template);
-
-	    java.util.Set parameters = new java.util.HashSet(templateDescriptor.parameters);
-	    if(!parameters.equals(_descriptor.parameterValues.keySet()))
-	    {
-		backup.parameterValues = _descriptor.parameterValues;
-		_descriptor.parameterValues = Editor.makeParameterValues(
-		    _descriptor.parameterValues, templateDescriptor.parameters);
-		editables.add(getEnclosingEditable());
-	    }
-	}
-
-	Communicator communicator = (Communicator)_parent;
-	Communicator.Services services = communicator.getServices();
-	ServiceInstance newService = null;
-
-	try
-	{
-	    newService = (ServiceInstance)services.createChild(_descriptor);
-	}
-	catch(UpdateFailedException e)
-	{
-	    if(backup.parameterValues != null)
-	    {
-		_descriptor.parameterValues = backup.parameterValues;
-	    }
-	    throw e;
-	}
-
-	try
-	{
-	    backup.clone = (ServiceInstance)clone();
-	}
-	catch(CloneNotSupportedException e)
-	{
-	    assert false;
-	}
-
-	reset(newService);
-
-	if(backup.parameterValues != null)
-	{
-	    editables.add(getEnclosingEditable());
-	}
-	getRoot().getTreeModel().nodeChanged(this);
-	return backup;
+        Backup backup = new Backup();
+
+        //
+        // Fix-up _descriptor if necessary
+        //
+        if(_descriptor.template.length() > 0)
+        {
+            TemplateDescriptor templateDescriptor 
+                = getRoot().findServiceTemplateDescriptor(_descriptor.template);
+
+            java.util.Set parameters = new java.util.HashSet(templateDescriptor.parameters);
+            if(!parameters.equals(_descriptor.parameterValues.keySet()))
+            {
+                backup.parameterValues = _descriptor.parameterValues;
+                _descriptor.parameterValues = Editor.makeParameterValues(
+                    _descriptor.parameterValues, templateDescriptor.parameters);
+                editables.add(getEnclosingEditable());
+            }
+        }
+
+        Communicator communicator = (Communicator)_parent;
+        Communicator.Services services = communicator.getServices();
+        ServiceInstance newService = null;
+
+        try
+        {
+            newService = (ServiceInstance)services.createChild(_descriptor);
+        }
+        catch(UpdateFailedException e)
+        {
+            if(backup.parameterValues != null)
+            {
+                _descriptor.parameterValues = backup.parameterValues;
+            }
+            throw e;
+        }
+
+        try
+        {
+            backup.clone = (ServiceInstance)clone();
+        }
+        catch(CloneNotSupportedException e)
+        {
+            assert false;
+        }
+
+        reset(newService);
+
+        if(backup.parameterValues != null)
+        {
+            editables.add(getEnclosingEditable());
+        }
+        getRoot().getTreeModel().nodeChanged(this);
+        return backup;
     }
 
     public void restore(Object backupObj)
     {
-	Backup backup = (Backup)backupObj;
-
-	if(backup.parameterValues != null)
-	{
-	    _descriptor.parameterValues = backup.parameterValues;
-	}
-	
-	reset(backup.clone);
-	getRoot().getTreeModel().nodeChanged(this);
+        Backup backup = (Backup)backupObj;
+
+        if(backup.parameterValues != null)
+        {
+            _descriptor.parameterValues = backup.parameterValues;
+        }
+        
+        reset(backup.clone);
+        getRoot().getTreeModel().nodeChanged(this);
     }
 
     private void reset(ServiceInstance from)
     {
-	_id = from._id;	
-	_displayString = from._displayString;
-	_resolver = from._resolver;
+        _id = from._id; 
+        _displayString = from._displayString;
+        _resolver = from._resolver;
     }
 
     ServiceInstance(Communicator parent,
-	    String name,
-	    String displayString,
-	    ServiceInstanceDescriptor instanceDescriptor, 
-	    Utils.Resolver resolver)
-	throws UpdateFailedException
+            String name,
+            String displayString,
+            ServiceInstanceDescriptor instanceDescriptor, 
+            Utils.Resolver resolver)
+        throws UpdateFailedException
     {
-	super(parent, name);
-	_displayString = displayString;
-	_descriptor = instanceDescriptor;
-	_ephemeral = false;
-	_resolver = resolver;
+        super(parent, name);
+        _displayString = displayString;
+        _descriptor = instanceDescriptor;
+        _ephemeral = false;
+        _resolver = resolver;
     }
 
     //
     // New temporary object
     //
     ServiceInstance(Communicator parent, String name,
-		    ServiceInstanceDescriptor instanceDescriptor)
+                    ServiceInstanceDescriptor instanceDescriptor)
     {
-	super(parent, name);
-	_descriptor = instanceDescriptor;
-	_ephemeral = true;
+        super(parent, name);
+        _descriptor = instanceDescriptor;
+        _ephemeral = true;
     }
 
     void write(XMLWriter writer) throws java.io.IOException
     {
-	if(!_ephemeral)
-	{
-	    TemplateDescriptor templateDescriptor 
-		= getRoot().findServiceTemplateDescriptor(_descriptor.template);
-
-	    java.util.LinkedList attributes = parameterValuesToAttributes(
-		_descriptor.parameterValues, templateDescriptor.parameters);
-	    attributes.addFirst(createAttribute("template", _descriptor.template));
-	    
-	    if(_descriptor.propertySet.references.length == 0 &&
-	       _descriptor.propertySet.properties.size() == 0)
-	    {
-		writer.writeElement("service-instance", attributes);
-	    }
-	    else
-	    {
-		writer.writeStartTag("service-instance", attributes);
-		writePropertySet(writer, _descriptor.propertySet, null, null);
-		writer.writeEndTag("service-instance");
-	    }
-	}
+        if(!_ephemeral)
+        {
+            TemplateDescriptor templateDescriptor 
+                = getRoot().findServiceTemplateDescriptor(_descriptor.template);
+
+            java.util.LinkedList attributes = parameterValuesToAttributes(
+                _descriptor.parameterValues, templateDescriptor.parameters);
+            attributes.addFirst(createAttribute("template", _descriptor.template));
+            
+            if(_descriptor.propertySet.references.length == 0 &&
+               _descriptor.propertySet.properties.size() == 0)
+            {
+                writer.writeElement("service-instance", attributes);
+            }
+            else
+            {
+                writer.writeStartTag("service-instance", attributes);
+                writePropertySet(writer, _descriptor.propertySet, null, null);
+                writer.writeEndTag("service-instance");
+            }
+        }
     }
 
     Utils.Resolver getResolver()
     {
-	return _resolver;
+        return _resolver;
     }
 
     public boolean isEphemeral()
     {
-	return _ephemeral;
+        return _ephemeral;
     }
 
     private ServiceInstanceDescriptor _descriptor;