Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2010-04-21 22:01:50 +0000
committeratikhomirov2010-04-21 22:01:50 +0000
commit2c169c4cd7997528968371714b1f2aa69a2792a9 (patch)
tree510c131d7e1ce62f3ea78195bbd54300740835d7 /plugins/org.eclipse.gmf.graphdef.codegen
parentb07f1dcfdcf2e59509375f8e4499f0e78d8120a2 (diff)
downloadorg.eclipse.gmf-tooling-2c169c4cd7997528968371714b1f2aa69a2792a9.tar.gz
org.eclipse.gmf-tooling-2c169c4cd7997528968371714b1f2aa69a2792a9.tar.xz
org.eclipse.gmf-tooling-2c169c4cd7997528968371714b1f2aa69a2792a9.zip
[142010] Use Draw2D 'native' Polyline and Polygon shapes instead of localCoordinates hack.
Diffstat (limited to 'plugins/org.eclipse.gmf.graphdef.codegen')
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt5
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt32
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt4
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt5
4 files changed, 8 insertions, 38 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt
index c30814eb8..9e6cd7cee 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2010 Borland Software Corporation and others
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,6 @@
*/
«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«REM»Define attributes for Figures (for DecorationFigure subclasses see Decoration.xpt)«ENDREM»
@@ -42,7 +41,7 @@
«ENDDEFINE»
«DEFINE Init(figureVarName : String) FOR gmfgraph::Polyline-»
-«FOREACH template->asSequence() AS pt-»
+«FOREACH template AS pt-»
«figureVarName».addPoint(new org.eclipse.draw2d.geometry.Point(«EXPAND MapMode::_map FOR pt»));
«ENDFOREACH-»
«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt
index 45b38fbc5..7373be5d2 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt
@@ -14,41 +14,13 @@
«EXTENSION Util»
-«DEFINE localCoordinates FOR gmfgraph::RealFigure»
- /**
- * @generated
- */
- private boolean myUseLocalCoordinates = «children[gmfgraph::Polyline]->notEmpty()»;
-
- /**
- * @generated
- */
- protected boolean useLocalCoordinates() {
- return myUseLocalCoordinates;
- }
-
- /**
- * @generated
- */
- protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
- myUseLocalCoordinates = useLocalCoordinates;
- }
-«ENDDEFINE»
-
-«DEFINE localCoordinates FOR gmfgraph::Polyline-»
-«ENDDEFINE»
-
-«DEFINE localCoordinates FOR gmfgraph::Label-»
-«ENDDEFINE»
-
-
-«DEFINE extraMethods FOR gmfgraph::Figure-»
-«ENDDEFINE»
+«DEFINE extraMethods FOR gmfgraph::Figure»«ENDDEFINE»
«DEFINE extraMethods FOR gmfgraph::SVGFigure-»
«EXPAND svgProperty FOREACH properties-»
«ENDDEFINE»
+// XXX move to distinct location (folder)
«DEFINE svgProperty FOR gmfgraph::SVGProperty-»
«IF getter <> null-»
«EXPAND svgPropertyGetter-»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt
index 8615e6fd6..5dd881d85 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt
@@ -56,10 +56,10 @@
«DEFINE fqn FOR gmfgraph::Rectangle»org.eclipse.draw2d.RectangleFigure«ENDDEFINE»
«DEFINE fqn FOR gmfgraph::RoundedRectangle»org.eclipse.draw2d.RoundedRectangle«ENDDEFINE»
«DEFINE fqn FOR gmfgraph::Ellipse»org.eclipse.draw2d.Ellipse«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Polygon»org.eclipse.draw2d.Polygon«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::Polygon»org.eclipse.draw2d.PolygonShape«ENDDEFINE»
«DEFINE fqn FOR gmfgraph::ScalablePolygon»org.eclipse.draw2d.ScalablePolygonShape«ENDDEFINE»
«DEFINE fqn FOR gmfgraph::PolygonDecoration»org.eclipse.draw2d.PolygonDecoration«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Polyline»org.eclipse.draw2d.Polyline«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::Polyline»org.eclipse.draw2d.PolylineShape«ENDDEFINE»
«DEFINE fqn FOR gmfgraph::PolylineDecoration»org.eclipse.draw2d.PolylineDecoration«ENDDEFINE»
«DEFINE fqn FOR gmfgraph::PolylineConnection»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx«ELSE»org.eclipse.draw2d.PolylineConnection«ENDIF»«ENDDEFINE»
«DEFINE fqn FOR gmfgraph::SVGFigure»org.eclipse.gmf.runtime.lite.svg.SVGFigure«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt
index bb92410f4..f8f88d2f4 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007 Borland Software Corporation
+ * Copyright (c) 2006, 2010 Borland Software Corporation and others
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
*/
«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+
«EXTENSION Util»
«DEFINE ClassBody(cuName : String) FOR gmfgraph::Figure»«ERROR 'abstract ClassBody(Figure)'»«ENDDEFINE»
@@ -37,7 +37,6 @@
}
«ENDIF-»
«EXPAND Extras::extraMethods»
-«EXPAND Extras::localCoordinates»
«EXPAND additions-»
«ENDDEFINE»

Back to the top