summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-10-15 09:53:41 (EDT)
committer Manik Kishore2012-10-15 09:53:41 (EDT)
commitfc056a126bcddaf8894e8f7e449f2cf3462aa33d (patch)
treef982697f41917ca581828cc863e6224b119e4a7c
parent719e1c0b52ac4e9223b7b142e37a38593bf62acb (diff)
downloadorg.eclipse.stardust.ui.web-fc056a126bcddaf8894e8f7e449f2cf3462aa33d.zip
org.eclipse.stardust.ui.web-fc056a126bcddaf8894e8f7e449f2cf3462aa33d.tar.gz
org.eclipse.stardust.ui.web-fc056a126bcddaf8894e8f7e449f2cf3462aa33d.tar.bz2
CRNT-26527 Pepper: Implement Filter to hide external model elements in the outline
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60047 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java16
1 files changed, 12 insertions, 4 deletions
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
index 8f1c4e1..76771fb 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
@@ -942,10 +942,6 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
if (null != data)
{
- if (data.getId().startsWith("Primit"))
- {
- System.out.println();
- }
dataJson.addProperty(ModelerConstants.TYPE_PROPERTY, "data");
dataJson.addProperty(ModelerConstants.ID_PROPERTY, data.getId());
dataJson.addProperty(ModelerConstants.NAME_PROPERTY, data.getName());
@@ -960,6 +956,9 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
loadDescription(dataJson, data);
loadAttributes(data, dataJson);
+ dataJson.addProperty(ModelerConstants.EXTERNAL_REFERENCE_PROPERTY, this
+ .getModelBuilderFacade().isExternalReference(data));
+
if (null != data.getType()
&& data.getType()
.getId()
@@ -1137,6 +1136,9 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
roleJson.addProperty(ModelerConstants.MODEL_ID_PROPERTY, model.getId());
}
+ roleJson.addProperty(ModelerConstants.EXTERNAL_REFERENCE_PROPERTY, this
+ .getModelBuilderFacade().isExternalReference(role));
+
loadDescription(roleJson, role);
loadAttributes(role, roleJson);
@@ -1189,6 +1191,9 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
model.getId());
}
+ conditionalPerformerJson.addProperty(ModelerConstants.EXTERNAL_REFERENCE_PROPERTY,
+ this.getModelBuilderFacade().isExternalReference(conditionalPerformer));
+
loadDescription(conditionalPerformerJson, conditionalPerformer);
loadAttributes(conditionalPerformer, conditionalPerformerJson);
@@ -1237,6 +1242,9 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
orgJson.addProperty(ModelerConstants.TEAM_LEAD_FULL_ID_PROPERTY, (String) null);
}
+ orgJson.addProperty(ModelerConstants.EXTERNAL_REFERENCE_PROPERTY, this
+ .getModelBuilderFacade().isExternalReference(org));
+
loadDescription(orgJson, org);
loadAttributes(org, orgJson);