Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskovalsky2013-11-22 10:05:19 -0500
committerskovalsky2013-11-22 10:06:19 -0500
commit47fdd3cd9aff4a04edda5eced7e0b76ed3ff5e44 (patch)
tree33604c54a36005d8eba91994169b59dd7d25ba98
parent3dc7af81b5f518274f15581dcb20a165ed9009e2 (diff)
downloadorg.eclipse.gmf-tooling-402747-gerrit.tar.gz
org.eclipse.gmf-tooling-402747-gerrit.tar.xz
org.eclipse.gmf-tooling-402747-gerrit.zip
[402747] - restructured in compartmentEP getTargetEP method402747-gerrit
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend9
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt9
2 files changed, 4 insertions, 14 deletions
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend
index d39bc264f..c06300066 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend
@@ -144,14 +144,9 @@ import org.eclipse.gmf.codegen.xtend.annotations.Localization import xpt.provide
return this;
}
«ENDFOR»
- «IF listCompartmentHasChildren(it)»
+ «IF !listCompartmentHasChildren(it)»return getParent().getTargetEditPart(request);«ENDIF»
}
- return getParent().getTargetEditPart(request);
- «ELSE»
- return getParent().getTargetEditPart(request);
- }
- return super.getTargetEditPart(request);
- «ENDIF»
+ return «IF listCompartmentHasChildren(it)»getParent()«ELSE»super«ENDIF».getTargetEditPart(request);
}
'''
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt
index 8b24f11ce..ed3d04fbd 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt
@@ -122,14 +122,9 @@
return this;
}
«ENDFOREACH-»
- «IF listCompartmentHasChildren(self)-»
+ «IF not listCompartmentHasChildren(self)»return getParent().getTargetEditPart(request);«ENDIF-»
}
- return getParent().getTargetEditPart(request);
- «ELSE-»
- return getParent().getTargetEditPart(request);
- }
- return super.getTargetEditPart(request);
- «ENDIF-»
+ return «IF listCompartmentHasChildren(self)»getParent()«ELSE»super«ENDIF».getTargetEditPart(request);
}
«ENDDEFINE»

Back to the top