Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2009-12-15 17:32:40 -0500
committerashatalin2009-12-15 17:32:40 -0500
commit6f6f282ec401034e7e4de7395850d3bf1e605195 (patch)
tree8102e9b4180215417161215bc149a7a63074ff3c
parenta93313a2ed9a897e56fbc68a320bef56f49652d2 (diff)
downloadorg.eclipse.gmf-tooling-6f6f282ec401034e7e4de7395850d3bf1e605195.tar.gz
org.eclipse.gmf-tooling-6f6f282ec401034e7e4de7395850d3bf1e605195.tar.xz
org.eclipse.gmf-tooling-6f6f282ec401034e7e4de7395850d3bf1e605195.zip
[294548] - Adopt GMF (XPand) plugins to OCL 3.0/corresponding QVT
-rw-r--r--plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto2
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
index ceb2c3f21..ac951c7d0 100644
--- a/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
@@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
org.eclipse.gmf.common;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
org.eclipse.gmf.validate;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.gmf.xpand;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.0.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt
index 0acb2f52f..a127ffe81 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt
@@ -393,7 +393,7 @@ new org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolic
'@param nodeShape instance of generated figure class'
protected org.eclipse.draw2d.IFigure setupContentPane(org.eclipse.draw2d.IFigure nodeShape) {
- «IF not childNodes->isEmpty() or (not compartments->isEmpty() or not labels->-((labels)[gmfgen::GenExternalNodeLabel])->isEmpty())-»
+ «IF not childNodes->isEmpty() or (not compartments->isEmpty() or labels[not oclIsKindOf(gmfgen::GenExternalNodeLabel)]->notEmpty())-»
if (nodeShape.getLayoutManager() == null) {
«IF getLayoutType() = gmfgen::ViewmapLayoutType::XY_LAYOUT-»
nodeShape.setLayoutManager(new org.eclipse.draw2d.FreeformLayout() {
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto
index 46a6cfb45..e06a5d345 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto
@@ -27,7 +27,7 @@ helper getSideAffixedChildren(node : genModel::GenNode) : Sequence(genModel::Gen
}
helper getInnerFixedLabels(node : genModel::GenNode) : Sequence(genModel::GenLabel) {
- return node.labels->-((node.labels)[genModel::GenExternalNodeLabel])->select(e | (Sequence { e.oclAsType(genModel::GenLabel).viewmap })[genModel::ParentAssignedViewmap]->size() > 0)->asSequence()
+ return node.labels->asSequence()[not oclIsKindOf(genModel::GenExternalNodeLabel)]->select(e | e.oclAsType(genModel::GenLabel).viewmap.oclIsKindOf(genModel::ParentAssignedViewmap));
}
helper getPinnedCompartments(node : genModel::GenNode) : Sequence(genModel::GenCompartment) {

Back to the top