1 files changed, 182 insertions, 182 deletions

diff --git a/java/src/IceGridGUI/Application/NodeEditor.java b/java/src/IceGridGUI/Application/NodeEditor.java
index 78ecd6392b3..b8ca49a9302 100755
--- a/java/src/IceGridGUI/Application/NodeEditor.java
+++ b/java/src/IceGridGUI/Application/NodeEditor.java
@@ -32,232 +32,232 @@ class NodeEditor extends Editor
 {
     protected void buildPropertiesPanel()
     {
-	super.buildPropertiesPanel();
-	_propertiesPanel.setName("Node Properties");
+        super.buildPropertiesPanel();
+        _propertiesPanel.setName("Node Properties");
     }
 
     protected boolean applyUpdate(boolean refresh)
     {
-	Root root = _target.getRoot();
+        Root root = _target.getRoot();
 
-	root.disableSelectionListener();
-	try
-	{
-	    if(_target.isEphemeral())
-	    {
-		Nodes nodes = (Nodes)_target.getParent();
-		writeDescriptor();
-		NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();
-		_target.destroy(); // just removes the child
-		try
-		{
-		    nodes.tryAdd(_name.getText().trim(), descriptor);
-		}
-		catch(UpdateFailedException e)
-		{
-		    //
-		    // Add back ephemeral child
-		    //
-		    try
-		    {
-			nodes.insertChild(_target, true);
-		    }
-		    catch(UpdateFailedException die)
-		    {
-			assert false;
-		    }
-		    root.setSelectedNode(_target);
+        root.disableSelectionListener();
+        try
+        {
+            if(_target.isEphemeral())
+            {
+                Nodes nodes = (Nodes)_target.getParent();
+                writeDescriptor();
+                NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();
+                _target.destroy(); // just removes the child
+                try
+                {
+                    nodes.tryAdd(_name.getText().trim(), descriptor);
+                }
+                catch(UpdateFailedException e)
+                {
+                    //
+                    // Add back ephemeral child
+                    //
+                    try
+                    {
+                        nodes.insertChild(_target, true);
+                    }
+                    catch(UpdateFailedException die)
+                    {
+                        assert false;
+                    }
+                    root.setSelectedNode(_target);
 
-		    JOptionPane.showMessageDialog(
-			root.getCoordinator().getMainFrame(),
-			e.toString(),
-			"Apply failed",
-			JOptionPane.ERROR_MESSAGE);
-		    return false;
-		}
-		
-		//
-		// Success
-		//
-		_target = nodes.findChildWithDescriptor(descriptor);
-		root.updated();
-		if(refresh)
-		{
-		    root.setSelectedNode(_target);
-		}
-	    }
-	    else if(isSimpleUpdate())
-	    {
-		writeDescriptor();
-		root.updated();
-		((Node)_target).getEditable().markModified();
-	    }
-	    else
-	    {
-		//
-		// Save to be able to rollback
-		//
-		NodeDescriptor savedDescriptor = ((Node)_target).saveDescriptor();
-		writeDescriptor();
-	
-		//
-		// Rebuild node; don't need the backup
-		// since it's just one node
-		//
-		java.util.List editables = new java.util.LinkedList();
-			
-		try
-		{
-		    ((Node)_target).rebuild(editables);
-		}
-		catch(UpdateFailedException e)
-		{
-		    ((Node)_target).restoreDescriptor(savedDescriptor);
-		    JOptionPane.showMessageDialog(
-			root.getCoordinator().getMainFrame(),
-			e.toString(),
-			"Apply failed",
-			JOptionPane.ERROR_MESSAGE);
-		    return false;
-		}
-		
-		java.util.Iterator p = editables.iterator();
-		while(p.hasNext())
-		{
-		    Editable editable = (Editable)p.next();
-		    editable.markModified();
-		}
+                    JOptionPane.showMessageDialog(
+                        root.getCoordinator().getMainFrame(),
+                        e.toString(),
+                        "Apply failed",
+                        JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+                
+                //
+                // Success
+                //
+                _target = nodes.findChildWithDescriptor(descriptor);
+                root.updated();
+                if(refresh)
+                {
+                    root.setSelectedNode(_target);
+                }
+            }
+            else if(isSimpleUpdate())
+            {
+                writeDescriptor();
+                root.updated();
+                ((Node)_target).getEditable().markModified();
+            }
+            else
+            {
+                //
+                // Save to be able to rollback
+                //
+                NodeDescriptor savedDescriptor = ((Node)_target).saveDescriptor();
+                writeDescriptor();
+        
+                //
+                // Rebuild node; don't need the backup
+                // since it's just one node
+                //
+                java.util.List editables = new java.util.LinkedList();
+                        
+                try
+                {
+                    ((Node)_target).rebuild(editables);
+                }
+                catch(UpdateFailedException e)
+                {
+                    ((Node)_target).restoreDescriptor(savedDescriptor);
+                    JOptionPane.showMessageDialog(
+                        root.getCoordinator().getMainFrame(),
+                        e.toString(),
+                        "Apply failed",
+                        JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+                
+                java.util.Iterator p = editables.iterator();
+                while(p.hasNext())
+                {
+                    Editable editable = (Editable)p.next();
+                    editable.markModified();
+                }
 
-		((Node)_target).getEditable().markModified();
-		root.updated();
-	    }
+                ((Node)_target).getEditable().markModified();
+                root.updated();
+            }
 
-	    if(refresh)
-	    {
-		root.getCoordinator().getCurrentTab().showNode(_target);
-	    }
-	    _applyButton.setEnabled(false);
-	    _discardButton.setEnabled(false);
-	    return true;
-	}
-	finally
-	{
-	    root.enableSelectionListener();
-	}	    
+            if(refresh)
+            {
+                root.getCoordinator().getCurrentTab().showNode(_target);
+            }
+            _applyButton.setEnabled(false);
+            _discardButton.setEnabled(false);
+            return true;
+        }
+        finally
+        {
+            root.enableSelectionListener();
+        }           
     }
 
     Utils.Resolver getDetailResolver()
     {
-	if(_target.getCoordinator().substitute())
-	{
-	    return _target.getResolver();
-	}
-	else
-	{
-	    return null;
-	}
+        if(_target.getCoordinator().substitute())
+        {
+            return _target.getResolver();
+        }
+        else
+        {
+            return null;
+        }
     }
 
     NodeEditor()
     {
-	_name.getDocument().addDocumentListener(_updateListener);
-	_name.setToolTipText("Must match the IceGrid.Node.Name property of the desired icegridnode process");
-	_description.getDocument().addDocumentListener(_updateListener);
-	_description.setToolTipText("An optional description for this node");
-	
-	//
-	// Variables
-	//
-	_variables = new MapField(this, "Name", "Value", false);
+        _name.getDocument().addDocumentListener(_updateListener);
+        _name.setToolTipText("Must match the IceGrid.Node.Name property of the desired icegridnode process");
+        _description.getDocument().addDocumentListener(_updateListener);
+        _description.setToolTipText("An optional description for this node");
+        
+        //
+        // Variables
+        //
+        _variables = new MapField(this, "Name", "Value", false);
 
-	_loadFactor.getDocument().addDocumentListener(_updateListener);
-	_loadFactor.setToolTipText("<html>A floating point value.<br>"
-				   + "When not specified, IceGrid uses 1.0 on all platforms<br>"
-				   + "except Windows where it uses 1.0 divided by <i>number of processors</i>.<html>");
+        _loadFactor.getDocument().addDocumentListener(_updateListener);
+        _loadFactor.setToolTipText("<html>A floating point value.<br>"
+                                   + "When not specified, IceGrid uses 1.0 on all platforms<br>"
+                                   + "except Windows where it uses 1.0 divided by <i>number of processors</i>.<html>");
     }
 
     protected void appendProperties(DefaultFormBuilder builder)
     {    
-	builder.append("Name");
-	builder.append(_name, 3);
-	builder.nextLine();
+        builder.append("Name");
+        builder.append(_name, 3);
+        builder.nextLine();
 
-	builder.append("Description");
-	builder.nextLine();
-	builder.append("");
-	builder.nextRow(-2);
-	CellConstraints cc = new CellConstraints();
-	JScrollPane scrollPane = new JScrollPane(_description);
-	builder.add(scrollPane, 
-		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 3));
-	builder.nextRow(2);
-	builder.nextLine();
+        builder.append("Description");
+        builder.nextLine();
+        builder.append("");
+        builder.nextRow(-2);
+        CellConstraints cc = new CellConstraints();
+        JScrollPane scrollPane = new JScrollPane(_description);
+        builder.add(scrollPane, 
+                    cc.xywh(builder.getColumn(), builder.getRow(), 3, 3));
+        builder.nextRow(2);
+        builder.nextLine();
 
-	builder.append("Variables");
-	builder.nextLine();
-	builder.append("");
-	builder.nextLine();
-	builder.append("");
-	builder.nextLine();
-	builder.append("");
-	builder.nextRow(-6);
-	scrollPane = new JScrollPane(_variables);
-	builder.add(scrollPane, 
-		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
-	builder.nextRow(6);
-	builder.nextLine();
+        builder.append("Variables");
+        builder.nextLine();
+        builder.append("");
+        builder.nextLine();
+        builder.append("");
+        builder.nextLine();
+        builder.append("");
+        builder.nextRow(-6);
+        scrollPane = new JScrollPane(_variables);
+        builder.add(scrollPane, 
+                    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
+        builder.nextRow(6);
+        builder.nextLine();
 
-	builder.append("Load Factor");
-	builder.append(_loadFactor, 3);
-	builder.nextLine();
+        builder.append("Load Factor");
+        builder.append(_loadFactor, 3);
+        builder.nextLine();
     }
     
     boolean isSimpleUpdate()
     {
-	NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();
-	return (_variables.get().equals(descriptor.variables));
+        NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();
+        return (_variables.get().equals(descriptor.variables));
     }
 
     void writeDescriptor()
     {
-	NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();
-	descriptor.description = _description.getText();
-	descriptor.variables = _variables.get();
-	descriptor.loadFactor = _loadFactor.getText().trim();
-    }	    
+        NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();
+        descriptor.description = _description.getText();
+        descriptor.variables = _variables.get();
+        descriptor.loadFactor = _loadFactor.getText().trim();
+    }       
     
     protected boolean validate()
     {
-	return check(new String[]{"Name", _name.getText().trim()});
+        return check(new String[]{"Name", _name.getText().trim()});
     }
 
     void show(Node node)
     {
-	detectUpdates(false);
-	_target = node;
-	
-	Utils.Resolver resolver = getDetailResolver();
-	boolean isEditable = (resolver == null);
+        detectUpdates(false);
+        _target = node;
+        
+        Utils.Resolver resolver = getDetailResolver();
+        boolean isEditable = (resolver == null);
 
-	_name.setText(_target.getId());
-	_name.setEditable(_target.isEphemeral());
-	
-	NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();
+        _name.setText(_target.getId());
+        _name.setEditable(_target.isEphemeral());
+        
+        NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();
 
-	_description.setText(
-	    Utils.substitute(descriptor.description, resolver));
-	_description.setEditable(isEditable);
-	_description.setOpaque(isEditable);
+        _description.setText(
+            Utils.substitute(descriptor.description, resolver));
+        _description.setEditable(isEditable);
+        _description.setOpaque(isEditable);
 
-	_variables.set(descriptor.variables, resolver, isEditable);
+        _variables.set(descriptor.variables, resolver, isEditable);
 
-	_loadFactor.setText(
-	    Utils.substitute(descriptor.loadFactor, resolver));
-	_loadFactor.setEditable(isEditable);
+        _loadFactor.setText(
+            Utils.substitute(descriptor.loadFactor, resolver));
+        _loadFactor.setEditable(isEditable);
 
-	_applyButton.setEnabled(node.isEphemeral());
-	_discardButton.setEnabled(node.isEphemeral());
-	detectUpdates(true);
+        _applyButton.setEnabled(node.isEphemeral());
+        _discardButton.setEnabled(node.isEphemeral());
+        detectUpdates(true);
     }
 
     private JTextField _name = new JTextField(20);