Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2010-02-02 15:40:53 -0500
committerashatalin2010-02-02 15:40:53 -0500
commit6e730de33133a12f484b643c34d22ea1b5cc6d03 (patch)
treec053f1d51701d9cd2247493d867c0d80bb3630ee
parent65a4d7f37c7721f4b743b70bca4ad2c7d7ca560c (diff)
downloadorg.eclipse.gmf-tooling-6e730de33133a12f484b643c34d22ea1b5cc6d03.tar.gz
org.eclipse.gmf-tooling-6e730de33133a12f484b643c34d22ea1b5cc6d03.tar.xz
org.eclipse.gmf-tooling-6e730de33133a12f484b643c34d22ea1b5cc6d03.zip
XPand Parsers were regenerated using latest OCL/QVTO grammar files + new lpg2 parser generator and runtime.v20100202-1647
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt4
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
index 5484759a3..38eebe980 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
@@ -79,7 +79,7 @@
«DEFINE packageStatement FOR String-»
«IF self.xpandSplit('\\.')->size() > 1-»
-package «FOREACH let tmpVar = self.xpandSplit('\\.') in if tmpVar->size() < 2 then Sequence{}[String] else tmpVar->subSequence(1, tmpVar->size() - 1) endif AS s SEPARATOR '.'»«s»«ENDFOREACH»;«ENDIF-»
+package «LET self.xpandSplit('\\.') AS tmpVar»«FOREACH if tmpVar->size() < 2 then Sequence{}[String] else tmpVar->subSequence(1, tmpVar->size() - 1) endif AS s SEPARATOR '.'»«s»«ENDFOREACH»;«ENDLET»«ENDIF-»
«ENDDEFINE»
// Provides handy single point to override generation of assert statements
@@ -87,4 +87,4 @@ package «FOREACH let tmpVar = self.xpandSplit('\\.') in if tmpVar->size() < 2 t
// TODO condition.xpandToCharList()->count('"') / 2 gives better guess about number of nonNLS to generate
«DEFINE _assert(condition : String) FOR OclAny-»
assert «condition»;«IF condition.indexOf('\"') > 0»«EXPAND nonNLS»«ENDIF»
-«ENDDEFINE» \ No newline at end of file
+«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto
index 4b87088c5..267698ad5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto
@@ -35,5 +35,5 @@ helper getDocumentRootSetFeature(genDiagram : gmfgen::GenDiagram) : genmodel::Ge
}
helper isDocRootSetFeature(gf : genmodel::GenFeature, eType : ecore::EClass) : Boolean {
- return not isListType(gf) and gf.ecoreFeature.changeable and (-2 = gf.ecoreFeature.upperBound.oclAsType(Integer) and (gf.ecoreFeature.eClass().name = 'EReference' and gf.ecoreFeature.eType.oclAsType(ecore::EClass).isSuperTypeOf(eType)))
+ return not isListType(gf) and gf.ecoreFeature.changeable and (-2 = gf.ecoreFeature.upperBound.oclAsType(Integer) and (gf.ecoreFeature.oclAsType(ecore::EObject).eClass().name = 'EReference' and gf.ecoreFeature.eType.oclAsType(ecore::EClass).isSuperTypeOf(eType)))
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
index aeb612c11..134ab5e21 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
@@ -280,7 +280,7 @@ FIXME
«ENDDEFINE»
«DEFINE setIdentity(toolVarName : String) FOR gmfgen::EntryBase-»
-«IF id <> null and id.size() != 0-»
+«IF id <> null and id.size() <> 0-»
«toolVarName».setId(«id»);«IF id.isQuoted('\"')»«EXPAND xpt::Common::nonNLS»«ENDIF»
«ENDIF-»
-«ENDDEFINE» \ No newline at end of file
+«ENDDEFINE»

Back to the top