Expanded tabs into spaces

1 files changed, 177 insertions, 177 deletions

diff --git a/java/src/IceGridGUI/Application/ApplicationEditor.java b/java/src/IceGridGUI/Application/ApplicationEditor.java
index 6a7c9858767..006cbad1270 100755
--- a/java/src/IceGridGUI/Application/ApplicationEditor.java
+++ b/java/src/IceGridGUI/Application/ApplicationEditor.java
@@ -30,231 +30,231 @@ class ApplicationEditor extends Editor
 {
     protected boolean applyUpdate(boolean refresh)
     {
-	Root root = (Root)_target;
-	MainPane mainPane = _target.getCoordinator().getMainPane();
+        Root root = (Root)_target;
+        MainPane mainPane = _target.getCoordinator().getMainPane();
 
-	root.disableSelectionListener();
-	try
-	{
-	    if(isSimpleUpdate())
-	    {
-		writeDescriptor();
-		root.updated();
-		root.getEditable().markModified();
-	    }
-	    else
-	    {
-		//
-		// Save to be able to rollback
-		//
-		ApplicationDescriptor savedDescriptor = root.saveDescriptor();
-		writeDescriptor();
-		try
-		{
-		    root.rebuild();
-		}
-		catch(UpdateFailedException e)
-		{
-		    root.restoreDescriptor(savedDescriptor);
-		    JOptionPane.showMessageDialog(
-			root.getCoordinator().getMainFrame(),
-			e.toString(),
-			"Apply failed",
-			JOptionPane.ERROR_MESSAGE);
-		    return false;
-		}
-		//
-		// Success
-		//
-		root.updated();
-		root.getEditable().markModified();
-		
-		if(!savedDescriptor.name.equals(root.getId()))
-		{
-		    mainPane.resetTitle(root);
-		    root.getTreeModel().nodeChanged(root);
-		}
-	    }
-	      
-	    _applyButton.setEnabled(false);
-	    _discardButton.setEnabled(false);
-	    return true;
-	}
-	finally
-	{
-	    root.enableSelectionListener();
-	}
+        root.disableSelectionListener();
+        try
+        {
+            if(isSimpleUpdate())
+            {
+                writeDescriptor();
+                root.updated();
+                root.getEditable().markModified();
+            }
+            else
+            {
+                //
+                // Save to be able to rollback
+                //
+                ApplicationDescriptor savedDescriptor = root.saveDescriptor();
+                writeDescriptor();
+                try
+                {
+                    root.rebuild();
+                }
+                catch(UpdateFailedException e)
+                {
+                    root.restoreDescriptor(savedDescriptor);
+                    JOptionPane.showMessageDialog(
+                        root.getCoordinator().getMainFrame(),
+                        e.toString(),
+                        "Apply failed",
+                        JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+                //
+                // Success
+                //
+                root.updated();
+                root.getEditable().markModified();
+                
+                if(!savedDescriptor.name.equals(root.getId()))
+                {
+                    mainPane.resetTitle(root);
+                    root.getTreeModel().nodeChanged(root);
+                }
+            }
+              
+            _applyButton.setEnabled(false);
+            _discardButton.setEnabled(false);
+            return true;
+        }
+        finally
+        {
+            root.enableSelectionListener();
+        }
     }
 
     ApplicationEditor()
     {
-	_name.getDocument().addDocumentListener(_updateListener);
-	_description.getDocument().addDocumentListener(_updateListener);
-	
-	//
-	// Variables
-	//
-	_variables = new MapField(this, "Name", "Value", false);
+        _name.getDocument().addDocumentListener(_updateListener);
+        _description.getDocument().addDocumentListener(_updateListener);
+        
+        //
+        // Variables
+        //
+        _variables = new MapField(this, "Name", "Value", false);
 
-	//
-	// Distrib
-	//
-	_distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB});
-	_distrib.setEditable(true);
-	_distrib.setToolTipText("The proxy to the IcePatch2 server holding your files");
+        //
+        // Distrib
+        //
+        _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB});
+        _distrib.setEditable(true);
+        _distrib.setToolTipText("The proxy to the IcePatch2 server holding your files");
 
-	JTextField distribTextField = (JTextField)
-	    _distrib.getEditor().getEditorComponent();
-	distribTextField.getDocument().addDocumentListener(
-	    _updateListener);
+        JTextField distribTextField = (JTextField)
+            _distrib.getEditor().getEditorComponent();
+        distribTextField.getDocument().addDocumentListener(
+            _updateListener);
 
-	_distribDirs.getDocument().addDocumentListener(_updateListener);
-	_distribDirs.setToolTipText(
-	    "<html>Include only these directories when patching.<br>"
-	    + "Use whitespace as separator; use double-quotes around directories containing whitespaces</html>");
+        _distribDirs.getDocument().addDocumentListener(_updateListener);
+        _distribDirs.setToolTipText(
+            "<html>Include only these directories when patching.<br>"
+            + "Use whitespace as separator; use double-quotes around directories containing whitespaces</html>");
 
     }
  
     protected void appendProperties(DefaultFormBuilder builder)
     {    
-	builder.append("Name");
-	builder.append(_name, 3);
+        builder.append("Name");
+        builder.append(_name, 3);
 
-	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();
 
-	JComponent c = builder.appendSeparator("Distribution");
-	c.setToolTipText("Files shared by all servers in your application");
-	builder.append("IcePatch2 Proxy");
-	builder.append(_distrib, 3);
-	builder.nextLine();
-	builder.append("Directories");
-	builder.append(_distribDirs, 3);
-	builder.nextLine();
+        JComponent c = builder.appendSeparator("Distribution");
+        c.setToolTipText("Files shared by all servers in your application");
+        builder.append("IcePatch2 Proxy");
+        builder.append(_distrib, 3);
+        builder.nextLine();
+        builder.append("Directories");
+        builder.append(_distribDirs, 3);
+        builder.nextLine();
     }
     
     protected void buildPropertiesPanel()
     {
-	super.buildPropertiesPanel();
-	_propertiesPanel.setName("Application Properties");
+        super.buildPropertiesPanel();
+        _propertiesPanel.setName("Application Properties");
     }
 
     boolean isSimpleUpdate()
     {
-	ApplicationDescriptor descriptor = (ApplicationDescriptor)_target.getDescriptor();
-	return descriptor.name.equals(_name.getText().trim()) 
-	    && _variables.get().equals(descriptor.variables);
+        ApplicationDescriptor descriptor = (ApplicationDescriptor)_target.getDescriptor();
+        return descriptor.name.equals(_name.getText().trim()) 
+            && _variables.get().equals(descriptor.variables);
     }
 
     void writeDescriptor()
     {
-	ApplicationDescriptor descriptor = (ApplicationDescriptor)_target.getDescriptor();
-	descriptor.name = _name.getText().trim();
-	descriptor.variables = _variables.get();
-	descriptor.description = _description.getText();
+        ApplicationDescriptor descriptor = (ApplicationDescriptor)_target.getDescriptor();
+        descriptor.name = _name.getText().trim();
+        descriptor.variables = _variables.get();
+        descriptor.description = _description.getText();
 
-	if(_distrib.getSelectedItem() == NO_DISTRIB)
-	{
-	    descriptor.distrib.icepatch = "";
-	}
-	else
-	{
-	    descriptor.distrib.icepatch = _distrib.getSelectedItem().toString().trim();
-	}
-	descriptor.distrib.directories = _distribDirs.getList();
-    }	    
+        if(_distrib.getSelectedItem() == NO_DISTRIB)
+        {
+            descriptor.distrib.icepatch = "";
+        }
+        else
+        {
+            descriptor.distrib.icepatch = _distrib.getSelectedItem().toString().trim();
+        }
+        descriptor.distrib.directories = _distribDirs.getList();
+    }       
     
     protected boolean validate()
     {
-	return check(new String[]{"Name", _name.getText().trim()});
+        return check(new String[]{"Name", _name.getText().trim()});
     }
 
     void show(Root root)
     {
-	detectUpdates(false);
-	_target = root;
-	
-	Utils.Resolver resolver = getDetailResolver();
-	boolean isEditable = (resolver == null);
+        detectUpdates(false);
+        _target = root;
+        
+        Utils.Resolver resolver = getDetailResolver();
+        boolean isEditable = (resolver == null);
 
-	ApplicationDescriptor descriptor = 
-	    (ApplicationDescriptor)root.getDescriptor();
+        ApplicationDescriptor descriptor = 
+            (ApplicationDescriptor)root.getDescriptor();
 
-	_name.setText(descriptor.name);
-	_name.setEditable(!root.isLive() && isEditable);
+        _name.setText(descriptor.name);
+        _name.setEditable(!root.isLive() && isEditable);
 
-	_description.setText(
-	    Utils.substitute(descriptor.description, resolver));
-	_description.setEditable(isEditable);
-	_description.setOpaque(isEditable);
-	_description.setToolTipText("An optional description for this application");
-	
-	_variables.set(descriptor.variables, resolver, isEditable);
-	
-	_distrib.setEnabled(true);
-	_distrib.setEditable(true);
-	String icepatch = 
-	    Utils.substitute(descriptor.distrib.icepatch, resolver);
-	if(icepatch.equals(""))
-	{
-	    _distrib.setSelectedItem(NO_DISTRIB);
-	}
-	else
-	{
-	    _distrib.setSelectedItem(icepatch);
-	}
-	_distrib.setEnabled(isEditable);
-	_distrib.setEditable(isEditable);
+        _description.setText(
+            Utils.substitute(descriptor.description, resolver));
+        _description.setEditable(isEditable);
+        _description.setOpaque(isEditable);
+        _description.setToolTipText("An optional description for this application");
+        
+        _variables.set(descriptor.variables, resolver, isEditable);
+        
+        _distrib.setEnabled(true);
+        _distrib.setEditable(true);
+        String icepatch = 
+            Utils.substitute(descriptor.distrib.icepatch, resolver);
+        if(icepatch.equals(""))
+        {
+            _distrib.setSelectedItem(NO_DISTRIB);
+        }
+        else
+        {
+            _distrib.setSelectedItem(icepatch);
+        }
+        _distrib.setEnabled(isEditable);
+        _distrib.setEditable(isEditable);
 
-	_distribDirs.setList(descriptor.distrib.directories, resolver);
-	_distribDirs.setEditable(isEditable);
+        _distribDirs.setList(descriptor.distrib.directories, resolver);
+        _distribDirs.setEditable(isEditable);
 
-	_applyButton.setEnabled(false);
-	_discardButton.setEnabled(false);	  
-	detectUpdates(true);
+        _applyButton.setEnabled(false);
+        _discardButton.setEnabled(false);         
+        detectUpdates(true);
     }
     
     Utils.Resolver getDetailResolver()
     {
-	if(_target.getCoordinator().substitute())
-	{
-	    return _target.getResolver();
-	}
-	else
-	{
-	    return null;
-	}
+        if(_target.getCoordinator().substitute())
+        {
+            return _target.getResolver();
+        }
+        else
+        {
+            return null;
+        }
     }
 
     static private final Object NO_DISTRIB = new Object()
-	{
-	    public String toString()
-	    {
-		return "None selected";
-	    }
-	};
+        {
+            public String toString()
+            {
+                return "None selected";
+            }
+        };
     static private final String DEFAULT_DISTRIB = "${application}.IcePatch2/server";
 
     private JTextField _name = new JTextField(20);