[527721] Don't show error message for empty string after an Add

1 files changed, 7 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java b/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java
index 7b1b76e25..d27919012 100644
--- a/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java
+++ b/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java
@@ -588,12 +588,16 @@ public class FeatureEditorDialog extends Dialog
           {
             if (activeControl.get() == choiceText)
             {
-              String errorMessage = valueHandler.isValid(choiceText.getText());
-              if (errorMessage == null && unique && children.contains(valueHandler.toValue(choiceText.getText())))
+              String text = choiceText.getText();
+              String errorMessage = valueHandler.isValid(text);
+              if (errorMessage == null && unique && children.contains(valueHandler.toValue(text)))
               {
                 errorMessage = EMFEditUIPlugin.INSTANCE.getString("_UI_DuplicateValue_message");
               }
-              setErrorMessage(errorMessage);
+              if (choiceText.isFocusControl() || !"".equals(text))
+              {
+                setErrorMessage(errorMessage);
+              }
               addButton.setEnabled(errorMessage == null);
             }
           }