Removed pop-up dialogs from Applicatin view

1 files changed, 37 insertions, 145 deletions

diff --git a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
index 11135e3f895..bb0991a26a8 100755
--- a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
+++ b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
@@ -14,7 +14,6 @@ import javax.swing.AbstractAction;
 import javax.swing.Action;

 import javax.swing.JButton;

 import javax.swing.JComboBox;

-import javax.swing.JFrame;

 import javax.swing.JScrollPane;

 import javax.swing.JTextField;

 

@@ -29,10 +28,8 @@ import IceGridGUI.*;
 

 class ServiceInstanceEditor extends CommunicatorChildEditor

 {

-    ServiceInstanceEditor(JFrame parentFrame)

+    ServiceInstanceEditor()

     {

-	_parameterValues.setEditable(false);

-	

 	//

 	// Template

 	//

@@ -52,56 +49,11 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 			      "Goto this service template");

 	_templateButton = new JButton(gotoTemplate);

 

-	//

-	// Parameter values

-	//

-	_parametersDialog = new ParametersDialog(parentFrame, 

-					    "Parameter values",

-					    "Value", false, "Use default");

-	

-	Action openParametersDialog = new AbstractAction("...")

-	    {

-		public void actionPerformed(ActionEvent e) 

-		{

-		    if(_parametersDialog.show(_parameterList, _parameterValuesMap,

-					      getProperties()))

-		    {

-			updated();

-			setParameterValuesField();

-			//

-			// No need to redisplay details: since it's editable,

-			// we're not substituting variables or parameters

-			//

-		    }

-		}

-	    };

-	openParametersDialog.putValue(Action.SHORT_DESCRIPTION,

-				      "Edit parameter values");

-	_parametersButton = new JButton(openParametersDialog);

+	_parameters = new ParametersField(this, "Value", false, "Use default");

 

-	_propertySets.setEditable(false);

+	_propertySets.getDocument().addDocumentListener(_updateListener);

+	_propertySets.setToolTipText("Property Set References");

 	_properties = new PropertiesField(this);

-

-	_propertySetsDialog = new ListDialog(parentFrame, 

-					     "Property Set References", true);

-

-	Action openPropertySetsDialog = new AbstractAction("...")

-	    {

-		public void actionPerformed(ActionEvent e) 

-		{

-		    java.util.LinkedList result = _propertySetsDialog.show(

-			_propertySetsList, getProperties());

-		    if(result != null)

-		    {

-			updated();

-			_propertySetsList = result;

-			setPropertySetsField();

-		    }

-		}

-	    };

-	openPropertySetsDialog.putValue(Action.SHORT_DESCRIPTION,

-					"Edit property set references");

-	_propertySetsButton = new JButton(openPropertySetsDialog);

     }

 

     ServiceInstanceDescriptor getDescriptor()

@@ -129,10 +81,10 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
     {

 	ServiceInstanceDescriptor descriptor = getDescriptor();

 	descriptor.template = ((ServiceTemplate)_template.getSelectedItem()).getId();

-	descriptor.parameterValues = _parameterValuesMap;

+	descriptor.parameterValues = _parameters.get(null);

 

 	descriptor.propertySet.references = 

-	    (String[])_propertySetsList.toArray(new String[0]);

+	    (String[])_propertySets.getList().toArray(new String[0]);

 	descriptor.propertySet.properties = _properties.getProperties();

     }	    

     

@@ -142,7 +94,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 	ServiceTemplate t = (ServiceTemplate)_template.getSelectedItem();

 	

 	return descriptor.template.equals(t.getId())

-	    && descriptor.parameterValues.equals(_parameterValuesMap);

+	    && descriptor.parameterValues.equals(_parameters.get(null));

     }

 

     Communicator.ChildList getChildList()

@@ -156,12 +108,25 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 	builder.append(_templateButton);

 	builder.nextLine();

 	

-	builder.append("Parameter values", _parameterValues);

-	builder.append(_parametersButton);

+	builder.append("Parameters");

+	builder.nextLine();

+	builder.append("");

+	builder.nextLine();

+	builder.append("");

+

+	builder.nextLine();

+	builder.append("");

+

+	builder.nextRow(-6);

+	JScrollPane scrollPane = new JScrollPane(_parameters);

+	CellConstraints cc = new CellConstraints();

+	builder.add(scrollPane, 

+		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));

+	builder.nextRow(6);

 	builder.nextLine();

 	

 	builder.append("Property Sets");

-	builder.append(_propertySets, _propertySetsButton);

+	builder.append(_propertySets, 3);

 	builder.nextLine();

 

 	builder.append("Properties");

@@ -174,8 +139,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 	builder.append("");

 

 	builder.nextRow(-6);

-	JScrollPane scrollPane = new JScrollPane(_properties);

-	CellConstraints cc = new CellConstraints();

+	scrollPane = new JScrollPane(_properties);

 	builder.add(scrollPane, 

 		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));

 	builder.nextRow(6);

@@ -200,11 +164,13 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 	//

 	assert getDescriptor().template.length() > 0;

 

-

 	ServiceInstanceDescriptor descriptor = 

 	    (ServiceInstanceDescriptor)service.getDescriptor();

 	Coordinator coordinator = service.getCoordinator();

 	boolean isEditable = !coordinator.substitute();

+

+	Utils.Resolver resolver = isEditable ? null :

+	    ((TreeNode)service.getParent()).getResolver();

 	

 	//

 	// Need to make control enabled before changing it

@@ -234,10 +200,9 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 		    //

 		    // Replace parameters but keep existing values

 		    //

-		    _parameterList = td.parameters;

-		    _parameterValuesMap = makeParameterValues(_parameterValuesMap, 

-							      _parameterList);

-		    setParameterValuesField();

+		    _parameters.set(td.parameters,

+				    makeParameterValues(_parameters.get(null), td.parameters),

+				    null, true);

 		}

 

 		public void intervalAdded(ListDataEvent e)

@@ -250,17 +215,12 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 	_template.getModel().addListDataListener(templateListener);

 	_template.setEnabled(isEditable);

 	

-	//

-	// The _parameterList is read-only

-	// 

-	_parameterList = ((TemplateDescriptor)t.getDescriptor()).parameters;

-	_parameterValuesMap = new java.util.HashMap(descriptor.parameterValues);

-	setParameterValuesField();

-	_parametersButton.setEnabled(isEditable);

+	_parameters.set(((TemplateDescriptor)t.getDescriptor()).parameters,

+			descriptor.parameterValues, resolver, isEditable);

 	

-	_propertySetsList = java.util.Arrays.asList(descriptor.propertySet.references);

-	setPropertySetsField();

-	_propertySetsButton.setEnabled(isEditable);

+	_propertySets.setList(java.util.Arrays.asList(descriptor.propertySet.references),

+			      getDetailResolver());

+	_propertySets.setEditable(isEditable);

 

 	_properties.setProperties(descriptor.propertySet.properties, null, 

 				  getDetailResolver(), isEditable);

@@ -270,77 +230,9 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 	detectUpdates(true);

     }

 

-    private void setParameterValuesField()

-    {

-	ServiceInstance service = (ServiceInstance)_target;

-

-	final Utils.Resolver resolver = service.getCoordinator().substitute() ? 

-	    ((TreeNode)service.getParent()).getResolver() : null;

-	

-	Ice.StringHolder toolTipHolder = new Ice.StringHolder();

-	Utils.Stringifier stringifier = new Utils.Stringifier()

-	    {

-		public String toString(Object obj)

-		{

-		    String name = (String)obj;

-		    String val = (String)_parameterValuesMap.get(name);

-		    if(val != null)

-		    {

-			return name + "=" + Utils.substitute(val, resolver);

-		    }

-		    else

-		    {

-			return null;

-		    }

-		}

-	    };

-	

-	_parameterValues.setText(

-	    Utils.stringify(_parameterList, stringifier, ", ", toolTipHolder));

-	_parameterValues.setToolTipText(toolTipHolder.value);

-    }

-

-    private void setPropertySetsField()

-    {

-	final Utils.Resolver resolver = getDetailResolver();

-	

-	Ice.StringHolder toolTipHolder = new Ice.StringHolder();

-	Utils.Stringifier stringifier = new Utils.Stringifier()

-	    {

-		public String toString(Object obj)

-		{

-		    return Utils.substitute((String)obj, resolver);

-		}

-	    };

-	

-	_propertySets.setText(

-	    Utils.stringify(_propertySetsList, 

-			    stringifier, ", ", toolTipHolder));

-

-	String toolTip = "<html>Property Sets";

-

-	if(toolTipHolder.value != null)

-	{

-	    toolTip += ":<br>" + toolTipHolder.value;

-	}

-	toolTip += "</html>";

-	_propertySets.setToolTipText(toolTip);

-    }

-

     private JComboBox _template = new JComboBox();

     private JButton _templateButton;

-    private JTextField _parameterValues = new JTextField(20);

-

-    private java.util.List _parameterList;

-    private java.util.Map _parameterValuesMap;

-

-    private ParametersDialog _parametersDialog;

-    private JButton _parametersButton;

-

-    private JTextField _propertySets = new JTextField(20);

-    private java.util.List _propertySetsList;

-    private ListDialog _propertySetsDialog;

-    private JButton _propertySetsButton;

- 

+    private ParametersField _parameters;

+    private ListTextField _propertySets = new ListTextField(20);

     private PropertiesField _properties;

 }