Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2009-03-19 12:42:59 +0000
committeratikhomirov2009-03-19 12:42:59 +0000
commit43847e20d3d99006e1255f472996b0fc946a8954 (patch)
tree1ef0d8d3a08dddeaa7de72d17db5d20b8a495054 /plugins/org.eclipse.gmf.graphdef.codegen
parent765bf546b4b448aad5b24067ef1cb1e79c979156 (diff)
downloadorg.eclipse.gmf-tooling-43847e20d3d99006e1255f472996b0fc946a8954.tar.gz
org.eclipse.gmf-tooling-43847e20d3d99006e1255f472996b0fc946a8954.tar.xz
org.eclipse.gmf-tooling-43847e20d3d99006e1255f472996b0fc946a8954.zip
[191653] Char encoding for xpand templates should be UTF-8. Converted GMF templates to use UTF-8
Diffstat (limited to 'plugins/org.eclipse.gmf.graphdef.codegen')
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs4
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt96
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Border.xpt62
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Children.xpt68
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Decoration.xpt38
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt106
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Layout.xpt140
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/LayoutData.xpt86
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/MapMode.xpt36
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt86
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/CustomClass.xpt48
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Decoration.xpt70
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Figure.xpt130
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt86
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Activator.xpt32
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt6
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Manifest.xpt36
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt10
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt44
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Descriptor.xpt80
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt92
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt10
22 files changed, 683 insertions, 683 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs
index fa4b7714b..ec7f7d671 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Mon Mar 16 19:22:30 CET 2009
+#Wed Mar 18 18:08:15 CET 2009
eclipse.preferences.version=1
-encoding/templates=ISO-8859-1
+encoding/templates=UTF-8
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt
index 0abaebdb9..c30814eb8 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,59 +10,59 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«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»
+«REM»Define attributes for Figures (for DecorationFigure subclasses see Decoration.xpt)«ENDREM»
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Figure»
-«REM»Polymorphic entry point for any Figure's subclass attributes«ENDREM»
-«EXPAND attr::Figure::figureAttrs(figureVarName)»
-«ENDDEFINE»
+«DEFINE Init(figureVarName : String) FOR gmfgraph::Figure»
+«REM»Polymorphic entry point for any Figure's subclass attributes«ENDREM»
+«EXPAND attr::Figure::figureAttrs(figureVarName)»
+«ENDDEFINE»
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Shape-»
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
+«DEFINE Init(figureVarName : String) FOR gmfgraph::Shape-»
+«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
+«EXPAND attr::Figure::figureAttrs(figureVarName)-»
+«ENDDEFINE»
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Label-»
-«figureVarName».setText("«text»");
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
+«DEFINE Init(figureVarName : String) FOR gmfgraph::Label-»
+«figureVarName».setText("«text»");
+«EXPAND attr::Figure::figureAttrs(figureVarName)-»
+«ENDDEFINE»
-«DEFINE Init(figureVarName : String) FOR gmfgraph::RoundedRectangle-»
-«figureVarName».setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map FOR cornerWidth», «EXPAND MapMode::_map FOR cornerHeight»));
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
+«DEFINE Init(figureVarName : String) FOR gmfgraph::RoundedRectangle-»
+«figureVarName».setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map FOR cornerWidth», «EXPAND MapMode::_map FOR cornerHeight»));
+«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
+«EXPAND attr::Figure::figureAttrs(figureVarName)-»
+«ENDDEFINE»
-«DEFINE Init(figureVarName : String) FOR gmfgraph::CustomFigure-»
-«EXPAND attr::CustomClass::Init(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
+«DEFINE Init(figureVarName : String) FOR gmfgraph::CustomFigure-»
+«EXPAND attr::CustomClass::Init(figureVarName)-»
+«EXPAND attr::Figure::figureAttrs(figureVarName)-»
+«ENDDEFINE»
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Polyline-»
-«FOREACH template->asSequence() AS pt-»
-«figureVarName».addPoint(new org.eclipse.draw2d.geometry.Point(«EXPAND MapMode::_map FOR pt»));
-«ENDFOREACH-»
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
+«DEFINE Init(figureVarName : String) FOR gmfgraph::Polyline-»
+«FOREACH template->asSequence() AS pt-»
+«figureVarName».addPoint(new org.eclipse.draw2d.geometry.Point(«EXPAND MapMode::_map FOR pt»));
+«ENDFOREACH-»
+«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
+«EXPAND attr::Figure::figureAttrs(figureVarName)-»
+«ENDDEFINE»
-«DEFINE Init(figureVarName : String) FOR gmfgraph::SVGFigure-»
-«figureVarName».setURI("«documentURI»");
-«IF noCanvasWidth-»
-«figureVarName».setSpecifyCanvasWidth(false);
-«ENDIF-»
-«IF noCanvasHeight-»
-«figureVarName».setSpecifyCanvasHeight(false);
-«ENDIF-»
-«IF areaOfInterest <> null-»
-«figureVarName».setAreaOfInterest(«EXPAND Instance FOR areaOfInterest»);
-«ENDIF-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
+«DEFINE Init(figureVarName : String) FOR gmfgraph::SVGFigure-»
+«figureVarName».setURI("«documentURI»");
+«IF noCanvasWidth-»
+«figureVarName».setSpecifyCanvasWidth(false);
+«ENDIF-»
+«IF noCanvasHeight-»
+«figureVarName».setSpecifyCanvasHeight(false);
+«ENDIF-»
+«IF areaOfInterest <> null-»
+«figureVarName».setAreaOfInterest(«EXPAND Instance FOR areaOfInterest»);
+«ENDIF-»
+«EXPAND attr::Figure::figureAttrs(figureVarName)-»
+«ENDDEFINE»
-«DEFINE Instance FOR gmfgraph::Rectangle2D-»
-new java.awt.geom.Rectangle2D.Float(«x»f, «y»f, «width»f, «height»f)
-«ENDDEFINE»
+«DEFINE Instance FOR gmfgraph::Rectangle2D-»
+new java.awt.geom.Rectangle2D.Float(«x»f, «y»f, «width»f, «height»f)
+«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Border.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Border.xpt
index 5261b3d93..873134f94 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Border.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Border.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006, 2008 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,47 +10,47 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Border-»
-«figureVarName».setBorder(«EXPAND border(figureVarName)»);
-«ENDDEFINE»
+«DEFINE Init(figureVarName : String) FOR gmfgraph::Border-»
+«figureVarName».setBorder(«EXPAND border(figureVarName)»);
+«ENDDEFINE»
-«DEFINE InitMethods FOR gmfgraph::Figure»
-«FOREACH getBordersInUse() AS b»«EXPAND initMethod((getBordersInUse()->indexOf(b) - 1)) FOR b»«ENDFOREACH-»
-«ENDDEFINE»
+«DEFINE InitMethods FOR gmfgraph::Figure»
+«FOREACH getBordersInUse() AS b»«EXPAND initMethod((getBordersInUse()->indexOf(b) - 1)) FOR b»«ENDFOREACH-»
+«ENDDEFINE»
-«DEFINE initMethod(c : Integer) FOR gmfgraph::CustomBorder-»
+«DEFINE initMethod(c : Integer) FOR gmfgraph::CustomBorder-»
/**
* @generated
*/
- private org.eclipse.draw2d.Border createBorder«c»() {
- «EXPAND Runtime::newInstance('result')»
- «EXPAND attr::CustomClass::Init('result')»
+ private org.eclipse.draw2d.Border createBorder«c»() {
+ «EXPAND Runtime::newInstance('result')»
+ «EXPAND attr::CustomClass::Init('result')»
return result;
}
-«ENDDEFINE»
+«ENDDEFINE»
-«DEFINE border(figureVarName : String) FOR gmfgraph::Border»
-«ERROR 'This is an abstract definition border(String, Border) invoked for ' + self.repr()»
-«ENDDEFINE»
+«DEFINE border(figureVarName : String) FOR gmfgraph::Border»
+«ERROR 'This is an abstract definition border(String, Border) invoked for ' + self.repr()»
+«ENDDEFINE»
-«DEFINE border(figureVarName : String) FOR gmfgraph::LineBorder-»
-new org.eclipse.draw2d.LineBorder(«IF null = color»null«ELSE»«EXPAND attr::Figure::color(figureVarName.toUpper() + '_BORDER') FOR color»«ENDIF», «EXPAND MapMode::_map FOR width»)«ENDDEFINE»
+«DEFINE border(figureVarName : String) FOR gmfgraph::LineBorder-»
+new org.eclipse.draw2d.LineBorder(«IF null = color»null«ELSE»«EXPAND attr::Figure::color(figureVarName.toUpper() + '_BORDER') FOR color»«ENDIF», «EXPAND MapMode::_map FOR width»)«ENDDEFINE»
-«DEFINE border(figureVarName : String) FOR gmfgraph::MarginBorder-»
-new org.eclipse.draw2d.MarginBorder(«EXPAND MapMode::_map FOR insets»)«ENDDEFINE»
+«DEFINE border(figureVarName : String) FOR gmfgraph::MarginBorder-»
+new org.eclipse.draw2d.MarginBorder(«EXPAND MapMode::_map FOR insets»)«ENDDEFINE»
-«DEFINE border(figureVarName : String) FOR gmfgraph::CompoundBorder-»
-new org.eclipse.draw2d.CompoundBorder(«IF outer = null»null«ELSE»«EXPAND border(figureVarName) FOR outer»«ENDIF», «IF inner = null»null«ELSE»«EXPAND border(figureVarName) FOR inner»«ENDIF»)
-«ENDDEFINE»
+«DEFINE border(figureVarName : String) FOR gmfgraph::CompoundBorder-»
+new org.eclipse.draw2d.CompoundBorder(«IF outer = null»null«ELSE»«EXPAND border(figureVarName) FOR outer»«ENDIF», «IF inner = null»null«ELSE»«EXPAND border(figureVarName) FOR inner»«ENDIF»)
+«ENDDEFINE»
-«DEFINE border(figureVarName : String) FOR gmfgraph::CustomBorder-»
-createBorder«getBordersInUse()->size()»()«addBorder(self)-»
-«ENDDEFINE»
+«DEFINE border(figureVarName : String) FOR gmfgraph::CustomBorder-»
+createBorder«getBordersInUse()->size()»()«addBorder(self)-»
+«ENDDEFINE»
-«DEFINE border(figureVarName : String) FOR gmfgraph::BorderRef-»
-«EXPAND border(figureVarName) FOR actual-»
-«ENDDEFINE» \ No newline at end of file
+«DEFINE border(figureVarName : String) FOR gmfgraph::BorderRef-»
+«EXPAND border(figureVarName) FOR actual-»
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Children.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Children.xpt
index 4cc59d94c..593de4454 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Children.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Children.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006, 2007 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,49 +10,49 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
-«DEFINE CreateChildren FOR gmfgraph::RealFigure-»
+«DEFINE CreateChildren FOR gmfgraph::RealFigure-»
/**
* @generated
*/
private void createContents(){
-«EXPAND instantiate(0, self, 'this') FOREACH children»
+«EXPAND instantiate(0, self, 'this') FOREACH children»
}
-«ENDDEFINE»
+«ENDDEFINE»
-«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::Figure»
-«ERROR 'Abstract instantiate(int, RealFigure, String)'»
-«ENDDEFINE»
+«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::Figure»
+«ERROR 'Abstract instantiate(int, RealFigure, String)'»
+«ENDDEFINE»
-«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::FigureRef-»
+«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::FigureRef-»
/*FIXME referenced figures are just not yet fully-functional; need process attrs and layout here*/
-«EXPAND instantiate(count, parentFigure, parentFigureVariable) FOR figure-»
-«ENDDEFINE»
+«EXPAND instantiate(count, parentFigure, parentFigureVariable) FOR figure-»
+«ENDDEFINE»
-«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::RealFigure»
-«LET figureVariableName(self, count) AS figureVarName»
-«EXPAND newFigureInstance(figureVarName)»
-«EXPAND Attrs::Init(figureVarName)-»
-«IF null = layoutData or null = parentFigure.layout-»«REM»Check for (parentLayout != null) to avoid generating data that won't be used. Not sure it's essential, but it was that way with old jet templates«ENDREM»
-«parentFigureVariable».add(«figureVarName»);
-«ELSE-»
-«EXPAND LayoutData::Init(parentFigureVariable, figureVarName) FOR layoutData-»
-«ENDIF-»
-«EXPAND Layout::Init(figureVarName) FOR layout-»
-«EXPAND instantiate(count + 1, self, figureVarName) FOREACH children-»
-«ENDLET»
-«ENDDEFINE»
+«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::RealFigure»
+«LET figureVariableName(self, count) AS figureVarName»
+«EXPAND newFigureInstance(figureVarName)»
+«EXPAND Attrs::Init(figureVarName)-»
+«IF null = layoutData or null = parentFigure.layout-»«REM»Check for (parentLayout != null) to avoid generating data that won't be used. Not sure it's essential, but it was that way with old jet templates«ENDREM»
+«parentFigureVariable».add(«figureVarName»);
+«ELSE-»
+«EXPAND LayoutData::Init(parentFigureVariable, figureVarName) FOR layoutData-»
+«ENDIF-»
+«EXPAND Layout::Init(figureVarName) FOR layout-»
+«EXPAND instantiate(count + 1, self, figureVarName) FOREACH children-»
+«ENDLET»
+«ENDDEFINE»
-«DEFINE newFigureInstance(figureVarName : String) FOR gmfgraph::RealFigure»«IF needsField(self)»«figureVarName» = «EXPAND Runtime::newInstance»;«ELSE»«EXPAND Runtime::newInstance(figureVarName)»«ENDIF»«ENDDEFINE»
+«DEFINE newFigureInstance(figureVarName : String) FOR gmfgraph::RealFigure»«IF needsField(self)»«figureVarName» = «EXPAND Runtime::newInstance»;«ELSE»«EXPAND Runtime::newInstance(figureVarName)»«ENDIF»«ENDDEFINE»
-«DEFINE newFigureInstance(figureVarName : String) FOR gmfgraph::ScalablePolygon-»
-«LET figureVarName.firstToUpper() + 'Class' AS localClassName-»
-class «localClassName» extends «EXPAND Runtime::fqn» {
-«EXPAND xtras::ScalablePolygon::behaviour-»
+«DEFINE newFigureInstance(figureVarName : String) FOR gmfgraph::ScalablePolygon-»
+«LET figureVarName.firstToUpper() + 'Class' AS localClassName-»
+class «localClassName» extends «EXPAND Runtime::fqn» {
+«EXPAND xtras::ScalablePolygon::behaviour-»
};
-«IF not needsField(self)»«localClassName» «ENDIF»«figureVarName» = new «localClassName»();
-«ENDLET-»
-«ENDDEFINE»
+«IF not needsField(self)»«localClassName» «ENDIF»«figureVarName» = new «localClassName»();
+«ENDLET-»
+«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Decoration.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Decoration.xpt
index 47331504f..8d8cfd05c 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Decoration.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Decoration.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006, 2007 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,25 +10,25 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
-«REM»Instantiate and define attributes for DecorationFigures«ENDREM»
+«REM»Instantiate and define attributes for DecorationFigures«ENDREM»
-«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::DecorationFigure-»
-«EXPAND Runtime::newInstance(figureVarName)»
-«EXPAND Attrs::Init(figureVarName)»
-«ENDDEFINE»
+«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::DecorationFigure-»
+«EXPAND Runtime::newInstance(figureVarName)»
+«EXPAND Attrs::Init(figureVarName)»
+«ENDDEFINE»
-«REM»Guess, can't delegate to attrs through Attrs::Init because there's already Init for Polyline«ENDREM»
-«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
-«EXPAND Runtime::newInstance(figureVarName)»
-«EXPAND attr::Decoration::polylineAttrs(figureVarName)-»
-«ENDDEFINE»
+«REM»Guess, can't delegate to attrs through Attrs::Init because there's already Init for Polyline«ENDREM»
+«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
+«EXPAND Runtime::newInstance(figureVarName)»
+«EXPAND attr::Decoration::polylineAttrs(figureVarName)-»
+«ENDDEFINE»
-«REM»Copy of above template for PolylineDecoration, just because PolygonDecoration doesn't extend PolylineDecoration in draw2d and gmfgraph«ENDREM»
-«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
-«EXPAND Runtime::newInstance(figureVarName)»
-«EXPAND attr::Decoration::polylineAttrs(figureVarName)-»
-«ENDDEFINE» \ No newline at end of file
+«REM»Copy of above template for PolylineDecoration, just because PolygonDecoration doesn't extend PolylineDecoration in draw2d and gmfgraph«ENDREM»
+«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
+«EXPAND Runtime::newInstance(figureVarName)»
+«EXPAND attr::Decoration::polylineAttrs(figureVarName)-»
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt
index 5c2806e7f..f41bf965f 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,15 +10,15 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
-«DEFINE localCoordinates FOR gmfgraph::RealFigure»
+«DEFINE localCoordinates FOR gmfgraph::RealFigure»
/**
* @generated
*/
- private boolean myUseLocalCoordinates = «not (children)[gmfgraph::Polyline]->isEmpty()»;
+ private boolean myUseLocalCoordinates = «not (children)[gmfgraph::Polyline]->isEmpty()»;
/**
* @generated
@@ -33,79 +33,79 @@
protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
myUseLocalCoordinates = useLocalCoordinates;
}
-«ENDDEFINE»
+«ENDDEFINE»
-«DEFINE localCoordinates FOR gmfgraph::Polyline-»
-«ENDDEFINE»
+«DEFINE localCoordinates FOR gmfgraph::Polyline-»
+«ENDDEFINE»
-«DEFINE localCoordinates FOR gmfgraph::Label-»
-«ENDDEFINE»
+«DEFINE localCoordinates FOR gmfgraph::Label-»
+«ENDDEFINE»
-«DEFINE extraMethods FOR gmfgraph::Figure-»
-«ENDDEFINE»
+«DEFINE extraMethods FOR gmfgraph::Figure-»
+«ENDDEFINE»
-«DEFINE extraMethods FOR gmfgraph::ScalablePolygon-»
-«EXPAND xtras::ScalablePolygon::behaviour-»
-«ENDDEFINE»
+«DEFINE extraMethods FOR gmfgraph::ScalablePolygon-»
+«EXPAND xtras::ScalablePolygon::behaviour-»
+«ENDDEFINE»
-«DEFINE extraMethods FOR gmfgraph::SVGFigure-»
-«EXPAND svgProperty FOREACH properties-»
-«ENDDEFINE»
+«DEFINE extraMethods FOR gmfgraph::SVGFigure-»
+«EXPAND svgProperty FOREACH properties-»
+«ENDDEFINE»
-«DEFINE svgProperty FOR gmfgraph::SVGProperty-»
-«IF getter <> null-»
- «EXPAND svgPropertyGetter-»
-«ENDIF-»
-«IF setter <> null-»
- «EXPAND svgPropertySetter-»
-«ENDIF-»
-«ENDDEFINE»
+«DEFINE svgProperty FOR gmfgraph::SVGProperty-»
+«IF getter <> null-»
+ «EXPAND svgPropertyGetter-»
+«ENDIF-»
+«IF setter <> null-»
+ «EXPAND svgPropertySetter-»
+«ENDIF-»
+«ENDDEFINE»
-«DEFINE svgPropertyGetter FOR gmfgraph::SVGProperty-»
+«DEFINE svgPropertyGetter FOR gmfgraph::SVGProperty-»
/**
* @generated
*/
- public «svgPropertyType(self)» «getter»() {
- org.w3c.dom.NodeList nodes = getNodes("«_query»"); //$NON-NLS-1$
+ public «svgPropertyType(self)» «getter»() {
+ org.w3c.dom.NodeList nodes = getNodes("«_query»"); //$NON-NLS-1$
if (nodes.getLength() > 0) {
org.w3c.dom.Element element = (org.w3c.dom.Element) nodes.item(0);
- «IF type = gmfgraph::SVGPropertyType::COLOR-»
- return getColor(element, "«attribute»"); //$NON-NLS-1$
- «ELSEIF type = gmfgraph::SVGPropertyType::FLOAT-»
- String value = element.getAttributeNS(null, "«attribute»"); //$NON-NLS-1$
+ «IF type = gmfgraph::SVGPropertyType::COLOR-»
+ return getColor(element, "«attribute»"); //$NON-NLS-1$
+ «ELSEIF type = gmfgraph::SVGPropertyType::FLOAT-»
+ String value = element.getAttributeNS(null, "«attribute»"); //$NON-NLS-1$
return Float.parseFloat(value);
- «ELSE-»
- return element.getAttributeNS(null, "«attribute»"); //$NON-NLS-1$
- «ENDIF-»
+ «ELSE-»
+ return element.getAttributeNS(null, "«attribute»"); //$NON-NLS-1$
+ «ENDIF-»
}
- «IF type = gmfgraph::SVGPropertyType::FLOAT-»
+ «IF type = gmfgraph::SVGPropertyType::FLOAT-»
return 0;
- «ELSE-»
+ «ELSE-»
return null;
- «ENDIF-»
+ «ENDIF-»
}
-«ENDDEFINE»
+«ENDDEFINE»
-«DEFINE svgPropertySetter FOR gmfgraph::SVGProperty-»
+«DEFINE svgPropertySetter FOR gmfgraph::SVGProperty-»
/**
* @generated
*/
- public void «setter»(«svgPropertyType(self)» value) {
- «IF type = gmfgraph::SVGPropertyType::COLOR-»
+ public void «setter»(«svgPropertyType(self)» value) {
+ «IF type = gmfgraph::SVGPropertyType::COLOR-»
String svalue = org.eclipse.gmf.runtime.lite.svg.SVGUtils.toSVGColor(getDocument(), value);
- «ELSEIF type = gmfgraph::SVGPropertyType::FLOAT-»
+ «ELSEIF type = gmfgraph::SVGPropertyType::FLOAT-»
String svalue = Float.toString(value);
- «ENDIF-»
- org.w3c.dom.NodeList nodes = getNodes("«_query»"); //$NON-NLS-1$
+ «ENDIF-»
+ org.w3c.dom.NodeList nodes = getNodes("«_query»"); //$NON-NLS-1$
for (int i = 0; i < nodes.getLength(); i++) {
- ((org.w3c.dom.Element) nodes.item(i)).setAttributeNS(null, "«attribute»", //$NON-NLS-1$
- «IF type = gmfgraph::SVGPropertyType::STRING»value«ELSE»svalue«ENDIF»);
+ ((org.w3c.dom.Element) nodes.item(i)).setAttributeNS(null, "«attribute»", //$NON-NLS-1$
+ «IF type = gmfgraph::SVGPropertyType::STRING»value«ELSE»svalue«ENDIF»);
}
- «IF callSuper-»
- super.«setter»(value);
- «ENDIF-»
+ «IF callSuper-»
+ super.«setter»(value);
+ «ENDIF-»
}
-«ENDDEFINE»
+«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Layout.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Layout.xpt
index f3ac3a956..5ce2f4caf 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Layout.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Layout.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006, 2008 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -11,82 +11,82 @@
* Michael Golubev (Borland) - GridLayout attributes
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::Layout-»
-«owningFigureVariable».setLayoutManager(«EXPAND Runtime::newInstance»);
-«ENDDEFINE»
+«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::Layout-»
+«owningFigureVariable».setLayoutManager(«EXPAND Runtime::newInstance»);
+«ENDDEFINE»
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::LayoutRef-»
-«EXPAND Init(owningFigureVariable) FOR actual-»
-«ENDDEFINE»
+«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::LayoutRef-»
+«EXPAND Init(owningFigureVariable) FOR actual-»
+«ENDDEFINE»
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::BorderLayout-»
-«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
- «EXPAND Runtime::newInstance(layoutVarName)»
-«IF null <> spacing-»
- «layoutVarName».setHorizontalSpacing(«spacing.dx»);// TODO mapMode?
- «layoutVarName».setVerticalSpacing(«spacing.dy»);
-«ENDIF-»
- «owningFigureVariable».setLayoutManager(«layoutVarName»);
-«ENDLET»
-«ENDDEFINE»
+«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::BorderLayout-»
+«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
+ «EXPAND Runtime::newInstance(layoutVarName)»
+«IF null <> spacing-»
+ «layoutVarName».setHorizontalSpacing(«spacing.dx»);// TODO mapMode?
+ «layoutVarName».setVerticalSpacing(«spacing.dy»);
+«ENDIF-»
+ «owningFigureVariable».setLayoutManager(«layoutVarName»);
+«ENDLET»
+«ENDDEFINE»
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::GridLayout-»
-«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
- «EXPAND Runtime::newInstance(layoutVarName)»
- «layoutVarName».numColumns = «numColumns»;
- «layoutVarName».makeColumnsEqualWidth = «equalWidth»;
-«IF null <> spacing-»
- «layoutVarName».horizontalSpacing = «spacing.dx»;
- «layoutVarName».verticalSpacing = «spacing.dy»;
-«ENDIF-»
-«IF null <> margins-»
- «layoutVarName».marginWidth = «margins.dx»;
- «layoutVarName».marginHeight = «margins.dy»;
-«ENDIF-»
- «owningFigureVariable».setLayoutManager(«layoutVarName»);
-«ENDLET»
-«ENDDEFINE»
+«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::GridLayout-»
+«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
+ «EXPAND Runtime::newInstance(layoutVarName)»
+ «layoutVarName».numColumns = «numColumns»;
+ «layoutVarName».makeColumnsEqualWidth = «equalWidth»;
+«IF null <> spacing-»
+ «layoutVarName».horizontalSpacing = «spacing.dx»;
+ «layoutVarName».verticalSpacing = «spacing.dy»;
+«ENDIF-»
+«IF null <> margins-»
+ «layoutVarName».marginWidth = «margins.dx»;
+ «layoutVarName».marginHeight = «margins.dy»;
+«ENDIF-»
+ «owningFigureVariable».setLayoutManager(«layoutVarName»);
+«ENDLET»
+«ENDDEFINE»
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::FlowLayout-»
-«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
- «EXPAND Runtime::newInstance(layoutVarName)»
- «layoutVarName».setStretchMinorAxis(«matchMinorSize»);
- «layoutVarName».setMinorAlignment(«EXPAND Runtime::fqn».«EXPAND alignment(forceSingleLine) FOR minorAlignment»);
-«IF forceSingleLine»
- «layoutVarName».setSpacing(«majorSpacing»);
- «layoutVarName».setVertical(«vertical»);
-«ELSE»
- «layoutVarName».setMajorAlignment(«EXPAND Runtime::fqn».«EXPAND alignment(forceSingleLine) FOR majorAlignment»);
- «layoutVarName».setMajorSpacing(«majorSpacing»);
- «layoutVarName».setMinorSpacing(«minorSpacing»);
- «layoutVarName».setHorizontal(«not vertical»);
-«ENDIF»
- «owningFigureVariable».setLayoutManager(«layoutVarName»);
-«ENDLET»
-«ENDDEFINE»
+«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::FlowLayout-»
+«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
+ «EXPAND Runtime::newInstance(layoutVarName)»
+ «layoutVarName».setStretchMinorAxis(«matchMinorSize»);
+ «layoutVarName».setMinorAlignment(«EXPAND Runtime::fqn».«EXPAND alignment(forceSingleLine) FOR minorAlignment»);
+«IF forceSingleLine»
+ «layoutVarName».setSpacing(«majorSpacing»);
+ «layoutVarName».setVertical(«vertical»);
+«ELSE»
+ «layoutVarName».setMajorAlignment(«EXPAND Runtime::fqn».«EXPAND alignment(forceSingleLine) FOR majorAlignment»);
+ «layoutVarName».setMajorSpacing(«majorSpacing»);
+ «layoutVarName».setMinorSpacing(«minorSpacing»);
+ «layoutVarName».setHorizontal(«not vertical»);
+«ENDIF»
+ «owningFigureVariable».setLayoutManager(«layoutVarName»);
+«ENDLET»
+«ENDDEFINE»
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::CustomLayout-»
-«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
- «EXPAND Runtime::newInstance(layoutVarName)»
-«EXPAND attr::CustomClass::Init(layoutVarName)-»
- «owningFigureVariable».setLayoutManager(«layoutVarName»);
-«ENDLET»
-«ENDDEFINE»
+«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::CustomLayout-»
+«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
+ «EXPAND Runtime::newInstance(layoutVarName)»
+«EXPAND attr::CustomClass::Init(layoutVarName)-»
+ «owningFigureVariable».setLayoutManager(«layoutVarName»);
+«ENDLET»
+«ENDDEFINE»
-«DEFINE alignment(forceSingleLine : Boolean) FOR gmfgraph::Alignment-»
-«IF self = gmfgraph::Alignment::BEGINNING-»
-«IF forceSingleLine»ALIGN_TOPLEFT«ELSE»ALIGN_LEFTTOP«ENDIF-»
-«ELSEIF self = gmfgraph::Alignment::END-»
-«IF forceSingleLine»ALIGN_BOTTOMRIGHT«ELSE»ALIGN_RIGHTBOTTOM«ENDIF-»
-«ELSE-»
-ALIGN_CENTER«ENDIF-»
-«REM»XXX implement as extension
+«DEFINE alignment(forceSingleLine : Boolean) FOR gmfgraph::Alignment-»
+«IF self = gmfgraph::Alignment::BEGINNING-»
+«IF forceSingleLine»ALIGN_TOPLEFT«ELSE»ALIGN_LEFTTOP«ENDIF-»
+«ELSEIF self = gmfgraph::Alignment::END-»
+«IF forceSingleLine»ALIGN_BOTTOMRIGHT«ELSE»ALIGN_RIGHTBOTTOM«ENDIF-»
+«ELSE-»
+ALIGN_CENTER«ENDIF-»
+«REM»XXX implement as extension
switch (value) {
case Alignment.BEGINNING : ""
default : ""
-}«ENDREM»
-«ENDDEFINE»
+}«ENDREM»
+«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/LayoutData.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/LayoutData.xpt
index c631dc4e9..327e69924 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/LayoutData.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/LayoutData.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006, 2007 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,51 +10,51 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::LayoutData»
-«ERROR 'Abstract definition, there should be specific template for ' + self.repr()»
-«ENDDEFINE»
+«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::LayoutData»
+«ERROR 'Abstract definition, there should be specific template for ' + self.repr()»
+«ENDDEFINE»
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::BorderLayoutData»
-«parentFigureVariable».add(«owningFigureVariable», org.eclipse.draw2d.BorderLayout.«borderLayoutConstant(self)»);
-«ENDDEFINE»
+«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::BorderLayoutData»
+«parentFigureVariable».add(«owningFigureVariable», org.eclipse.draw2d.BorderLayout.«borderLayoutConstant(self)»);
+«ENDDEFINE»
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::XYLayoutData»
-«parentFigureVariable».add(«owningFigureVariable», «EXPAND newRectangle»);
-«ENDDEFINE»
+«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::XYLayoutData»
+«parentFigureVariable».add(«owningFigureVariable», «EXPAND newRectangle»);
+«ENDDEFINE»
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::CustomLayoutData»
-«LET 'constraint' + owningFigureVariable.firstToUpper() AS constraintVarName-»
-«qualifiedClassName» «constraintVarName» = new «qualifiedClassName»();
-«EXPAND attr::CustomClass::Init(constraintVarName)»
-«parentFigureVariable».add(«owningFigureVariable», «constraintVarName»);
-«ENDLET-»
-«ENDDEFINE»
+«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::CustomLayoutData»
+«LET 'constraint' + owningFigureVariable.firstToUpper() AS constraintVarName-»
+«qualifiedClassName» «constraintVarName» = new «qualifiedClassName»();
+«EXPAND attr::CustomClass::Init(constraintVarName)»
+«parentFigureVariable».add(«owningFigureVariable», «constraintVarName»);
+«ENDLET-»
+«ENDDEFINE»
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::GridLayoutData»
-«LET 'constraint' + owningFigureVariable.firstToUpper() AS constraintVarName»
-«EXPAND Runtime::newInstance(constraintVarName)»
-«constraintVarName».verticalAlignment = «EXPAND Runtime::fqn».«verticalAlignment.repr()»;«REM».literal, not .name!«ENDREM»
-«constraintVarName».horizontalAlignment = «EXPAND Runtime::fqn».«horizontalAlignment.repr()»;
-«constraintVarName».horizontalIndent = «horizontalIndent»;
-«constraintVarName».horizontalSpan = «horizontalSpan»;
-«constraintVarName».verticalSpan = «verticalSpan»;
-«constraintVarName».grabExcessHorizontalSpace = «grabExcessHorizontalSpace»;
-«constraintVarName».grabExcessVerticalSpace = «grabExcessVerticalSpace»;
-«IF null <> sizeHint-»
-«constraintVarName».widthHint = «sizeHint.dx»;
-«constraintVarName».heightHint = «sizeHint.dy»;
-«ENDIF-»
-«parentFigureVariable».add(«owningFigureVariable», «constraintVarName»);
-«ENDLET»
-«ENDDEFINE»
+«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::GridLayoutData»
+«LET 'constraint' + owningFigureVariable.firstToUpper() AS constraintVarName»
+«EXPAND Runtime::newInstance(constraintVarName)»
+«constraintVarName».verticalAlignment = «EXPAND Runtime::fqn».«verticalAlignment.repr()»;«REM».literal, not .name!«ENDREM»
+«constraintVarName».horizontalAlignment = «EXPAND Runtime::fqn».«horizontalAlignment.repr()»;
+«constraintVarName».horizontalIndent = «horizontalIndent»;
+«constraintVarName».horizontalSpan = «horizontalSpan»;
+«constraintVarName».verticalSpan = «verticalSpan»;
+«constraintVarName».grabExcessHorizontalSpace = «grabExcessHorizontalSpace»;
+«constraintVarName».grabExcessVerticalSpace = «grabExcessVerticalSpace»;
+«IF null <> sizeHint-»
+«constraintVarName».widthHint = «sizeHint.dx»;
+«constraintVarName».heightHint = «sizeHint.dy»;
+«ENDIF-»
+«parentFigureVariable».add(«owningFigureVariable», «constraintVarName»);
+«ENDLET»
+«ENDDEFINE»
-«DEFINE newRectangle FOR gmfgraph::XYLayoutData»
-new org.eclipse.draw2d.geometry.Rectangle(«IF null <> topLeft-»
-«EXPAND MapMode::_map FOR topLeft», «ELSE»0, 0, «ENDIF-»
-«IF null <> size-»
-«EXPAND MapMode::_map FOR size»«ELSE»0, 0«ENDIF»)
-«ENDDEFINE» \ No newline at end of file
+«DEFINE newRectangle FOR gmfgraph::XYLayoutData»
+new org.eclipse.draw2d.geometry.Rectangle(«IF null <> topLeft-»
+«EXPAND MapMode::_map FOR topLeft», «ELSE»0, 0, «ENDIF-»
+«IF null <> size-»
+«EXPAND MapMode::_map FOR size»«ELSE»0, 0«ENDIF»)
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/MapMode.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/MapMode.xpt
index 71d389ef6..5536a9be1 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/MapMode.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/MapMode.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,26 +10,26 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«REM»No mapMode at all«ENDREM»
+«REM»No mapMode at all«ENDREM»
-«DEFINE _map FOR gmfgraph::Dimension-»
-«dx», «dy-»
-«ENDDEFINE»
+«DEFINE _map FOR gmfgraph::Dimension-»
+«dx», «dy-»
+«ENDDEFINE»
-«DEFINE _map FOR gmfgraph::Point-»
-«x», «y-»
-«ENDDEFINE»
+«DEFINE _map FOR gmfgraph::Point-»
+«x», «y-»
+«ENDDEFINE»
-«DEFINE _map FOR Integer»
-«self-»
-«ENDDEFINE»
+«DEFINE _map FOR Integer»
+«self-»
+«ENDDEFINE»
-«DEFINE _map FOR gmfgraph::Insets-»
-«top», «left», «bottom», «right-»
-«ENDDEFINE»
+«DEFINE _map FOR gmfgraph::Insets-»
+«top», «left», «bottom», «right-»
+«ENDDEFINE»
-«DEFINE Activator FOR OclAny-»
-«ENDDEFINE» \ No newline at end of file
+«DEFINE Activator FOR OclAny-»
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt
index a8749b93d..dc0547547 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2007 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,65 +10,65 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
-«DEFINE newInstance(figureVarName : String) FOR gmfgraph::Figure»«EXPAND fqn» «figureVarName» = «EXPAND newInstance»;«ENDDEFINE»
-«DEFINE newInstance FOR gmfgraph::Figure»new «EXPAND fqn»()«ENDDEFINE»
+«DEFINE newInstance(figureVarName : String) FOR gmfgraph::Figure»«EXPAND fqn» «figureVarName» = «EXPAND newInstance»;«ENDDEFINE»
+«DEFINE newInstance FOR gmfgraph::Figure»new «EXPAND fqn»()«ENDDEFINE»
-«DEFINE newInstance(layoutVarName : String) FOR gmfgraph::Layout»«EXPAND fqn» «layoutVarName» = «EXPAND newInstance»;«ENDDEFINE»
-«DEFINE newInstance FOR gmfgraph::Layout»new «EXPAND fqn»()«ENDDEFINE»
+«DEFINE newInstance(layoutVarName : String) FOR gmfgraph::Layout»«EXPAND fqn» «layoutVarName» = «EXPAND newInstance»;«ENDDEFINE»
+«DEFINE newInstance FOR gmfgraph::Layout»new «EXPAND fqn»()«ENDDEFINE»
-«DEFINE newInstance(constraintVarName : String) FOR gmfgraph::LayoutData»«EXPAND fqn» «constraintVarName» = «EXPAND newInstance»;«ENDDEFINE»
-«DEFINE newInstance FOR gmfgraph::LayoutData»new «EXPAND fqn»()«ENDDEFINE»
+«DEFINE newInstance(constraintVarName : String) FOR gmfgraph::LayoutData»«EXPAND fqn» «constraintVarName» = «EXPAND newInstance»;«ENDDEFINE»
+«DEFINE newInstance FOR gmfgraph::LayoutData»new «EXPAND fqn»()«ENDDEFINE»
-«DEFINE newInstance(borderVarName : String) FOR gmfgraph::Border»«EXPAND fqn» «borderVarName» = «EXPAND newInstance»;«ENDDEFINE»
-«DEFINE newInstance FOR gmfgraph::Border»new «EXPAND fqn»()«ENDDEFINE»
+«DEFINE newInstance(borderVarName : String) FOR gmfgraph::Border»«EXPAND fqn» «borderVarName» = «EXPAND newInstance»;«ENDDEFINE»
+«DEFINE newInstance FOR gmfgraph::Border»new «EXPAND fqn»()«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Figure»«ERROR 'Abstract definition fqn(Figure)'»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Layout»«ERROR 'Abstract definition fqn(Layout)'»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::LayoutData»«ERROR 'Abstract definition fqn(LayoutData)'»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Border»«ERROR 'Abstract definition fqn(Border)'»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::Figure»«ERROR 'Abstract definition fqn(Figure)'»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::Layout»«ERROR 'Abstract definition fqn(Layout)'»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::LayoutData»«ERROR 'Abstract definition fqn(LayoutData)'»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::Border»«ERROR 'Abstract definition fqn(Border)'»«ENDDEFINE»
////////////////////////
-«DEFINE fqn FOR gmfgraph::CustomLayout»«qualifiedClassName»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::CustomBorder»«qualifiedClassName»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::CustomFigure»«qualifiedClassName»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::CustomLayout»«qualifiedClassName»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::CustomBorder»«qualifiedClassName»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::CustomFigure»«qualifiedClassName»«ENDDEFINE»
////////////////////////
-«DEFINE fqn FOR gmfgraph::FlowLayout»«IF forceSingleLine»org.eclipse.draw2d.ToolbarLayout«ELSE»org.eclipse.draw2d.FlowLayout«ENDIF»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::FlowLayout»«IF forceSingleLine»org.eclipse.draw2d.ToolbarLayout«ELSE»org.eclipse.draw2d.FlowLayout«ENDIF»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::XYLayout»org.eclipse.draw2d.XYLayout«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::XYLayoutData»org.eclipse.draw2d.geometry.Rectangle«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::XYLayout»org.eclipse.draw2d.XYLayout«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::XYLayoutData»org.eclipse.draw2d.geometry.Rectangle«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::GridLayout»org.eclipse.draw2d.GridLayout«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::GridLayoutData»org.eclipse.draw2d.GridData«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::GridLayout»org.eclipse.draw2d.GridLayout«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::GridLayoutData»org.eclipse.draw2d.GridData«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::StackLayout»org.eclipse.draw2d.StackLayout«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::BorderLayout»org.eclipse.draw2d.BorderLayout«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::StackLayout»org.eclipse.draw2d.StackLayout«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::BorderLayout»org.eclipse.draw2d.BorderLayout«ENDDEFINE»
////////////////////////
-«DEFINE fqn FOR gmfgraph::FigureRef»«EXPAND fqn FOR figure»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»org.eclipse.draw2d.Label«ENDIF»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::LabeledContainer»org.eclipse.draw2d.LabeledContainer«ENDDEFINE»
-«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»
-«REM»FIXME«ENDREM»«DEFINE fqn FOR gmfgraph::ScalablePolygon»org.eclipse.draw2d.Shape«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::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»
+«DEFINE fqn FOR gmfgraph::FigureRef»«EXPAND fqn FOR figure»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»org.eclipse.draw2d.Label«ENDIF»«ENDDEFINE»
+«DEFINE fqn FOR gmfgraph::LabeledContainer»org.eclipse.draw2d.LabeledContainer«ENDDEFINE»
+«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»
+«REM»FIXME«ENDREM»«DEFINE fqn FOR gmfgraph::ScalablePolygon»org.eclipse.draw2d.Shape«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::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»
-«REM»
+«REM»
to utilize around, need to fix XpandExecutionContextImpl to get aspects not only from relative aspects/ path, but from
template file as well.
// Full GMF Runtime
////////////////////////
-«AROUND fqn FOR PolylineConnection»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
-«AROUND fqn FOR Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
-«ENDREM» \ No newline at end of file
+«AROUND fqn FOR PolylineConnection»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
+«AROUND fqn FOR Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
+«ENDREM» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/CustomClass.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/CustomClass.xpt
index e0de76eb2..058a46097 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/CustomClass.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/CustomClass.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -9,30 +9,30 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
-«EXTENSION NativeUtil»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
+«EXTENSION NativeUtil»
-«DEFINE Init(instanceVarName : String) FOR gmfgraph::CustomClass»
-«EXPAND customAttribute(instanceVarName) FOREACH attributes»
-«ENDDEFINE»
+«DEFINE Init(instanceVarName : String) FOR gmfgraph::CustomClass»
+«EXPAND customAttribute(instanceVarName) FOREACH attributes»
+«ENDDEFINE»
-«DEFINE customAttribute(instanceVarName : String) FOR gmfgraph::CustomAttribute»
-«EXPAND customAttrValueImpl-»
-«IF directAccess»
-«instanceVarName».«name» = «EXPAND customAttrValue»;
-«ELSE»
-«instanceVarName».set«name.firstToUpper()»(«EXPAND customAttrValue»);
-«ENDIF»
-«ENDDEFINE»
+«DEFINE customAttribute(instanceVarName : String) FOR gmfgraph::CustomAttribute»
+«EXPAND customAttrValueImpl-»
+«IF directAccess»
+«instanceVarName».«name» = «EXPAND customAttrValue»;
+«ELSE»
+«instanceVarName».set«name.firstToUpper()»(«EXPAND customAttrValue»);
+«ENDIF»
+«ENDDEFINE»
-«DEFINE customAttrValueImpl FOR gmfgraph::CustomAttribute»
-«IF multiStatementValue-»
-«messageFormat(value, Sequence { 'attr' + name.firstToUpper() })-»
-«ENDIF-»
-«ENDDEFINE»
+«DEFINE customAttrValueImpl FOR gmfgraph::CustomAttribute»
+«IF multiStatementValue-»
+«messageFormat(value, Sequence { 'attr' + name.firstToUpper() })-»
+«ENDIF-»
+«ENDDEFINE»
-«DEFINE customAttrValue FOR gmfgraph::CustomAttribute»
-«IF multiStatementValue»attr«name.firstToUpper()»«ELSE-»«value»«ENDIF-»
-«ENDDEFINE» \ No newline at end of file
+«DEFINE customAttrValue FOR gmfgraph::CustomAttribute»
+«IF multiStatementValue»attr«name.firstToUpper()»«ELSE-»«value»«ENDIF-»
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Decoration.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Decoration.xpt
index 4b935477d..138d88cf5 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Decoration.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Decoration.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -9,44 +9,44 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
-«DEFINE polylineAttrs(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«EXPAND templatePoints(figureVarName)-»
-«EXPAND scale(figureVarName)-»
-«ENDDEFINE»
+«DEFINE polylineAttrs(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
+«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
+«EXPAND attr::Figure::figureAttrs(figureVarName)-»
+«EXPAND templatePoints(figureVarName)-»
+«EXPAND scale(figureVarName)-»
+«ENDDEFINE»
-«DEFINE polylineAttrs(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«EXPAND templatePoints(figureVarName)-»
-«EXPAND scale(figureVarName)-»
-«ENDDEFINE»
+«DEFINE polylineAttrs(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
+«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
+«EXPAND attr::Figure::figureAttrs(figureVarName)-»
+«EXPAND templatePoints(figureVarName)-»
+«EXPAND scale(figureVarName)-»
+«ENDDEFINE»
-«DEFINE templatePoints(figureVarName : String) FOR gmfgraph::Polyline-»
-«IF not template->isEmpty()-»
+«DEFINE templatePoints(figureVarName : String) FOR gmfgraph::Polyline-»
+«IF not template->isEmpty()-»
org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
-«EXPAND templatePoint('pl') FOREACH template-»
-«figureVarName».setTemplate(pl);
-«ENDIF-»
-«ENDDEFINE»
+«EXPAND templatePoint('pl') FOREACH template-»
+«figureVarName».setTemplate(pl);
+«ENDIF-»
+«ENDDEFINE»
-«DEFINE templatePoint(pointListVarName : String) FOR gmfgraph::Point-»
-«pointListVarName».addPoint(«EXPAND MapMode::_map»);
-«ENDDEFINE»
+«DEFINE templatePoint(pointListVarName : String) FOR gmfgraph::Point-»
+«pointListVarName».addPoint(«EXPAND MapMode::_map»);
+«ENDDEFINE»
-«DEFINE scale(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
-«IF not template->isEmpty()-»
-«figureVarName».setScale(«EXPAND MapMode::_map FOR 7», «EXPAND MapMode::_map FOR 3»);
-«ENDIF-»
-«ENDDEFINE»
+«DEFINE scale(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
+«IF not template->isEmpty()-»
+«figureVarName».setScale(«EXPAND MapMode::_map FOR 7», «EXPAND MapMode::_map FOR 3»);
+«ENDIF-»
+«ENDDEFINE»
-«DEFINE scale(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
-«IF not template->isEmpty()-»
-«figureVarName».setScale(«EXPAND MapMode::_map FOR 7», «EXPAND MapMode::_map FOR 3»);
-«ENDIF-»
-«ENDDEFINE» \ No newline at end of file
+«DEFINE scale(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
+«IF not template->isEmpty()-»
+«figureVarName».setScale(«EXPAND MapMode::_map FOR 7», «EXPAND MapMode::_map FOR 3»);
+«ENDIF-»
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Figure.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Figure.xpt
index c9268aa40..c787d6469 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Figure.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Figure.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -9,87 +9,87 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
-«EXTENSION xpt::StringOperations»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
+«EXTENSION xpt::StringOperations»
-«DEFINE figureAttrs(figureVarName : String) FOR gmfgraph::Figure-»
-«EXPAND foregroundColor(self, figureVarName) FOR foregroundColor-»
-«EXPAND backgroundColor(self, figureVarName) FOR backgroundColor-»
-«EXPAND font(figureVarName) FOR font-»
-«EXPAND preferredSize(figureVarName) FOR preferredSize-»
-«EXPAND maximumSize(figureVarName) FOR maximumSize-»
-«EXPAND minimumSize(figureVarName) FOR minimumSize-»
-«EXPAND position(figureVarName) FOR location-»
-«EXPAND size(figureVarName) FOR size-»
-«EXPAND insets(figureVarName) FOR insets-»
-«EXPAND Border::Init(figureVarName) FOR border-»
-«ENDDEFINE»
+«DEFINE figureAttrs(figureVarName : String) FOR gmfgraph::Figure-»
+«EXPAND foregroundColor(self, figureVarName) FOR foregroundColor-»
+«EXPAND backgroundColor(self, figureVarName) FOR backgroundColor-»
+«EXPAND font(figureVarName) FOR font-»
+«EXPAND preferredSize(figureVarName) FOR preferredSize-»
+«EXPAND maximumSize(figureVarName) FOR maximumSize-»
+«EXPAND minimumSize(figureVarName) FOR minimumSize-»
+«EXPAND position(figureVarName) FOR location-»
+«EXPAND size(figureVarName) FOR size-»
+«EXPAND insets(figureVarName) FOR insets-»
+«EXPAND Border::Init(figureVarName) FOR border-»
+«ENDDEFINE»
-«DEFINE foregroundColor(figure : gmfgraph::Figure, figureVarName : String) FOR gmfgraph::Color-»
- «figureVarName».setForegroundColor(«EXPAND color(figureVarName.toUpper() + '_FORE')»);
-«ENDDEFINE»
-«DEFINE backgroundColor(figure : gmfgraph::Figure, figureVarName : String) FOR gmfgraph::Color-»
- «figureVarName».setBackgroundColor(«EXPAND color(figureVarName.toUpper() + '_BACK')»);
-«ENDDEFINE»
+«DEFINE foregroundColor(figure : gmfgraph::Figure, figureVarName : String) FOR gmfgraph::Color-»
+ «figureVarName».setForegroundColor(«EXPAND color(figureVarName.toUpper() + '_FORE')»);
+«ENDDEFINE»
+«DEFINE backgroundColor(figure : gmfgraph::Figure, figureVarName : String) FOR gmfgraph::Color-»
+ «figureVarName».setBackgroundColor(«EXPAND color(figureVarName.toUpper() + '_BACK')»);
+«ENDDEFINE»
-«DEFINE preferredSize(figureVarName : String) FOR gmfgraph::Dimension-»
-«figureVarName».setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
-«ENDDEFINE»
+«DEFINE preferredSize(figureVarName : String) FOR gmfgraph::Dimension-»
+«figureVarName».setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
+«ENDDEFINE»
-«DEFINE maximumSize(figureVarName : String) FOR gmfgraph::Dimension-»
-«figureVarName».setMaximumSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
-«ENDDEFINE»
+«DEFINE maximumSize(figureVarName : String) FOR gmfgraph::Dimension-»
+«figureVarName».setMaximumSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
+«ENDDEFINE»
-«DEFINE minimumSize(figureVarName : String) FOR gmfgraph::Dimension-»
-«figureVarName».setMinimumSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
-«ENDDEFINE»
+«DEFINE minimumSize(figureVarName : String) FOR gmfgraph::Dimension-»
+«figureVarName».setMinimumSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
+«ENDDEFINE»
-«DEFINE position(figureVarName : String) FOR gmfgraph::Point-»
-«figureVarName».setLocation(new org.eclipse.draw2d.geometry.Point(«EXPAND MapMode::_map»));
-«ENDDEFINE»
+«DEFINE position(figureVarName : String) FOR gmfgraph::Point-»
+«figureVarName».setLocation(new org.eclipse.draw2d.geometry.Point(«EXPAND MapMode::_map»));
+«ENDDEFINE»
-«DEFINE size(figureVarName : String) FOR gmfgraph::Point-»
-«figureVarName».setSize(«EXPAND MapMode::_map»);
-«ENDDEFINE»
+«DEFINE size(figureVarName : String) FOR gmfgraph::Point-»
+«figureVarName».setSize(«EXPAND MapMode::_map»);
+«ENDDEFINE»
-«DEFINE insets(figureVarName : String) FOR gmfgraph::Insets-»
-«REM»using MarginBorder for insets is not good idea«ENDREM»
-«figureVarName».setBorder(new org.eclipse.draw2d.MarginBorder(«EXPAND MapMode::_map»));
-«ENDDEFINE»
+«DEFINE insets(figureVarName : String) FOR gmfgraph::Insets-»
+«REM»using MarginBorder for insets is not good idea«ENDREM»
+«figureVarName».setBorder(new org.eclipse.draw2d.MarginBorder(«EXPAND MapMode::_map»));
+«ENDDEFINE»
-«DEFINE font(figureVarName : String) FOR gmfgraph::Font»
-«ERROR 'This is abstact definition, just to overcome some xpand polymorphism limitations'»
-«ENDDEFINE»
+«DEFINE font(figureVarName : String) FOR gmfgraph::Font»
+«ERROR 'This is abstact definition, just to overcome some xpand polymorphism limitations'»
+«ENDDEFINE»
-«DEFINE color(variableName : String) FOR gmfgraph::Color»
-«ERROR 'This is abstact definition, just to overcome some xpand polymorphism limitations'»
-«ENDDEFINE»
+«DEFINE color(variableName : String) FOR gmfgraph::Color»
+«ERROR 'This is abstact definition, just to overcome some xpand polymorphism limitations'»
+«ENDDEFINE»
-«DEFINE color(variableName : String) FOR gmfgraph::RGBColor-»
-«variableName-»
-«FILE '' staticFields»
+«DEFINE color(variableName : String) FOR gmfgraph::RGBColor-»
+«variableName-»
+«FILE '' staticFields»
/**
* @generated
*/
-static final org.eclipse.swt.graphics.Color «variableName» = new org.eclipse.swt.graphics.Color(null, «red», «green», «blue»);
-«ENDFILE»
-«ENDDEFINE»
+static final org.eclipse.swt.graphics.Color «variableName» = new org.eclipse.swt.graphics.Color(null, «red», «green», «blue»);
+«ENDFILE»
+«ENDDEFINE»
-«DEFINE color(variableName : String) FOR gmfgraph::ConstantColor-»
-org.eclipse.draw2d.ColorConstants.«value-»
-«ENDDEFINE»
+«DEFINE color(variableName : String) FOR gmfgraph::ConstantColor-»
+org.eclipse.draw2d.ColorConstants.«value-»
+«ENDDEFINE»
-«DEFINE font(figureVarName : String) FOR gmfgraph::BasicFont-»
-«LET figureVarName.toUpper() + '_FONT' AS variableName»
-«figureVarName».setFont(«variableName»);
-«FILE '' staticFields»
+«DEFINE font(figureVarName : String) FOR gmfgraph::BasicFont-»
+«LET figureVarName.toUpper() + '_FONT' AS variableName»
+«figureVarName».setFont(«variableName»);
+«FILE '' staticFields»
/**
* @generated
*/
-static final org.eclipse.swt.graphics.Font «variableName» = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), «IF null = faceName or faceName.trim().xpandLength() = 0»org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName()«ELSE»"«faceName»"«ENDIF», «height», org.eclipse.swt.SWT.«style»);
-«ENDFILE»
-«ENDLET»
-«ENDDEFINE»
+static final org.eclipse.swt.graphics.Font «variableName» = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), «IF null = faceName or faceName.trim().xpandLength() = 0»org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName()«ELSE»"«faceName»"«ENDIF», «height», org.eclipse.swt.SWT.«style»);
+«ENDFILE»
+«ENDLET»
+«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt
index 3129577c7..457a5f01a 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -9,48 +9,48 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«REM»
+«REM»
org.eclipse.draw2d.Shape
private boolean fill = true, outline = true, xorFill, xorOutline;
-«ENDREM»
-«DEFINE shapeAttrs(figureVarName : String) FOR gmfgraph::Shape-»
-«EXPAND fill(figureVarName)-»
-«IF xorFill»«EXPAND xorFill(figureVarName)»«ENDIF-»
-«IF not outline»«EXPAND outline(figureVarName)»«ENDIF-»
-«IF xorOutline»«EXPAND xorOutline(figureVarName)»«ENDIF-»
-«REM» UNCONDITIONALLY generate setLineWidth, see bug 262383 IF lineWidth <> 1 «ENDREM»«EXPAND lineWidth(figureVarName)»«REM» ENDIF «ENDREM-»
-«IF lineKind <> gmfgraph::LineKind::LINE_SOLID»«EXPAND lineKind(figureVarName)»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE fill(figureVarName : String) FOR gmfgraph::Shape-»
-«IF not fill»«figureVarName».setFill(«fill»);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE fill(figureVarName : String) FOR gmfgraph::Polygon-»
-«IF fill»«figureVarName».setFill(«fill»);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE xorFill(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setFillXOR(«xorFill»);
-«ENDDEFINE»
-
-«DEFINE outline(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setOutline(«outline»);
-«ENDDEFINE»
-
-«DEFINE xorOutline(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setOutlineXOR(«xorOutline»);
-«ENDDEFINE»
-
-«DEFINE lineWidth(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setLineWidth(«lineWidth»);
-«ENDDEFINE»
-
-«DEFINE lineKind(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setLineStyle(org.eclipse.draw2d.Graphics.«lineKind»);
-«ENDDEFINE»
+«ENDREM»
+«DEFINE shapeAttrs(figureVarName : String) FOR gmfgraph::Shape-»
+«EXPAND fill(figureVarName)-»
+«IF xorFill»«EXPAND xorFill(figureVarName)»«ENDIF-»
+«IF not outline»«EXPAND outline(figureVarName)»«ENDIF-»
+«IF xorOutline»«EXPAND xorOutline(figureVarName)»«ENDIF-»
+«REM» UNCONDITIONALLY generate setLineWidth, see bug 262383 IF lineWidth <> 1 «ENDREM»«EXPAND lineWidth(figureVarName)»«REM» ENDIF «ENDREM-»
+«IF lineKind <> gmfgraph::LineKind::LINE_SOLID»«EXPAND lineKind(figureVarName)»«ENDIF-»
+«ENDDEFINE»
+
+«DEFINE fill(figureVarName : String) FOR gmfgraph::Shape-»
+«IF not fill»«figureVarName».setFill(«fill»);
+«ENDIF-»
+«ENDDEFINE»
+
+«DEFINE fill(figureVarName : String) FOR gmfgraph::Polygon-»
+«IF fill»«figureVarName».setFill(«fill»);
+«ENDIF-»
+«ENDDEFINE»
+
+«DEFINE xorFill(figureVarName : String) FOR gmfgraph::Shape-»
+«figureVarName».setFillXOR(«xorFill»);
+«ENDDEFINE»
+
+«DEFINE outline(figureVarName : String) FOR gmfgraph::Shape-»
+«figureVarName».setOutline(«outline»);
+«ENDDEFINE»
+
+«DEFINE xorOutline(figureVarName : String) FOR gmfgraph::Shape-»
+«figureVarName».setOutlineXOR(«xorOutline»);
+«ENDDEFINE»
+
+«DEFINE lineWidth(figureVarName : String) FOR gmfgraph::Shape-»
+«figureVarName».setLineWidth(«lineWidth»);
+«ENDDEFINE»
+
+«DEFINE lineKind(figureVarName : String) FOR gmfgraph::Shape-»
+«figureVarName».setLineStyle(org.eclipse.draw2d.Graphics.«lineKind»);
+«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Activator.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Activator.xpt
index 2455b286f..f4f256f7e 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Activator.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Activator.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -9,34 +9,34 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«DEFINE Init(packageName : String, pluginActivatorClassName : String, pluginID : String) FOR Collection(OclAny)-»
-«EXPAND Init(packageName, pluginActivatorClassName, pluginID) FOR ''-»
-«ENDDEFINE»
+«DEFINE Init(packageName : String, pluginActivatorClassName : String, pluginID : String) FOR Collection(OclAny)-»
+«EXPAND Init(packageName, pluginActivatorClassName, pluginID) FOR ''-»
+«ENDDEFINE»
-«DEFINE Init(packageName : String, pluginActivatorClassName : String, pluginID : String) FOR OclAny-»
-package «packageName»;
+«DEFINE Init(packageName : String, pluginActivatorClassName : String, pluginID : String) FOR OclAny-»
+package «packageName»;
/**
* @generated
*/
-public class «pluginActivatorClassName» extends org.eclipse.core.runtime.Plugin {
+public class «pluginActivatorClassName» extends org.eclipse.core.runtime.Plugin {
/**
* @generated
*/
- public static final String ID = "«pluginID»"; //$NON-NLS-1$
+ public static final String ID = "«pluginID»"; //$NON-NLS-1$
/**
* @generated
*/
- private static «pluginActivatorClassName» ourInstance;
+ private static «pluginActivatorClassName» ourInstance;
/**
* @generated
*/
- public «pluginActivatorClassName»() {
+ public «pluginActivatorClassName»() {
}
/**
@@ -58,12 +58,12 @@ public class «pluginActivatorClassName» extends org.eclipse.core.runtime.Plugin
/**
* @generated
*/
- public static «pluginActivatorClassName» getDefault() {
+ public static «pluginActivatorClassName» getDefault() {
return ourInstance;
}
-«EXPAND MapMode::Activator-»
-«EXPAND additions-»
+«EXPAND MapMode::Activator-»
+«EXPAND additions-»
}
-«ENDDEFINE»
+«ENDDEFINE»
-«DEFINE additions FOR OclAny»«ENDDEFINE» \ No newline at end of file
+«DEFINE additions FOR OclAny»«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt
index ee6d03784..c45b7bb13 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,9 +10,9 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«DEFINE Init FOR OclAny-»
+«DEFINE Init FOR OclAny-»
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
-«ENDDEFINE» \ No newline at end of file
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Manifest.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Manifest.xpt
index dcbeeb8d1..9e6a9a204 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Manifest.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Manifest.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006, 2007 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -9,36 +9,36 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«EXTENSION Util»
+«EXTENSION Util»
/*
* FIXME add a simple model (either non-generated, .ecore only?) to descripbe GenConfig
*/
-«DEFINE Init(pluginID : String, pluginActivatorQualifiedName : String, exportedPackages : Sequence(String), referencedBundles : Sequence(String)) FOR OclAny-»
+«DEFINE Init(pluginID : String, pluginActivatorQualifiedName : String, exportedPackages : Sequence(String), referencedBundles : Sequence(String)) FOR OclAny-»
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: «pluginID»; singleton:=true
+Bundle-SymbolicName: «pluginID»; singleton:=true
Bundle-Version: 1.0.0
Bundle-Vendor: %providerName
-Bundle-Activator: «pluginActivatorQualifiedName»
+Bundle-Activator: «pluginActivatorQualifiedName»
Bundle-Localization: plugin
-Export-Package:«EXPAND exportPackageHeader FOR exportedPackages»
-Require-Bundle:«EXPAND requireBundleHeader FOR requiredBundles(referencedBundles)»
+Export-Package:«EXPAND exportPackageHeader FOR exportedPackages»
+Require-Bundle:«EXPAND requireBundleHeader FOR requiredBundles(referencedBundles)»
Eclipse-LazyStart: true
-«EXPAND additions-»
-«ENDDEFINE»
+«EXPAND additions-»
+«ENDDEFINE»
-«DEFINE exportPackageHeader FOR Sequence(String)-»
-«EXPAND print FOREACH self SEPARATOR ',\n'-»
-«ENDDEFINE»
+«DEFINE exportPackageHeader FOR Sequence(String)-»
+«EXPAND print FOREACH self SEPARATOR ',\n'-»
+«ENDDEFINE»
-«REM»FIXME Set[String] - improve union recognition«ENDREM»
-«DEFINE requireBundleHeader FOR Collection(OclAny)-»
-«EXPAND print FOREACH (self->collect(it | it))[String]->asSequence() SEPARATOR ',\n'-»
-«ENDDEFINE»
+«REM»FIXME Set[String] - improve union recognition«ENDREM»
+«DEFINE requireBundleHeader FOR Collection(OclAny)-»
+«EXPAND print FOREACH (self->collect(it | it))[String]->asSequence() SEPARATOR ',\n'-»
+«ENDDEFINE»
-«DEFINE print FOR String» «self»«ENDDEFINE»
+«DEFINE print FOR String» «self»«ENDDEFINE»
-«DEFINE additions FOR OclAny»«ENDDEFINE» \ No newline at end of file
+«DEFINE additions FOR OclAny»«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt
index 2e3ee1d45..bd900a534 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«DEFINE Init(pluginName : String, providerName : String) FOR OclAny-»
-pluginName = «pluginName»
-providerName = «providerName»
-«ENDDEFINE» \ No newline at end of file
+«DEFINE Init(pluginName : String, providerName : String) FOR OclAny-»
+pluginName = «pluginName»
+providerName = «providerName»
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt
index 424bf03ca..d9bb5803c 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,33 +10,33 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION rt_mm::MapModeUtil»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION rt_mm::MapModeUtil»
-«REM»Using MapMode«ENDREM»
+«REM»Using MapMode«ENDREM»
-«DEFINE _map FOR gmfgraph::Dimension-»
-«EXPAND deviceToLogic FOR dx», «EXPAND deviceToLogic FOR dy-»
-«ENDDEFINE»
+«DEFINE _map FOR gmfgraph::Dimension-»
+«EXPAND deviceToLogic FOR dx», «EXPAND deviceToLogic FOR dy-»
+«ENDDEFINE»
-«DEFINE _map FOR gmfgraph::Point-»
-«EXPAND deviceToLogic FOR x», «EXPAND deviceToLogic FOR y-»
-«ENDDEFINE»
+«DEFINE _map FOR gmfgraph::Point-»
+«EXPAND deviceToLogic FOR x», «EXPAND deviceToLogic FOR y-»
+«ENDDEFINE»
-«DEFINE _map FOR Integer-»
-«EXPAND deviceToLogic-»
-«ENDDEFINE»
+«DEFINE _map FOR Integer-»
+«EXPAND deviceToLogic-»
+«ENDDEFINE»
-«DEFINE _map FOR gmfgraph::Insets-»
-«EXPAND deviceToLogic FOR top», «EXPAND deviceToLogic FOR left», «EXPAND deviceToLogic FOR bottom», «EXPAND deviceToLogic FOR right-»
-«ENDDEFINE»
+«DEFINE _map FOR gmfgraph::Insets-»
+«EXPAND deviceToLogic FOR top», «EXPAND deviceToLogic FOR left», «EXPAND deviceToLogic FOR bottom», «EXPAND deviceToLogic FOR right-»
+«ENDDEFINE»
-«DEFINE deviceToLogic FOR Integer-»
-«mapModeAccessor()»getMapMode().DPtoLP(«self»)
-«ENDDEFINE»
+«DEFINE deviceToLogic FOR Integer-»
+«mapModeAccessor()»getMapMode().DPtoLP(«self»)
+«ENDDEFINE»
-«DEFINE Activator FOR OclAny-»
+«DEFINE Activator FOR OclAny-»
private org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode myMapMode = org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes.IDENTITY_MM;
/**
@@ -55,4 +55,4 @@
public org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode getMapMode() {
return myMapMode;
}
-«ENDDEFINE» \ No newline at end of file
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Descriptor.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Descriptor.xpt
index e22ca8a8c..edc82e8d2 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Descriptor.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Descriptor.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2007 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,75 +10,75 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
-«EXTENSION xpt::StringOperations»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«EXTENSION Util»
+«EXTENSION xpt::StringOperations»
-«DEFINE Top(packageStmt : String) FOR gmfgraph::FigureDescriptor»
-«IF packageStmt <> null and packageStmt.xpandLength() > 0»package «packageStmt»;
-«ENDIF-»
+«DEFINE Top(packageStmt : String) FOR gmfgraph::FigureDescriptor»
+«IF packageStmt <> null and packageStmt.xpandLength() > 0»package «packageStmt»;
+«ENDIF-»
/**
* @generated
*/
-public class «compilationUnitName(self)» extends «EXPAND Runtime::fqn FOR actualFigure» {
-«EXPAND body»
-«additionalStaticFields()»
+public class «compilationUnitName(self)» extends «EXPAND Runtime::fqn FOR actualFigure» {
+«EXPAND body»
+«additionalStaticFields()»
}
-«ENDDEFINE»
+«ENDDEFINE»
-«DEFINE Inner FOR gmfgraph::FigureDescriptor»
+«DEFINE Inner FOR gmfgraph::FigureDescriptor»
/**
* @generated
*/
-public class «compilationUnitName(self)» extends «EXPAND Runtime::fqn FOR actualFigure» {
-«EXPAND body»
+public class «compilationUnitName(self)» extends «EXPAND Runtime::fqn FOR actualFigure» {
+«EXPAND body»
}
-«additionalStaticFields()»
-«ENDDEFINE»
+«additionalStaticFields()»
+«ENDDEFINE»
-«REM»«ENDREM»
-«DEFINE body FOR gmfgraph::FigureDescriptor»
+«REM»«ENDREM»
+«DEFINE body FOR gmfgraph::FigureDescriptor»
-«EXPAND accessorField FOREACH accessors->select(a | not (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))»
+«EXPAND accessorField FOREACH accessors->select(a | not (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))»
-«EXPAND Figure::ClassBody(compilationUnitName(self)) FOR actualFigure»
+«EXPAND Figure::ClassBody(compilationUnitName(self)) FOR actualFigure»
-«EXPAND accessorToField FOREACH accessors->select(a | not (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))»
-«FOREACH accessors->select(a | (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))->asSequence() AS a-»
-«EXPAND accessorToCustom(allCustomAccessors(self)->select(fa | fa.typedFigure = a.figure)) FOR a»
-«ENDFOREACH-»
-«ENDDEFINE»
+«EXPAND accessorToField FOREACH accessors->select(a | not (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))»
+«FOREACH accessors->select(a | (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))->asSequence() AS a-»
+«EXPAND accessorToCustom(allCustomAccessors(self)->select(fa | fa.typedFigure = a.figure)) FOR a»
+«ENDFOREACH-»
+«ENDDEFINE»
-«DEFINE accessorField FOR gmfgraph::ChildAccess-»
+«DEFINE accessorField FOR gmfgraph::ChildAccess-»
/**
* @generated
*/
- private «EXPAND Runtime::fqn FOR figure» «self.figureFieldName()»;
-«ENDDEFINE»
+ private «EXPAND Runtime::fqn FOR figure» «self.figureFieldName()»;
+«ENDDEFINE»
-«REM»ChildAccess points to figure we've generated, there's a field for it«ENDREM»
-«DEFINE accessorToField FOR gmfgraph::ChildAccess-»
+«REM»ChildAccess points to figure we've generated, there's a field for it«ENDREM»
+«DEFINE accessorToField FOR gmfgraph::ChildAccess-»
/**
* @generated
*/
- public «EXPAND Runtime::fqn FOR figure» «accessor»() {
- return «self.figureFieldName()»;
+ public «EXPAND Runtime::fqn FOR figure» «accessor»() {
+ return «self.figureFieldName()»;
}
-«ENDDEFINE»
+«ENDDEFINE»
-«REM»ChildAccess points to some child of a CustomFigure, need to delegate to it's accessor
+«REM»ChildAccess points to some child of a CustomFigure, need to delegate to it's accessor
Perhaps, should add support for ChildAccess not being generated (in case they are have same name as
FigureAccessor.accessor
-«ENDREM»
-«DEFINE accessorToCustom(fa : Sequence(gmfgraph::FigureAccessor)) FOR gmfgraph::ChildAccess-»
+«ENDREM»
+«DEFINE accessorToCustom(fa : Sequence(gmfgraph::FigureAccessor)) FOR gmfgraph::ChildAccess-»
/**
* @generated
*/
- public «EXPAND Runtime::fqn FOR figure» «accessor»() {
- return «fa.accessor->first()»;
+ public «EXPAND Runtime::fqn FOR figure» «accessor»() {
+ return «fa.accessor->first()»;
}
-«ENDDEFINE» \ No newline at end of file
+«ENDDEFINE» \ No newline at end of file
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 17978d449..bb92410f4 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006, 2007 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,86 +10,86 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
+«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»
+«DEFINE ClassBody(cuName : String) FOR gmfgraph::Figure»«ERROR 'abstract ClassBody(Figure)'»«ENDDEFINE»
-«DEFINE ClassBody(cuName : String) FOR gmfgraph::FigureRef-»
-«EXPAND ClassBody(cuName) FOR figure-»
-«ENDDEFINE»
+«DEFINE ClassBody(cuName : String) FOR gmfgraph::FigureRef-»
+«EXPAND ClassBody(cuName) FOR figure-»
+«ENDDEFINE»
-«DEFINE ClassBody(cuName : String) FOR gmfgraph::RealFigure-»
+«DEFINE ClassBody(cuName : String) FOR gmfgraph::RealFigure-»
/**
* @generated
*/
- public «cuName»() {
-«clearBorders()-»
- «EXPAND Layout::Init('this') FOR layout-»
- «EXPAND Attrs::Init('this')-»
-«IF not (children)[gmfgraph::Figure]->isEmpty()-»
+ public «cuName»() {
+«clearBorders()-»
+ «EXPAND Layout::Init('this') FOR layout-»
+ «EXPAND Attrs::Init('this')-»
+«IF not (children)[gmfgraph::Figure]->isEmpty()-»
createContents();
}
-«EXPAND Children::CreateChildren-»
-«EXPAND Border::InitMethods»
-«ELSE-»
+«EXPAND Children::CreateChildren-»
+«EXPAND Border::InitMethods»
+«ELSE-»
}
-«ENDIF-»
-«EXPAND Extras::extraMethods»
-«EXPAND Extras::localCoordinates»
-«EXPAND additions-»
-«ENDDEFINE»
+«ENDIF-»
+«EXPAND Extras::extraMethods»
+«EXPAND Extras::localCoordinates»
+«EXPAND additions-»
+«ENDDEFINE»
-«DEFINE ClassBody(cuName : String) FOR gmfgraph::PolylineConnection-»
+«DEFINE ClassBody(cuName : String) FOR gmfgraph::PolylineConnection-»
/**
* @generated
*/
- public «cuName»() {
- «EXPAND Attrs::Init('this')»
-«IF not (children)[gmfgraph::Label]->isEmpty()-»
+ public «cuName»() {
+ «EXPAND Attrs::Init('this')»
+«IF not (children)[gmfgraph::Label]->isEmpty()-»
createContents();
-«ENDIF-»
-«IF hasSourceDecoration(self)-»
+«ENDIF-»
+«IF hasSourceDecoration(self)-»
setSourceDecoration(createSourceDecoration());
-«ENDIF-»
-«IF hasTargetDecoration(self)-»
+«ENDIF-»
+«IF hasTargetDecoration(self)-»
setTargetDecoration(createTargetDecoration());
-«ENDIF-»
+«ENDIF-»
}
-«IF not (children)[gmfgraph::Label]->isEmpty()»
-«REM»
+«IF not (children)[gmfgraph::Label]->isEmpty()»
+«REM»
Copy of Children::CreateChildren with temp workaround to generate child figures for labels only.
Though this is temp workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=193180, I'm not sure
what's the right approach with e.g. decoration as child of a link.
-«ENDREM»
+«ENDREM»
/**
* @generated
*/
private void createContents(){
-«EXPAND Children::instantiate(0, self, 'this') FOREACH (children)[gmfgraph::Label]»
+«EXPAND Children::instantiate(0, self, 'this') FOREACH (children)[gmfgraph::Label]»
}
-«ENDIF-»
-«IF hasSourceDecoration(self)»
+«ENDIF-»
+«IF hasSourceDecoration(self)»
/**
* @generated
*/
private org.eclipse.draw2d.RotatableDecoration createSourceDecoration() {
- «EXPAND Decoration::Instantiate('df') FOR sourceDecoration-»
+ «EXPAND Decoration::Instantiate('df') FOR sourceDecoration-»
return df;
}
-«ENDIF-»
-«IF hasTargetDecoration(self)»
+«ENDIF-»
+«IF hasTargetDecoration(self)»
/**
* @generated
*/
private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {
- «EXPAND Decoration::Instantiate('df') FOR targetDecoration-»
+ «EXPAND Decoration::Instantiate('df') FOR targetDecoration-»
return df;
}
-«ENDIF-»
-«EXPAND additions-»
-«ENDDEFINE»
+«ENDIF-»
+«EXPAND additions-»
+«ENDDEFINE»
-«REM»Our regular way to add smth inside generated class body«ENDREM»
-«DEFINE additions FOR gmfgraph::Figure»«ENDDEFINE» \ No newline at end of file
+«REM»Our regular way to add smth inside generated class body«ENDREM»
+«DEFINE additions FOR gmfgraph::Figure»«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt
index 6fcd2e6a3..bcbd7e63c 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2006 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
@@ -10,11 +10,11 @@
* Michael Golubev (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
+«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«DEFINE behaviour FOR gmfgraph::ScalablePolygon-»
+«DEFINE behaviour FOR gmfgraph::ScalablePolygon-»
/**
* @generated
*/
@@ -91,4 +91,4 @@
}
return scaled;
}
-«ENDDEFINE» \ No newline at end of file
+«ENDDEFINE» \ No newline at end of file

Back to the top