CRNT-26235 Pepper: Further enhancements of ModelBuilder API

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@59254 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 6 insertions, 2 deletions

diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java
index 9964191..8b1b0b7 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java
@@ -322,7 +322,7 @@ public class ModelBuilderFacade
 

       org.eclipse.stardust.model.xpdl.xpdl2.DataTypeType dataTypeType = xpdlFactory

             .createDataTypeType();

-      String typeId = data.getType().getId();

+      String typeId = PredefinedConstants.STRUCTURED_DATA;

 

       parameterType.setDataType(dataTypeType);

       dataTypeType.setCarnotType(typeId);

@@ -353,7 +353,11 @@ public class ModelBuilderFacade
                .createFormalParameterMappingsType();

       }

 

-      parameterMappingsType.setMappedData(parameterType, data);

+      if (data != null)

+      {

+         parameterMappingsType.setMappedData(parameterType, data);

+      }

+

       processInterface.setFormalParameterMappings(parameterMappingsType);

 

       return parameterType;