Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2009-02-19 13:41:11 +0000
committerashatalin2009-02-19 13:41:11 +0000
commit28875d545354851e8d4bc664dee7f747e70b4492 (patch)
treeed855b60b4834d70cef32229961ebf852f3a3d6a /plugins/org.eclipse.gmf.graphdef.codegen
parent2e4b1d36cc1eae7ca5ac19c6aed9e3ca0f319674 (diff)
downloadorg.eclipse.gmf-tooling-28875d545354851e8d4bc664dee7f747e70b4492.tar.gz
org.eclipse.gmf-tooling-28875d545354851e8d4bc664dee7f747e70b4492.tar.xz
org.eclipse.gmf-tooling-28875d545354851e8d4bc664dee7f747e70b4492.zip
String escaping switched on in templates in accordance with OCL string escaping - https://bugs.eclipse.org/bugs/show_bug.cgi?id=242880.
Diffstat (limited to 'plugins/org.eclipse.gmf.graphdef.codegen')
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/build.properties1
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Decoration.xpt1
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Figure.xpt1
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Activator.xpt1
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Manifest.xpt6
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Descriptor.xpt1
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Figure.xpt1
7 files changed, 3 insertions, 9 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/build.properties b/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
index d44f68e48..bea408b3b 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
@@ -18,3 +18,4 @@ bin.includes = META-INF/,\
templates.migrated/,\
plugin.xml,\
plugin.properties
+jars.compile.order = .
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Decoration.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Decoration.xpt
index 40ae0f367..4b935477d 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Decoration.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Decoration.xpt
@@ -11,7 +11,6 @@
*/
«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«IMPORT 'templates'»
«EXTENSION Util»
«DEFINE polylineAttrs(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Figure.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Figure.xpt
index 1e0984f6d..c9268aa40 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Figure.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Figure.xpt
@@ -11,7 +11,6 @@
*/
«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«IMPORT 'templates'»
«EXTENSION Util»
«EXTENSION xpt::StringOperations»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Activator.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Activator.xpt
index 1c39deefe..2455b286f 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Activator.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Activator.xpt
@@ -10,7 +10,6 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«IMPORT 'templates'»
«DEFINE Init(packageName : String, pluginActivatorClassName : String, pluginID : String) FOR Collection(OclAny)-»
«EXPAND Init(packageName, pluginActivatorClassName, pluginID) FOR ''-»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Manifest.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Manifest.xpt
index 1d10a67f1..dcbeeb8d1 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Manifest.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Manifest.xpt
@@ -31,14 +31,12 @@ Eclipse-LazyStart: true
«ENDDEFINE»
«DEFINE exportPackageHeader FOR Sequence(String)-»
-«EXPAND print FOREACH self SEPARATOR ',
-'-»
+«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 ',
-'-»
+«EXPAND print FOREACH (self->collect(it | it))[String]->asSequence() SEPARATOR ',\n'-»
«ENDDEFINE»
«DEFINE print FOR String» «self»«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Descriptor.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Descriptor.xpt
index ea65f103d..e22ca8a8c 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Descriptor.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Descriptor.xpt
@@ -12,7 +12,6 @@
«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«IMPORT 'templates'»
«EXTENSION Util»
«EXTENSION xpt::StringOperations»
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Figure.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Figure.xpt
index 4ba4c7918..17978d449 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Figure.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Figure.xpt
@@ -12,7 +12,6 @@
«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«IMPORT 'templates'»
«EXTENSION Util»
«DEFINE ClassBody(cuName : String) FOR gmfgraph::Figure»«ERROR 'abstract ClassBody(Figure)'»«ENDDEFINE»

Back to the top