summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-12-19 07:55:00 (EST)
committerStephan Born2013-01-25 10:36:52 (EST)
commitf9f131e64213ba12b852caed1059beb3bdcd596e (patch)
tree748879dd8cbb2948adfdd1b4460c12e610537e12
parent0cbfbbfdeedb7ea98eec395aff2357ded0280be1 (diff)
downloadorg.eclipse.stardust.ide-f9f131e64213ba12b852caed1059beb3bdcd596e.zip
org.eclipse.stardust.ide-f9f131e64213ba12b852caed1059beb3bdcd596e.tar.gz
org.eclipse.stardust.ide-f9f131e64213ba12b852caed1059beb3bdcd596e.tar.bz2
CRNT-26209 Pepper: Structure/Document Data: Not able to select structure type from other models
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@61651 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/ModelBuilderFacade.java11
1 files changed, 4 insertions, 7 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 942d290..4364e4d 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
@@ -2923,18 +2923,15 @@ public class ModelBuilderFacade
{
if (modelElement instanceof DataType) {
DataType dataType = (DataType) modelElement;
- if (dataType.getType()
+ if ((dataType.getType() != null) && (dataType.getType()
.getId()
- .equalsIgnoreCase(PredefinedConstants.DOCUMENT_DATA))
+ .equalsIgnoreCase(PredefinedConstants.DOCUMENT_DATA)))
{
return false;
}
- if (dataType.getName().indexOf("Loca") > -1) {
- System.out.println();
- }
- if (dataType.getType()
+ if ((dataType.getType() != null) && (dataType.getType()
.getId()
- .equalsIgnoreCase(PredefinedConstants.STRUCTURED_DATA))
+ .equalsIgnoreCase(PredefinedConstants.STRUCTURED_DATA)))
{
return false;
}