Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-01-20 05:27:35 -0500
committermgolubev2012-01-20 05:48:26 -0500
commit7b3926f2a8de3931bf9211c7d76dccab282476ca (patch)
tree89cb88fbae6cdf760984776320daaed10e3d6e48
parent69b7d96c9baedc8cc02f74bd6184ce5bae32a36d (diff)
downloadorg.eclipse.gmf-tooling-7b3926f2a8de3931bf9211c7d76dccab282476ca.tar.gz
org.eclipse.gmf-tooling-7b3926f2a8de3931bf9211c7d76dccab282476ca.tar.xz
org.eclipse.gmf-tooling-7b3926f2a8de3931bf9211c7d76dccab282476ca.zip
[369192] - Codegen of navigator fails if node has no model facet
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt10
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
index 542479ed3..89600f9a3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
@@ -246,7 +246,11 @@ private String «EXPAND getTextMethodName»(org.eclipse.gmf.runtime.notation.Vie
«DEFINE getText FOR gmfgen::GenNode-»
«IF labels->isEmpty()-»
- «EXPAND getLabelFeatureText(modelFacet.metaClass)-»
+ «IF null <> modelFacet-»
+ «EXPAND getLabelFeatureText(modelFacet.metaClass)-»
+ «ELSE-»
+ «EXPAND returnEmptyString-»
+ «ENDIF-»
«ELSE-»
«EXPAND getDiagramLabelText(labels->asSequence())-»
«ENDIF-»
@@ -255,8 +259,8 @@ private String «EXPAND getTextMethodName»(org.eclipse.gmf.runtime.notation.Vie
«DEFINE getText FOR gmfgen::GenLink-»
«IF labels->isEmpty()-»
«IF null <> modelFacet-»
- «EXPAND getText(modelFacet)-»
-«ELSE-»
+ «EXPAND getText(modelFacet)-»
+ «ELSE-»
«EXPAND returnEmptyString-»
«ENDIF-»
«ELSE-»

Back to the top