https://bugs.eclipse.org/bugs/show_bug.cgi?id=477003 - UI should use EMF

Enumerator class' getName() instead of literal value for string
externalization

2 files changed, 16 insertions, 3 deletions

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/FeatureDescriptor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/FeatureDescriptor.java
index 98c0bb80..df2d3be3 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/FeatureDescriptor.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/FeatureDescriptor.java
@@ -28,6 +28,7 @@ import org.eclipse.bpmn2.modeler.core.model.ModelDecoratorAdapter;
 import org.eclipse.bpmn2.modeler.core.utils.ErrorUtils;
 import org.eclipse.bpmn2.modeler.core.utils.ModelUtil;
 import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
@@ -266,6 +267,10 @@ public class FeatureDescriptor<T extends EObject> extends ObjectDescriptor<T> {
 				return adapter.getObjectDescriptor().getTextValue();
 			return ModelUtil.toCanonicalString( eObject.eClass().getName() );
 		}
+		else if (value instanceof Enumerator) {
+			Enumerator e = (Enumerator) value;
+			return e.getName();
+		}
 		return value.toString();
 	}
 
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmGatewayPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmGatewayPropertiesAdapter.java
index 1409775b..10c45352 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmGatewayPropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmGatewayPropertiesAdapter.java
@@ -10,14 +10,17 @@
  ******************************************************************************/
 package org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.property.adapters;
 
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.List;
+import java.util.Map.Entry;
 
 import org.eclipse.bpmn2.Bpmn2Package;
 import org.eclipse.bpmn2.Gateway;
+import org.eclipse.bpmn2.GatewayDirection;
 import org.eclipse.bpmn2.modeler.core.adapters.ExtendedPropertiesAdapter;
 import org.eclipse.bpmn2.modeler.core.adapters.FeatureDescriptor;
 import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
 public class JbpmGatewayPropertiesAdapter extends
@@ -35,8 +38,13 @@ public class JbpmGatewayPropertiesAdapter extends
     		@Override
     		public Hashtable<String, Object> getChoiceOfValues() {
     			Hashtable<String, Object> choices = super.getChoiceOfValues();
-    			choices.remove("Unspecified"); //$NON-NLS-1$
-    			choices.remove("Mixed"); //$NON-NLS-1$
+				List<String> keys = new ArrayList<String>();
+				for (Entry<String, Object> entry : choices.entrySet()) {
+					if (entry.getValue() == GatewayDirection.UNSPECIFIED || entry.getValue() == GatewayDirection.MIXED)
+						keys.add(entry.getKey());
+				}
+				for (String key : keys)
+					choices.remove(key);
     			return choices;
     		}
     	});