[506598] COrrect message definitions 'Name' field to contain the name and not the Id
Change-Id: If179d862d0adaa8dcfda1248984e60b88cf1bf27
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/TableColumn.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/TableColumn.java
index d3b3ad9..7bb94b2 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/TableColumn.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/TableColumn.java
@@ -123,7 +123,13 @@
public String getText(Object element) {
if (element instanceof EObject) {
- return ExtendedPropertiesProvider.getTextValue((EObject)element,feature);
+ String text = "";
+ if (headerText != null && headerText.equals("Name"))
+ text = ExtendedPropertiesProvider.getTextValue((EObject)element);
+ else
+ text = ExtendedPropertiesProvider.getTextValue((EObject)element, feature);
+
+ return text;
}
return element.toString();
}
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmDefinitionsPropertyComposite.java b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmDefinitionsPropertyComposite.java
index f10cebd..273b99a 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmDefinitionsPropertyComposite.java
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmDefinitionsPropertyComposite.java
@@ -73,7 +73,7 @@
@Override
protected Composite bindFeature(EObject object, EStructuralFeature feature, EClass eItemClass) {
- if ("imports".equals(feature.getName())) { //$NON-NLS-1$
+ if ((feature != null) && ("imports".equals(feature.getName()))) { //$NON-NLS-1$
if (object instanceof Definitions) {
Definitions definitions = (Definitions)object;
for (RootElement re : definitions.getRootElements()) {
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/MessagePropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/MessagePropertiesAdapter.java
index 374936b..96aeed2 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/MessagePropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/MessagePropertiesAdapter.java
@@ -39,7 +39,12 @@
setObjectDescriptor(new RootElementObjectDescriptor<Message>(this, object) {
@Override
public String getTextValue() {
- String text = ChoreographyUtil.getMessageName(object);
+ Message message = (Message)object;
+ String text = message.getName();
+
+ if (text == null)
+ text = message.getId();
+
return text;
}
});
