[412438] Fix toString and other anomalies

5 files changed, 99 insertions, 198 deletions

diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2
new file mode 100644
index 000000000..61c11f190
--- /dev/null
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2
@@ -0,0 +1,91 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2011 E.D.Willink and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     E.D.Willink - initial API and implementation
+ *
+ * </copyright>
+ * 
+ * Run As->MWE2 Workflow to regenerate the AST models.
+ */
+module GenerateQVTdASModels
+
+import org.eclipse.ocl.examples.build.utilities.*
+import org.eclipse.ocl.examples.build.xtend.*
+import org.eclipse.qvtd.build.utilities.*
+import org.eclipse.emf.mwe.utils.*
+import org.eclipse.emf.ecore.resource.impl.*
+
+/**
+ *	Generate the Pivot-based Models.
+ */
+Workflow {
+	bean = ResourceSetImpl : resourceSet {}
+    bean = StandaloneSetup { resourceSet = resourceSet
+    	platformUri = ".."
+    	scanClassPath = true
+    }
+    bean = GenModelSetup { resourceSet = resourceSet }
+    bean = UMLGenModelSetup { resourceSet = resourceSet }
+    
+    component = @SubGenerateASModel { resourceSet = resourceSet
+    	projectName = "org.eclipse.qvtd.pivot.qvtbase"
+    	modelName = "QVTbase"
+    	projectPrefix = "QVTbase"
+    	superProjectName = "org.eclipse.ocl.examples.pivot"
+    	superProjectPrefix = ""
+    	modelPackageName = "org.eclipse.qvtd.pivot.qvtbase"
+    	visitorPackageName = "org.eclipse.qvtd.pivot.qvtbase.util"
+    }
+    component = @SubGenerateASModel { resourceSet = resourceSet
+    	projectName = "org.eclipse.qvtd.pivot.qvtcorebase"
+    	modelName = "QVTcoreBase"
+    	projectPrefix = "QVTcoreBase"
+    	superProjectName = "org.eclipse.qvtd.pivot.qvtbase"
+    	superProjectPrefix = "QVTbase"
+    	modelPackageName = "org.eclipse.qvtd.pivot.qvtcorebase"
+    	visitorPackageName = "org.eclipse.qvtd.pivot.qvtcorebase.util"
+    }
+    component = @SubGenerateASModel { resourceSet = resourceSet
+    	projectName = "org.eclipse.qvtd.pivot.qvtcore"
+    	modelName = "QVTcore"
+    	projectPrefix = "QVTcore"
+    	superProjectName = "org.eclipse.qvtd.pivot.qvtcorebase"
+    	superProjectPrefix = "QVTcoreBase"
+    	modelPackageName = "org.eclipse.qvtd.pivot.qvtcore"
+    	visitorPackageName = "org.eclipse.qvtd.pivot.qvtcore.util"
+    }
+    component = @SubGenerateASModel { resourceSet = resourceSet
+    	projectName = "org.eclipse.qvtd.pivot.qvtimperative"
+    	modelName = "QVTimperative"
+    	projectPrefix = "QVTimperative"
+    	superProjectName = "org.eclipse.qvtd.pivot.qvtcorebase"
+    	superProjectPrefix = "QVTcoreBase"
+    	modelPackageName = "org.eclipse.qvtd.pivot.qvtimperative"
+    	visitorPackageName = "org.eclipse.qvtd.pivot.qvtimperative.util"
+    }
+    component = @SubGenerateASModel { resourceSet = resourceSet
+    	projectName = "org.eclipse.qvtd.pivot.qvttemplate"
+    	modelName = "QVTtemplate"
+    	projectPrefix = "QVTtemplate"
+    	superProjectName = "org.eclipse.qvtd.pivot.qvtbase"
+    	superProjectPrefix = "QVTbase"
+    	modelPackageName = "org.eclipse.qvtd.pivot.qvttemplate"
+    	visitorPackageName = "org.eclipse.qvtd.pivot.qvttemplate.util"
+    }
+    component = @SubGenerateASModel { resourceSet = resourceSet
+    	projectName = "org.eclipse.qvtd.pivot.qvtrelation"
+    	modelName = "QVTrelation"
+    	projectPrefix = "QVTrelation"
+    	superProjectName = "org.eclipse.qvtd.pivot.qvttemplate"
+    	superProjectPrefix = "QVTtemplate"
+    	modelPackageName = "org.eclipse.qvtd.pivot.qvtrelation"
+    	visitorPackageName = "org.eclipse.qvtd.pivot.qvtrelation.util"
+    }
+}
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2
index 8af68fdf8..8cac966ef 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2
@@ -20,8 +20,8 @@ module GenerateQVTdAll
  * Generate all auto-generated files for the QVTd Editors
  */
 Workflow {
-  component = @GenerateQVTdPivotModels {}
-  component = @GenerateQVTdXtextModels {}
+  component = @GenerateQVTdASModels {}
+  component = @GenerateQVTdCSModels {}
   component = @GenerateQVTdCGModels {}
   component = @GenerateQVTcoreBaseEditor {}
   component = @GenerateQVTcoreEditor {}
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdCGModels.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdCGModels.mwe2
index b32cccef0..1cc0fa315 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdCGModels.mwe2
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdCGModels.mwe2
@@ -31,20 +31,8 @@ Workflow {
 	bean = ResourceSetImpl : resourceSet {}
     bean = StandaloneSetup { resourceSet = resourceSet
     	platformUri = ".."
-    	scanClassPath = true			// But we do need to search the plugin-space
+    	scanClassPath = true
     	registerGeneratedEPackage = "org.eclipse.xtext.common.types.TypesPackage"
-/*    	uriMap = Mapping {
-    		from = "platform:/plugin/org.eclipse.emf.ecore/"
-    		to = "platform:/resource/org.eclipse.emf.ecore/"
-    	}
-    	uriMap = Mapping {
-    		from = "platform:/plugin/org.eclipse.ocl.examples.pivot/"
-    		to = "platform:/resource/org.eclipse.ocl.examples.pivot/"
-    	}
-    	uriMap = Mapping {
-    		from = "platform:/plugin/org.eclipse.ocl.examples.xtext.base/"
-    		to = "platform:/resource/org.eclipse.ocl.examples.xtext.base/"
-    	} */
     }
     bean = GenModelSetup { resourceSet = resourceSet }
     bean = UMLGenModelSetup { resourceSet = resourceSet }
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdXtextModels.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdCSModels.mwe2
index 0344f1a0e..6c1e75e83 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdXtextModels.mwe2
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdCSModels.mwe2
@@ -11,12 +11,10 @@
  *     E.D.Willink - initial API and implementation
  *
  * </copyright>
- *
- * $Id: GenerateXtextModels.mwe2,v 1.2 2011/01/24 20:54:27 ewillink Exp $
  * 
  * Run As->MWE2 Workflow to regenerate the Xtest CST models.
  */
-module GenerateQVTdXtextModels
+module GenerateQVTdCSModels
 
 import org.eclipse.ocl.examples.build.utilities.*
 import org.eclipse.ocl.examples.build.xtend.*
@@ -34,7 +32,7 @@ Workflow {
     }
     bean = GenModelSetup { resourceSet = resourceSet }
     bean = UMLGenModelSetup { resourceSet = resourceSet }
-    component = @SubGenerateXtextModel { resourceSet = resourceSet
+    component = @SubGenerateCSModel { resourceSet = resourceSet
     	projectName = "org.eclipse.qvtd.xtext.qvtcorebase"
     	modelName = "QVTcoreBaseCST"
     	projectPrefix = "QVTcoreBase"
@@ -43,7 +41,7 @@ Workflow {
     	modelPackageName = "org.eclipse.qvtd.xtext.qvtcorebasecst"
     	visitorPackageName = "org.eclipse.qvtd.xtext.qvtcorebasecst.util"
     }
-    component = @SubGenerateXtextModel { resourceSet = resourceSet
+    component = @SubGenerateCSModel { resourceSet = resourceSet
     	projectName = "org.eclipse.qvtd.xtext.qvtimperative"
     	modelName = "QVTimperativeCST"
     	projectPrefix = "QVTimperative"
@@ -53,7 +51,7 @@ Workflow {
     	visitorPackageName = "org.eclipse.qvtd.xtext.qvtimperativecst.util"
     	superVisitorPackageName = "org.eclipse.qvtd.xtext.qvtcorebasecst.util"
     }
-    component = @SubGenerateXtextModel { resourceSet = resourceSet
+    component = @SubGenerateCSModel { resourceSet = resourceSet
     	projectName = "org.eclipse.qvtd.xtext.qvtcore"
     	modelName = "QVTcoreCST"
     	projectPrefix = "QVTcore"
@@ -63,7 +61,7 @@ Workflow {
     	visitorPackageName = "org.eclipse.qvtd.xtext.qvtcorecst.util"
     	superVisitorPackageName = "org.eclipse.qvtd.xtext.qvtcorebasecst.util"
     }
-    component = @SubGenerateXtextModel { resourceSet = resourceSet
+    component = @SubGenerateCSModel { resourceSet = resourceSet
     	projectName = "org.eclipse.qvtd.xtext.qvtrelation"
     	modelName = "QVTrelationCST"
     	projectPrefix = "QVTrelation"
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdPivotModels.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdPivotModels.mwe2
deleted file mode 100644
index 829259126..000000000
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdPivotModels.mwe2
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2011 E.D.Willink and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     E.D.Willink - initial API and implementation
- *
- * </copyright>
- *
- * $Id: GenerateXtextModels.mwe2,v 1.2 2011/01/24 20:54:27 ewillink Exp $
- * 
- * Run As->MWE2 Workflow to regenerate the Xtest CST models.
- */
-module GenerateQVTdPivotModels
-
-import org.eclipse.ocl.examples.build.utilities.*
-import org.eclipse.ocl.examples.build.xtend.*
-import org.eclipse.qvtd.build.utilities.*
-import org.eclipse.emf.mwe.utils.*
-import org.eclipse.emf.ecore.resource.impl.*
-
-var emf.gen.suffix = "emf-gen"
-var util.suffix = "util"
-
-var pivot.path = "org.eclipse.ocl.examples.pivot"
-var QVTbase = "QVTbase"
-var qvtbase.path = "org.eclipse.qvtd.pivot.qvtbase"
-var QVTcore = "QVTcore"
-var qvtcore.path = "org.eclipse.qvtd.pivot.qvtcore"
-var QVTcoreBase = "QVTcoreBase"
-var qvtcorebase.path = "org.eclipse.qvtd.pivot.qvtcorebase"
-var QVTimperative = "QVTimperative"
-var qvtimperative.path = "org.eclipse.qvtd.pivot.qvtimperative"
-var QVTrelation = "QVTrelation"
-var qvtrelation.path = "org.eclipse.qvtd.pivot.qvtrelation"
-var QVTtemplate = "QVTtemplate"
-var qvttemplate.path = "org.eclipse.qvtd.pivot.qvttemplate"
-var Visitable = "Visitable"
-var Visitor = "Visitor"
-
-/**
- *	Generate the Pivot-based Models.
- */
-Workflow {
-	bean = ResourceSetImpl : resourceSet {}
-    bean = StandaloneSetup { resourceSet = resourceSet
-    	platformUri = ".."
-    	scanClassPath = true
-    }
-    bean = GenModelSetup { resourceSet = resourceSet }
-    bean = UMLGenModelSetup { resourceSet = resourceSet }
-    
-     // Weaving the Visitor Pattern on 
-/* 	component = DerivedVisitorPatternWeaver {
-    	resourceSet = resourceSet
-    	in = "platform:/resource/${qvtbase.path}/model/${QVTbase}.ecore" 
-    	rootVisitorInterfaceName = "${Visitor}"
-    	rootVisitorInterfaceQualifiedName = "${pivot.path}.${Visitor}"
-    	superVisitorInterfaceName = "${Visitor}"
-    	superVisitorInterfaceQualifiedName = "${pivot.path}.${Visitor}"
-    	derivedVisitorInterfaceName = "${QVTbase}${Visitor}"
-    	derivedVisitorInterfaceQualifiedName = "${qvtbase.path}.${QVTbase}${Visitor}"
-//    	visitableInterfaceName = "${Visitable}"
-//    	visitableInterfaceQualifiedName = "${pivot.path}.${util.suffix}.${Visitable}"
-    } */
-    
-    component = GenerateModel { resourceSet = resourceSet skipOnErrors = true
-    	genModel = "/${qvtbase.path}/model/${QVTbase}.genmodel" 	
-    }
-    component = GenerateModel { resourceSet = resourceSet skipOnErrors = true
-    	genModel = "/${qvtcorebase.path}/model/${QVTcoreBase}.genmodel"
-    }
-    component = GenerateModel { resourceSet = resourceSet skipOnErrors = true
-    	genModel = "/${qvtcore.path}/model/${QVTcore}.genmodel"
-    }
-    component = GenerateModel { resourceSet = resourceSet skipOnErrors = true
-    	genModel = "/${qvtimperative.path}/model/${QVTimperative}.genmodel"
-    }
-    component = GenerateModel { resourceSet = resourceSet skipOnErrors = true
-    	genModel = "/${qvttemplate.path}/model/${QVTtemplate}.genmodel"
-    }
-    component = GenerateModel { resourceSet = resourceSet skipOnErrors = true
-    	genModel = "/${qvtrelation.path}/model/${QVTrelation}.genmodel"
-    }
-    component = GeneratePivotVisitors { resourceSet = resourceSet
-    	projectName = "${qvtbase.path}"
-    	genModelFile = "model/${QVTbase}.genmodel"
-    	javaFolder = "${emf.gen.suffix}"
-    	modelPackageName = "${qvtbase.path}"
-    	visitorPackageName = "${qvtbase.path}.${util.suffix}"    	
-    	visitorClassName = "${QVTbase}${Visitor}"
-    	superVisitorPackageName = "${pivot.path}.${util.suffix}"
-    	superVisitorClassName = "${Visitor}"
-    	visitablePackageName = "${pivot.path}.${util.suffix}"
-    	visitableClassName = "${Visitable}"
-    }
-    component = GeneratePivotVisitors { resourceSet = resourceSet
-    	projectName = "${qvtcorebase.path}"
-    	genModelFile = "model/${QVTcoreBase}.genmodel"
-    	javaFolder = "${emf.gen.suffix}"
-    	modelPackageName = "${qvtcorebase.path}"
-    	visitorPackageName = "${qvtcorebase.path}.${util.suffix}"
-    	visitorClassName = "${QVTcoreBase}${Visitor}"
-    	superVisitorPackageName = "${qvtbase.path}.${util.suffix}"
-    	superVisitorClassName = "${QVTbase}${Visitor}"
-    	visitablePackageName = "${pivot.path}.${util.suffix}"
-    	visitableClassName = "${Visitable}"
-    }
-    component = GeneratePivotVisitors { resourceSet = resourceSet
-    	projectName = "${qvtcore.path}"
-    	genModelFile = "model/${QVTcore}.genmodel"
-    	javaFolder = "${emf.gen.suffix}"
-    	modelPackageName = "${qvtcore.path}"
-    	visitorPackageName = "${qvtcore.path}.${util.suffix}"
-    	visitorClassName = "${QVTcore}${Visitor}"
-    	superVisitorPackageName = "${qvtcorebase.path}.${util.suffix}"
-    	superVisitorClassName = "${QVTcoreBase}${Visitor}"
-    	visitablePackageName = "${pivot.path}.${util.suffix}"
-    	visitableClassName = "${Visitable}"
-    }
-     component = GeneratePivotVisitors { resourceSet = resourceSet
-    	projectName = "${qvtimperative.path}"
-    	genModelFile = "model/${QVTimperative}.genmodel"
-    	javaFolder = "${emf.gen.suffix}"
-    	modelPackageName = "${qvtimperative.path}"
-    	visitorPackageName = "${qvtimperative.path}.${util.suffix}"
-    	visitorClassName = "${QVTimperative}${Visitor}"
-    	superVisitorPackageName = "${qvtcorebase.path}.${util.suffix}"
-    	superVisitorClassName = "${QVTcoreBase}${Visitor}"
-    	visitablePackageName = "${pivot.path}.${util.suffix}"
-    	visitableClassName = "${Visitable}"
-    }
-/*     component = OCLExtenderVisitorPatternWeaverComponent {
-    	resourceSet = resourceSet
-    	uri = "/org.eclipse.ocl.examples.build/qvtoTransf/DerivedVisitorPatternTransf.qvto"
-    	in = "/${qvtimperative.path}/model/${QVTimperative}.ecore" 
-    	in = "/${qvtimperative.path}/model/${QVTbase}.ecore"
-    	in = "/${pivot.path}/model/Pivot.ecore"
-    	baseVisitorInterfaceName = "${Visitor}"
-    	baseVisitorInterfaceQualifiedName = "${pivot.path}.${util.suffix}.${Visitor}"
-    	superVisitorInterfaceName = "${QVTbase}${Visitor}"
-    	superVisitorInterfaceQualifiedName = "org.eclipse.qvtd.pivot.imperativeocl.${util.suffix}.ImperativeOCLVisitor"
-    	derivedVisitorInterfaceName = "${QVTimperative}${Visitor}"
-    	derivedVisitorInterfaceQualifiedName = "${qvtimperative.path}.${util.suffix}.QVTOperationalVisitor"
-    } */
-    component = GeneratePivotVisitors { resourceSet = resourceSet
-    	projectName = "${qvttemplate.path}"
-    	genModelFile = "model/${QVTtemplate}.genmodel"
-    	javaFolder = "${emf.gen.suffix}"
-    	modelPackageName = "${qvttemplate.path}"
-    	visitorPackageName = "${qvttemplate.path}.${util.suffix}"
-    	visitorClassName = "${QVTtemplate}${Visitor}"
-    	superVisitorPackageName = "${qvtbase.path}.${util.suffix}"
-    	superVisitorClassName = "${QVTbase}${Visitor}"
-    	visitablePackageName = "${pivot.path}.${util.suffix}"
-    	visitableClassName = "${Visitable}"
-    }
-    component = GeneratePivotVisitors { resourceSet = resourceSet
-    	projectName = "${qvtrelation.path}"
-    	genModelFile = "model/${QVTrelation}.genmodel"
-    	javaFolder = "${emf.gen.suffix}"
-    	modelPackageName = "${qvtrelation.path}"
-    	visitorPackageName = "${qvtrelation.path}.${util.suffix}"
-    	visitorClassName = "${QVTrelation}${Visitor}"
-    	superVisitorPackageName = "${qvttemplate.path}.${util.suffix}"
-    	superVisitorClassName = "${QVTtemplate}${Visitor}"
-    	visitablePackageName = "${pivot.path}.${util.suffix}"
-    	visitableClassName = "${Visitable}"
-    }
-}
-