Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2006-02-13 13:17:57 -0500
committeratikhomirov2006-02-13 13:17:57 -0500
commit396d6d8c12fa1b969bccd87eedc91dc2104e0267 (patch)
tree51990ae7f2e0d9c6015ec214b330d6ad7c37c5ff /plugins
parentf8757a97d7e3a5e73cbc0be2d438e3921bc2a2e8 (diff)
downloadorg.eclipse.gmf-tooling-396d6d8c12fa1b969bccd87eedc91dc2104e0267.tar.gz
org.eclipse.gmf-tooling-396d6d8c12fa1b969bccd87eedc91dc2104e0267.tar.xz
org.eclipse.gmf-tooling-396d6d8c12fa1b969bccd87eedc91dc2104e0267.zip
solve interim issue with figure/figureMarker parents
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java2
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/new/LayoutData.javajet2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java
index 2abce94e3..0ca13bba2 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java
@@ -33,7 +33,7 @@ final Figure figureInstance = argsBundle.getFigure();
// merely makes sure layoutData present
// and parent figure got chance to have layout initialized
-if (gmfLayoutData != null && figureInstance.getParent() != null && figureInstance.getParent().getLayout() != null) {
+if (gmfLayoutData != null && figureInstance.eContainer() instanceof Figure && ((Figure) figureInstance.eContainer()).getLayout() != null) {
stringBuffer.append(TEXT_1);
stringBuffer.append(dispatcher.dispatch(gmfLayoutData, argsBundle));
stringBuffer.append(TEXT_2);
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/new/LayoutData.javajet b/plugins/org.eclipse.gmf.graphdef.codegen/templates/new/LayoutData.javajet
index efe9f349f..b96640d3f 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/new/LayoutData.javajet
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/new/LayoutData.javajet
@@ -11,6 +11,6 @@ final Figure figureInstance = argsBundle.getFigure();
// merely makes sure layoutData present
// and parent figure got chance to have layout initialized
-if (gmfLayoutData != null && figureInstance.getParent() != null && figureInstance.getParent().getLayout() != null) {%>
+if (gmfLayoutData != null && figureInstance.eContainer() instanceof Figure && ((Figure) figureInstance.eContainer()).getLayout() != null) {%>
<%=dispatcher.dispatch(gmfLayoutData, argsBundle)%>
<%}%>

Back to the top