From 2d24d81e087346971f850a64ffccfd10c22107d5 Mon Sep 17 00:00:00 2001
From: Sven Efftinge <sven.efftinge@itemis.de>
Date: Thu, 12 Nov 2015 18:04:32 +0100
Subject: [PATCH] migrated SuperTestLanguage and SubTestLanguage

---
 .../model/generated/SubTestLanguage.ecore        | 12 ++++++++++++
 .../model/generated/SubTestLanguage.genmodel     | 15 +++++++++++++++
 .../model/generated/SuperTestLanguage.ecore      | 11 +++++++++++
 .../model/generated/SuperTestLanguage.genmodel   | 16 ++++++++++++++++
 .../eclipse/xtext/GenerateAllTestLanguages2.mwe2 |  6 +++---
 .../src/org/eclipse/xtext/TestLanguage.xtend     |  3 +++
 .../SubTestLanguageSemanticSequencer.java        |  8 ++++++++
 .../SubTestLanguageSyntacticSequencer.java       |  8 ++++++++
 8 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore
 create mode 100644 tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel
 create mode 100644 tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore
 create mode 100644 tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel
 create mode 100644 tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSemanticSequencer.java
 create mode 100644 tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSyntacticSequencer.java

diff --git a/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore b/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore
new file mode 100644
index 000000000..564a3db99
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="subPackage" nsURI="http://www.eclipse.org/2009/tmf/xtext/SubTestLanguage"
+    nsPrefix="subPackage">
+  <eClassifiers xsi:type="ecore:EClass" name="SubMain">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="superMains" upperBound="-1"
+        eType="ecore:EClass SuperTestLanguage.ecore#//SuperMain" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="another" eType="#//AnotherSuperMain"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AnotherSuperMain" eSuperTypes="SuperTestLanguage.ecore#//AnotherSuperMain"/>
+</ecore:EPackage>
diff --git a/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel b/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel
new file mode 100644
index 000000000..0f44ed9ca
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
+    modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SubTestLanguage"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.11" usedGenPackages="SuperTestLanguage.genmodel#//superPackage">
+  <genPackages prefix="SubPackage" basePackage="org.eclipse.xtext.generator.ecore"
+      disposableProviderFactory="true" fileExtensions="subtestlanguage" ecorePackage="SubTestLanguage.ecore#/">
+    <genClasses ecoreClass="SubTestLanguage.ecore#//SubMain">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SubTestLanguage.ecore#//SubMain/superMains"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SubTestLanguage.ecore#//SubMain/another"/>
+    </genClasses>
+    <genClasses ecoreClass="SubTestLanguage.ecore#//AnotherSuperMain"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore b/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore
new file mode 100644
index 000000000..d7e5d0659
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="superPackage" nsURI="http://www.eclipse.org/2009/tmf/xtext/SuperTestLanguage"
+    nsPrefix="superPackage">
+  <eClassifiers xsi:type="ecore:EClass" name="SuperMain">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AnotherSuperMain">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel b/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel
new file mode 100644
index 000000000..adbb3fdde
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
+    modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SuperTestLanguage"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.11" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+  <genPackages prefix="SuperPackage" basePackage="org.eclipse.xtext.generator.ecore"
+      disposableProviderFactory="true" fileExtensions="supertestlanguage" ecorePackage="SuperTestLanguage.ecore#/">
+    <genClasses ecoreClass="SuperTestLanguage.ecore#//SuperMain">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SuperTestLanguage.ecore#//SuperMain/name"/>
+    </genClasses>
+    <genClasses ecoreClass="SuperTestLanguage.ecore#//AnotherSuperMain">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SuperTestLanguage.ecore#//AnotherSuperMain/name"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2
index a2589edbb..1eb273c40 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2
@@ -90,9 +90,9 @@ Workflow {
 		language = TestLanguage {
 			name = "org.eclipse.xtext.generator.ecore.SuperTestLanguage"
 		}
-//		language = TestLanguage {
-//			name = "org.eclipse.xtext.generator.ecore.SubTestLanguage"
-//		}
+		language = TestLanguage {
+			name = "org.eclipse.xtext.generator.ecore.SubTestLanguage"
+		}
 //		language = TestLanguage {
 //			name = "org.eclipse.xtext.XtextGrammarTestLanguage"
 //		}
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend
index 60f59ab86..7b4a51c14 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend
@@ -34,6 +34,9 @@ class TestLanguage extends XtextGeneratorLanguage {
 	EMFGeneratorFragment2 emfGenerator = new EMFGeneratorFragment2
 	XtextAntlrGeneratorFragment2 parserGenerator = new XtextAntlrGeneratorFragment2  => [
 		debugGrammar = true
+		options => [
+			classSplitting = true
+		]
 	]
 	XtextAntlrIDEAGeneratorFragment ideaParser = new XtextAntlrIDEAGeneratorFragment
 	
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSemanticSequencer.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSemanticSequencer.java
new file mode 100644
index 000000000..75227388a
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSemanticSequencer.java
@@ -0,0 +1,8 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.xtext.generator.ecore.serializer;
+
+
+public class SubTestLanguageSemanticSequencer extends AbstractSubTestLanguageSemanticSequencer {
+}
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSyntacticSequencer.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSyntacticSequencer.java
new file mode 100644
index 000000000..558dfcb0b
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSyntacticSequencer.java
@@ -0,0 +1,8 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.xtext.generator.ecore.serializer;
+
+
+public class SubTestLanguageSyntacticSequencer extends AbstractSubTestLanguageSyntacticSequencer {
+}