Author: koen.aers(a)jboss.com Date: 2009-10-08 17:03:40 -0400 (Thu, 08 Oct 2009) New Revision: 17989 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/command/ChangeNameCommand.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/properties/NamedElementConfigurationComposite.java Log: JBIDE-4066 and JBIDE-4069 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/command/ChangeNameCommand.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/command/ChangeNameCommand.java 2009-10-08 18:59:41 UTC (rev 17988) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/command/ChangeNameCommand.java 2009-10-08 21:03:40 UTC (rev 17989) @@ -21,7 +21,10 @@ public void execute() { oldName = namedElement.getName(); - namedElement.setName(newName); + if ("".equals(newName) && !namedElement.isNameMandatory()) { + newName = null; + } + namedElement.setName(newName.trim()); } public void undo() { Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/properties/NamedElementConfigurationComposite.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/properties/NamedElementConfigurationComposite.java 2009-10-08 18:59:41 UTC (rev 17988) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/properties/NamedElementConfigurationComposite.java 2009-10-08 21:03:40 UTC (rev 17989) @@ -81,7 +81,7 @@ } private String getNameText() { - String text = nameText.getText(); + String text = nameText.getText().trim(); if ("".equals(text) && !namedElement.isNameMandatory()) { text = null; }