summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-08-17 01:50:26 (EDT)
committer Manik Kishore2012-08-17 01:50:26 (EDT)
commit4e44ca695e77f770207630308a285072fdbecc01 (patch)
treead6b3c1d5f6094d0972777b3421e12349fd5ef04
parentb105a631114d0b16d65bff3071387af6884bafc7 (diff)
downloadorg.eclipse.stardust.ide-4e44ca695e77f770207630308a285072fdbecc01.zip
org.eclipse.stardust.ide-4e44ca695e77f770207630308a285072fdbecc01.tar.gz
org.eclipse.stardust.ide-4e44ca695e77f770207630308a285072fdbecc01.tar.bz2
Jira-ID: CRNT-25692
1)Removed NPE in ModelService.java for Structured Types loading 2)Made Data Id generate using Data name in m_data.js 3)Added check for NPE in MBFacade createFullId git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@58464 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/MBFacade.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/MBFacade.java b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/MBFacade.java
index 5d309fa..08b6c9a 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/MBFacade.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/MBFacade.java
@@ -1535,8 +1535,11 @@ public class MBFacade
public String createFullId(ModelType model, IIdentifiableModelElement modelElement)
{
// TODO Change to {modelId}elementId
-
- return model.getId() + ":" + modelElement.getId();
+ if (null != model && null != modelElement)
+ {
+ return model.getId() + ":" + modelElement.getId();
+ }
+ return null;
}
/**