Fixed bug #733: field trimming

9 files changed, 38 insertions, 38 deletions

diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index d26ff266c89..61dc6be6d5d 100755
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -131,7 +131,7 @@ class AdapterEditor extends CommunicatorChildEditor
 		    //

 		    // Recompute default id

 		    //

-		    _defaultAdapterId = getAdapter().getDefaultAdapterId(_name.getText());

+		    _defaultAdapterId = getAdapter().getDefaultAdapterId(_name.getText().trim());

 		    refreshId();

 		}

 	    });

@@ -181,7 +181,7 @@ class AdapterEditor extends CommunicatorChildEditor
     {

 	AdapterDescriptor descriptor = 

 	    (AdapterDescriptor)getAdapter().getDescriptor();

-	descriptor.name = _name.getText();

+	descriptor.name = _name.getText().trim();

 	descriptor.description = _description.getText();

 	descriptor.id = getIdAsString();

 	descriptor.replicaGroupId = getReplicaGroupIdAsString();

@@ -195,7 +195,7 @@ class AdapterEditor extends CommunicatorChildEditor
 	AdapterDescriptor descriptor = 

 	    (AdapterDescriptor)getAdapter().getDescriptor();

 

-	return descriptor.name.equals(_name.getText()); 

+	return descriptor.name.equals(_name.getText().trim()); 

     }

 

     Communicator.ChildList getChildList()

@@ -268,7 +268,7 @@ class AdapterEditor extends CommunicatorChildEditor
 	//

 	// Change enclosing properties after successful update

 	//

-	String name = _name.getText();

+	String name = _name.getText().trim();

 	Adapter adapter = getAdapter();

 	if(!name.equals(_oldName))

 	{

@@ -277,7 +277,7 @@ class AdapterEditor extends CommunicatorChildEditor
 	    _oldName = name;

 	}

 	

-	adapter.setProperty(name, "Endpoints", _endpoints.getText());

+	adapter.setProperty(name, "Endpoints", _endpoints.getText().trim());

 	

 	Object published = _publishedEndpoints.getSelectedItem();

 	if(published == PUBLISH_ACTUAL)

@@ -287,7 +287,7 @@ class AdapterEditor extends CommunicatorChildEditor
 	else

 	{

 	    adapter.setProperty(name, "PublishedEndpoints",

-				published.toString());

+				published.toString().trim());

 

 	}

     }

@@ -325,7 +325,7 @@ class AdapterEditor extends CommunicatorChildEditor
 	}

 	else 

 	{

-	    return obj.toString();

+	    return obj.toString().trim();

 	}

     }

 

@@ -363,7 +363,7 @@ class AdapterEditor extends CommunicatorChildEditor
 	}

 	else

 	{

-	    return obj.toString();

+	    return obj.toString().trim();

 	}

     }

 

@@ -426,7 +426,7 @@ class AdapterEditor extends CommunicatorChildEditor
 			    if(resolver != null)

 			    {

 				String replicaGroupId = 

-				    resolver.substitute(item.toString());

+				    resolver.substitute(item.toString().trim());

 				enabled = (replicaGroups.findChild(replicaGroupId) != null);

 			    }

 			}

diff --git a/java/src/IceGridGUI/Application/ApplicationEditor.java b/java/src/IceGridGUI/Application/ApplicationEditor.java
index 851e5836443..3096bc29783 100755
--- a/java/src/IceGridGUI/Application/ApplicationEditor.java
+++ b/java/src/IceGridGUI/Application/ApplicationEditor.java
@@ -163,13 +163,14 @@ class ApplicationEditor extends Editor
     boolean isSimpleUpdate()

     {

 	ApplicationDescriptor descriptor = (ApplicationDescriptor)_target.getDescriptor();

-	return descriptor.name.equals(_name.getText()) && _variables.get().equals(descriptor.variables);

+	return descriptor.name.equals(_name.getText().trim()) 

+	    && _variables.get().equals(descriptor.variables);

     }

 

     void writeDescriptor()

     {

 	ApplicationDescriptor descriptor = (ApplicationDescriptor)_target.getDescriptor();

-	descriptor.name = _name.getText();

+	descriptor.name = _name.getText().trim();

 	descriptor.variables = _variables.get();

 	descriptor.description = _description.getText();

 

@@ -179,12 +180,11 @@ class ApplicationEditor extends Editor
 	}

 	else

 	{

-	    descriptor.distrib.icepatch = _distrib.getSelectedItem().toString();

+	    descriptor.distrib.icepatch = _distrib.getSelectedItem().toString().trim();

 	}

 	descriptor.distrib.directories = _distribDirs.getList();

     }	    

     

-

     void show(Root root)

     {

 	detectUpdates(false);

diff --git a/java/src/IceGridGUI/Application/DbEnvEditor.java b/java/src/IceGridGUI/Application/DbEnvEditor.java
index 80c9f307677..6f6f69b882b 100755
--- a/java/src/IceGridGUI/Application/DbEnvEditor.java
+++ b/java/src/IceGridGUI/Application/DbEnvEditor.java
@@ -50,7 +50,7 @@ class DbEnvEditor extends CommunicatorChildEditor
     {

 	DbEnvDescriptor descriptor = 

 	    (DbEnvDescriptor)getDbEnv().getDescriptor();

-	descriptor.name = _name.getText();

+	descriptor.name = _name.getText().trim();

 	descriptor.description = _description.getText();

 	descriptor.dbHome = getDbHomeAsString();

 	descriptor.properties = _properties.getProperties();

@@ -60,7 +60,7 @@ class DbEnvEditor extends CommunicatorChildEditor
     {

 	DbEnvDescriptor descriptor = 

 	    (DbEnvDescriptor)getDbEnv().getDescriptor();

-	return descriptor.name.equals(_name.getText()); 

+	return descriptor.name.equals(_name.getText().trim()); 

     }

 

     Communicator.ChildList getChildList()

@@ -175,7 +175,7 @@ class DbEnvEditor extends CommunicatorChildEditor
 	}

 	else

 	{

-	    return obj.toString();

+	    return obj.toString().trim();

 	}

     }

     

diff --git a/java/src/IceGridGUI/Application/NodeEditor.java b/java/src/IceGridGUI/Application/NodeEditor.java
index 74236e9f2da..b85812f439a 100755
--- a/java/src/IceGridGUI/Application/NodeEditor.java
+++ b/java/src/IceGridGUI/Application/NodeEditor.java
@@ -51,7 +51,7 @@ class NodeEditor extends Editor
 		_target.destroy(); // just removes the child

 		try

 		{

-		    nodes.tryAdd(_name.getText(), descriptor);

+		    nodes.tryAdd(_name.getText().trim(), descriptor);

 		}

 		catch(UpdateFailedException e)

 		{

@@ -217,7 +217,7 @@ class NodeEditor extends Editor
 	NodeDescriptor descriptor = (NodeDescriptor)_target.getDescriptor();

 	descriptor.description = _description.getText();

 	descriptor.variables = _variables.get();

-	descriptor.loadFactor = _loadFactor.getText();

+	descriptor.loadFactor = _loadFactor.getText().trim();

     }	    

     

     void show(Node node)

diff --git a/java/src/IceGridGUI/Application/PropertySetEditor.java b/java/src/IceGridGUI/Application/PropertySetEditor.java
index 702a19476d5..f5ef104cffe 100755
--- a/java/src/IceGridGUI/Application/PropertySetEditor.java
+++ b/java/src/IceGridGUI/Application/PropertySetEditor.java
@@ -50,7 +50,7 @@ class PropertySetEditor extends Editor
 		

 		try

 		{

-		    parent.tryAdd(_id.getText(), descriptor);

+		    parent.tryAdd(_id.getText().trim(), descriptor);

 		}

 		catch(UpdateFailedException e)

 		{

diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
index aa684fa3b89..e749f653def 100755
--- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
+++ b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
@@ -222,7 +222,7 @@ class ReplicaGroupEditor extends Editor
 	ReplicaGroupDescriptor descriptor = 

 	    (ReplicaGroupDescriptor)getReplicaGroup().getDescriptor();

 

-	descriptor.id = _id.getText();

+	descriptor.id = _id.getText().trim();

 	descriptor.description = _description.getText();

 	descriptor.objects = AdapterEditor.mapToObjectDescriptorSeq(_objects.get());

 	

@@ -234,18 +234,18 @@ class ReplicaGroupEditor extends Editor
 	else if(loadBalancing == RANDOM)

 	{

 	    descriptor.loadBalancing = new RandomLoadBalancingPolicy(

-		_nReplicas.getText());

+		_nReplicas.getText().trim());

 	}

 	else if(loadBalancing == ROUND_ROBIN)

 	{

 	    descriptor.loadBalancing = new RoundRobinLoadBalancingPolicy(

-		_nReplicas.getText());

+		_nReplicas.getText().trim());

 	}

 	else if(loadBalancing == ADAPTIVE)

 	{

 	    descriptor.loadBalancing = new AdaptiveLoadBalancingPolicy(

-		_nReplicas.getText(), 

-		_loadSample.getSelectedItem().toString());

+		_nReplicas.getText().trim(), 

+		_loadSample.getSelectedItem().toString().trim());

 	}

 	else

 	{

@@ -257,7 +257,7 @@ class ReplicaGroupEditor extends Editor
     {

 	ReplicaGroupDescriptor descriptor = 

 	    (ReplicaGroupDescriptor)getReplicaGroup().getDescriptor();

-	return descriptor.id.equals(_id.getText());

+	return descriptor.id.equals(_id.getText().trim());

     }

 

     protected void appendProperties(DefaultFormBuilder builder)

diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/Application/ServerSubEditor.java
index 4cc28391f3d..d7269156e35 100755
--- a/java/src/IceGridGUI/Application/ServerSubEditor.java
+++ b/java/src/IceGridGUI/Application/ServerSubEditor.java
@@ -203,12 +203,12 @@ class ServerSubEditor extends CommunicatorSubEditor
     void writeDescriptor()

     {

 	ServerDescriptor descriptor = getServerDescriptor();

-	descriptor.id = _id.getText();

-	descriptor.exe = _exe.getText();

-	descriptor.pwd = _pwd.getText();

+	descriptor.id = _id.getText().trim();

+	descriptor.exe = _exe.getText().trim();

+	descriptor.pwd = _pwd.getText().trim();

 

 	descriptor.options = _options.getList();

-	descriptor.user = _user.getText();

+	descriptor.user = _user.getText().trim();

 

 	descriptor.envs = new java.util.LinkedList();

 	java.util.Iterator p = _envs.get().entrySet().iterator();

@@ -219,9 +219,9 @@ class ServerSubEditor extends CommunicatorSubEditor
 				 + "=" + entry.getValue().toString());

 	}

      

-	descriptor.activation = _activation.getSelectedItem().toString();

-	descriptor.activationTimeout = _activationTimeout.getText();

-	descriptor.deactivationTimeout = _deactivationTimeout.getText();

+	descriptor.activation = _activation.getSelectedItem().toString().trim();

+	descriptor.activationTimeout = _activationTimeout.getText().trim();

+	descriptor.deactivationTimeout = _deactivationTimeout.getText().trim();

 

 	descriptor.allocatable = _allocatable.isSelected();

 

@@ -233,7 +233,7 @@ class ServerSubEditor extends CommunicatorSubEditor
 	}

 	else

 	{

-	    descriptor.distrib.icepatch = _distrib.getSelectedItem().toString();

+	    descriptor.distrib.icepatch = _distrib.getSelectedItem().toString().trim();

 	}

 	descriptor.distrib.directories = _distribDirs.getList();

 

@@ -242,7 +242,7 @@ class ServerSubEditor extends CommunicatorSubEditor
     

     boolean isSimpleUpdate()

     {

-	return getServerDescriptor().id.equals(_id.getText()); 

+	return getServerDescriptor().id.equals(_id.getText().trim()); 

     }

 

     void show(boolean isEditable)

diff --git a/java/src/IceGridGUI/Application/ServiceSubEditor.java b/java/src/IceGridGUI/Application/ServiceSubEditor.java
index 9f93298ac40..1a9779e7ba6 100755
--- a/java/src/IceGridGUI/Application/ServiceSubEditor.java
+++ b/java/src/IceGridGUI/Application/ServiceSubEditor.java
@@ -64,14 +64,14 @@ class ServiceSubEditor extends CommunicatorSubEditor
     void writeDescriptor()

     {

 	ServiceDescriptor descriptor = getServiceDescriptor();

-	descriptor.name = _name.getText();

-	descriptor.entry = _entry.getText();

+	descriptor.name = _name.getText().trim();

+	descriptor.entry = _entry.getText().trim();

 	super.writeDescriptor(descriptor);

     }	    

     

     boolean isSimpleUpdate()

     {

-	return getServiceDescriptor().name.equals(_name.getText()); 

+	return getServiceDescriptor().name.equals(_name.getText().trim()); 

     }

 

     void show(boolean isEditable)

diff --git a/java/src/IceGridGUI/Application/TemplateEditor.java b/java/src/IceGridGUI/Application/TemplateEditor.java
index 9c6504a5bc5..fe4a24134df 100755
--- a/java/src/IceGridGUI/Application/TemplateEditor.java
+++ b/java/src/IceGridGUI/Application/TemplateEditor.java
@@ -109,7 +109,7 @@ class TemplateEditor extends Editor
 

 		try

 		{

-		    parent.tryAdd(_template.getText(), descriptor);

+		    parent.tryAdd(_template.getText().trim(), descriptor);

 		}

 		catch(UpdateFailedException e)

 		{