Fix descriptions for diagrams - they were being loaded too early,

resulting in "Diagram type not defined" as description text.

3 files changed, 15 insertions, 2 deletions

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/ExtendedPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/ExtendedPropertiesAdapter.java
index bbbb00de..65288083 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/ExtendedPropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/ExtendedPropertiesAdapter.java
@@ -498,6 +498,10 @@ public class ExtendedPropertiesAdapter<T extends EObject> extends ObjectProperty
 		return false;
 	}
 
+	public String getDescription(EObject object) {
+		return getDescription(adapterFactory,object);
+	}
+
 	/**
 	 * Get the verbose description for a given object. If the object is a
 	 * {@code org.eclipse.bpmn2.di.BPMNDiagram} instance, the DiagramType name
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
index 74380e51..413d20ef 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
@@ -435,6 +435,15 @@ public class Bpmn2ModelerResourceImpl extends Bpmn2ResourceImpl {
             		importHandler.addImportObjects(imp, importObject);
             	}
             }
+			
+			// Fix up the descriptions for BPMNDiagrams
+			for (BPMNDiagram d : definitions.getDiagrams()) {
+	            // Set the diagram's description AFTER it has been completely populated
+				ExtendedPropertiesAdapter epa = ExtendedPropertiesAdapter.adapt(d);
+				if (epa!=null) {
+					epa.setProperty(ExtendedPropertiesAdapter.LONG_DESCRIPTION, epa.getDescription(d));
+				}
+			}
 			Bpmn2ModelerFactory.setEnableModelExtensions(true);
 		}
 
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
index 6635df3d..690f6524 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
@@ -104,12 +104,12 @@ Bpmn2PropertyPage_HomePage_Description=Project specific settings for the BPMN2 M
 #
 # Long descriptions of BPMN2 elements
 UI_UnknownDiagram_description = The Diagram Type has not yet been defined.
-UI_Process_description = A Process Diagram describes a sequence or flow of Activities in an organization with the objective of carrying out work. \
+UI_Process_description = A Process describes a sequence or flow of Activities in an organization with the objective of carrying out work. \
  A Process is depicted as a graph of Flow Elements, which are a set of Activities, Events, Gateways, and \
  Sequence Flows that define finite execution semantics. Processes can be defined at any level from \
  enterprise-wide Processes to Processes performed by a single person. Low-level Processes can be grouped \
  together to achieve a common business goal.
-UI_Choreography_description = A Choreography Diagram formalizes the way business \
+UI_Choreography_description = A Choreography formalizes the way business \
  Participants coordinate their interactions. The focus is not on orchestrations of the work performed within these \
  Participants, but rather on the exchange of information (Messages) between these Participants.
 UI_Collaboration_description = A Collaboration usually contains two or more Pools, representing the Participants in the Collaboration. \