summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-10-23 08:11:13 (EDT)
committerStephan Born2012-10-23 08:11:13 (EDT)
commit01fdbf965347abc547e412de2ae30eeceb642d5c (patch)
tree3429b20322033f76666db99eb4e0f6ecf7046dc8
parenta593954439e86b2a010a03f44e017d2003a68ef1 (diff)
downloadorg.eclipse.stardust.ui.web-01fdbf965347abc547e412de2ae30eeceb642d5c.zip
org.eclipse.stardust.ui.web-01fdbf965347abc547e412de2ae30eeceb642d5c.tar.gz
org.eclipse.stardust.ui.web-01fdbf965347abc547e412de2ae30eeceb642d5c.tar.bz2
CRNT-26529 Pepper: Implement - XPDL reference in case external data gets selected
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60249 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java75
1 files changed, 39 insertions, 36 deletions
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
index 365868a..18b3ef6 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.FeatureMapUtil;
import org.eclipse.stardust.common.CollectionUtils;
import org.eclipse.stardust.common.StringUtils;
-import org.eclipse.stardust.engine.api.model.PredefinedConstants;
import org.eclipse.stardust.engine.api.runtime.DmsUtils;
import org.eclipse.stardust.engine.api.runtime.Document;
import org.eclipse.stardust.engine.api.runtime.DocumentInfo;
@@ -94,9 +93,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
/**
- *
+ *
* @author Marc.Gille
- *
+ *
*/
public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
{
@@ -174,7 +173,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param element
* @param json
*/
@@ -263,7 +262,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param element
* @param json
*/
@@ -400,7 +399,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param element
* @param controlFlowJson
*/
@@ -470,7 +469,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param dataFlowConnection
* @param dataFlowConnectionJson
*/
@@ -571,7 +570,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param activity
* @param data
* @param direction
@@ -597,7 +596,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param element
* @param json
*/
@@ -623,7 +622,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param element
* @param elementJson
*/
@@ -693,7 +692,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param processDefinition
* @param processDefinitionJson
*/
@@ -879,7 +878,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param activitySymbol
* @param activitySymbolJson
*/
@@ -898,7 +897,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param activitySymbol
* @param activitySymbolJson
*/
@@ -1003,7 +1002,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
/**
* Update the x,y co-ordinates of symbols contained in the lane
- *
+ *
* @param laneSymbol
* @param xOffset
* @param yOffset
@@ -1034,7 +1033,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param activitySymbol
* @param gatewaySymbolJson
*/
@@ -1053,7 +1052,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param startEventSymbol
* @param startEventSymbolJson
*/
@@ -1075,7 +1074,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param endEventSymbol
* @param endEventSymbolJson
*/
@@ -1097,7 +1096,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param annotationSymbol
* @param annotationSymbolJson
*/
@@ -1277,7 +1276,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param def
* @param simpleTypeJson
*/
@@ -1330,7 +1329,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param def
* @param json
*/
@@ -1430,7 +1429,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param schema
* @param json
*/
@@ -1466,9 +1465,12 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
if (conditionalPerformerJson.has(ModelerConstants.BINDING_DATA_FULL_ID_PROPERTY))
{
- conditionalPerformer.setData(getModelBuilderFacade().findData(
+ ModelType model = ModelUtils.findContainingModel(conditionalPerformer);
+ DataType data = getModelBuilderFacade().importData(
+ model,
conditionalPerformerJson.get(
- ModelerConstants.BINDING_DATA_FULL_ID_PROPERTY).getAsString()));
+ ModelerConstants.BINDING_DATA_FULL_ID_PROPERTY).getAsString());
+ conditionalPerformer.setData(data);
}
storeAttributes(conditionalPerformer, conditionalPerformerJson);
@@ -1491,9 +1493,10 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
if (organizationJson.has(ModelerConstants.TEAM_LEAD_FULL_ID_PROPERTY))
{
- organization.setTeamLead((RoleType) getModelBuilderFacade().findParticipant(
+ getModelBuilderFacade().updateTeamLead(
+ organization,
organizationJson.get(ModelerConstants.TEAM_LEAD_FULL_ID_PROPERTY)
- .getAsString()));
+ .getAsString());
}
}
@@ -1584,7 +1587,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param element
* @param elementJson
* @param elementProperties
@@ -1602,7 +1605,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param targetElement
* @param request
* @param property
@@ -1672,7 +1675,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param json
* @param element
* @throws JSONException
@@ -1733,7 +1736,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param modelElementJson
* @param element
*/
@@ -1757,7 +1760,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param orientation
* @return
*/
@@ -1784,7 +1787,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @return
*/
private ModelBuilderFacade getModelBuilderFacade()
@@ -1793,7 +1796,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param json
* @param memberName
* @return
@@ -1809,7 +1812,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param dataMappingJson
* @param dataMapping
*/
@@ -1902,7 +1905,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @param elementType
* @return
*/
@@ -1929,7 +1932,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @return
*/
private DocumentManagementService getDocumentManagementService()
@@ -1943,7 +1946,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
}
/**
- *
+ *
* @return
*/
private ServiceFactory getServiceFactory()