Trunk:

 - Fixed bug in the java implementation of the bpmn migration function. Defaults values of properties where store in a set where the key was the name of the property. For obvious reason, I added the stencil/propertypackage name as prefix of those keys.

git-svn-id: http://oryx-editor.googlecode.com/svn/branches/prod@3441 d672c736-503d-0410-a38a-9366997c882b

Author: w.tscheschner

editor/server/src/de/hpi/bpmn2_0/migration/BPMN2Migrator.java

@@ -45,6 +45,7 @@ public class BPMN2Migrator {
 
 	private Diagram diagram;
 	private String path;
+	private MigrationHelper helper;
 
 	private HashSet<Shape> activityShapes 					= new HashSet<Shape>();
 	private HashSet<Shape> gatewayShapes  					= new HashSet<Shape>();
@@ -488,9 +489,10 @@ private void migrateActivities() throws BpmnMigrationException {
 	 * @throws MigrationHelperException 
 	 */
 	private void updateProperties(Shape shape) throws MigrationHelperException {
-		MigrationHelper helper = new MigrationHelper(path);
+		if (this.helper == null)
+			this.helper = new MigrationHelper(path);
 
-		HashMap<String, String> properties = helper.getProperties(shape.getStencilId());
+		HashMap<String, String> properties = this.helper.getProperties(shape.getStencilId());
 
 		/* find the properties and add them */
 		for(String property : properties.keySet()) {

editor/server/src/de/hpi/bpmn2_0/migration/MigrationHelper.java

@@ -231,12 +231,12 @@ public HashMap<String, String> getProperties(String key) {
 			for(String propertyPackage : propertyPackages) 
 				if(this.propertiesForPackage.containsKey(propertyPackage)) 
 					for(String property : this.propertiesForPackage.get(propertyPackage)) 
-						properties.put(property, this.defaultsForProperty.get(property));
+						properties.put(property, this.defaultsForProperty.get(propertyPackage + property));
 
 		/* find all properties that are declared at the stencil */
 		if(this.propertiesForStencil.containsKey(key)) 
 			for(String property : this.propertiesForStencil.get(key)) 
-				properties.put(property, this.defaultsForProperty.get(property));
+				properties.put(property, this.defaultsForProperty.get(key + property));
 
 		return properties;
 	}
@@ -273,7 +273,7 @@ private void parseStencils(JSONArray stencils) throws JSONException {
 
 						properties.add(currentProperty.getString("id"));
 
-						this.setDefinitionsForProperty(currentProperty);
+						this.setDefinitionsForProperty(currentStencil.getString("id"), currentProperty);
 					}
 
 				this.propertiesForStencil.put(currentStencil.getString("id"), properties);
@@ -303,7 +303,7 @@ private void parsePropertyPackages(JSONArray propertyPackages) throws JSONExcept
 
 					propertyIds.add(currentProperty.getString("id"));
 
-					this.setDefinitionsForProperty(currentProperty);
+					this.setDefinitionsForProperty(packageName, currentProperty);
 				}
 
 				this.propertiesForPackage.put(packageName, propertyIds);
@@ -314,10 +314,11 @@ private void parsePropertyPackages(JSONArray propertyPackages) throws JSONExcept
 	/**
 	 * Associates the properties with their types and initial values
 	 * 
+	 * @param prefix
 	 * @param property
 	 * @throws JSONException
 	 */
-	private void setDefinitionsForProperty(JSONObject property) throws JSONException {
+	private void setDefinitionsForProperty(String prefix, JSONObject property) throws JSONException {
 		String id   = property.getString("id");			
 		String type = property.getString("type");
 
@@ -329,6 +330,6 @@ private void setDefinitionsForProperty(JSONObject property) throws JSONException
 			value = property.optString("value");
 
 		if(!this.defaultsForProperty.containsKey(id))
-			this.defaultsForProperty.put(id, value.toString());
+			this.defaultsForProperty.put(prefix+id, value.toString());
 	}
 }