fixed generators for test and example languages

eclipse-xtext · Apr 20, 2024 · 08f234d · 08f234d
1 parent 73bd158
commit 08f234d
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 11 deletions.
diff --git a/org.eclipse.xtext.builder.standalone.tests/build.properties b/org.eclipse.xtext.builder.standalone.tests/build.properties
@@ -4,4 +4,5 @@ bin.includes = .,\
                model/,\
                META-INF/,\
                plugin.xml
-
+additional.bundles = org.eclipse.emf.mwe2.launch,\
+                     org.eclipse.xtext.xtext.generator
diff --git a/.../eclipse/xtext/builder/tests/builderTestLanguage/impl/BuilderTestLanguagePackageImpl.java b/.../eclipse/xtext/builder/tests/builderTestLanguage/impl/BuilderTestLanguagePackageImpl.java
@@ -72,7 +72,6 @@ private BuilderTestLanguagePackageImpl()
   {
     super(eNS_URI, BuilderTestLanguageFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->

diff --git a/.../eclipse/xtext/builder/tests/builderTestLanguage/impl/BuilderTestLanguagePackageImpl.java b/.../eclipse/xtext/builder/tests/builderTestLanguage/impl/BuilderTestLanguagePackageImpl.java
@@ -77,7 +77,6 @@ private BuilderTestLanguagePackageImpl()
   {
     super(eNS_URI, BuilderTestLanguageFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->

diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen
@@ -28,6 +28,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
  org.eclipse.xtext,
- org.eclipse.xtext.xbase.lib;bundle-version="2.34.0"
+ org.eclipse.xtext.xbase.lib;bundle-version="2.35.0"
 Import-Package: org.apache.log4j
 Automatic-Module-Name: org.eclipse.xtext.extras.tests
diff --git a/org.eclipse.xtext.extras.tests/build.properties b/org.eclipse.xtext.extras.tests/build.properties
@@ -6,5 +6,5 @@ bin.includes = META-INF/,\
                .,\
                about.html
 src.includes = about.html
-
-
+additional.bundles = org.eclipse.emf.mwe2.launch,\
+                     org.eclipse.xtext.xtext.generator
diff --git a/.../enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguagePackageImpl.java b/.../enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguagePackageImpl.java
@@ -63,7 +63,6 @@ private EnumAndReferenceTestLanguagePackageImpl()
   {
     super(eNS_URI, EnumAndReferenceTestLanguageFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->

diff --git a/.../eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java b/.../eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
@@ -63,7 +63,6 @@ private EnumRulesTestLanguagePackageImpl()
   {
     super(eNS_URI, EnumRulesTestLanguageFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->

diff --git a/...ts/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsPackageImpl.java b/...ts/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsPackageImpl.java
@@ -61,7 +61,6 @@ private MultiRuleenumsPackageImpl()
   {
     super(eNS_URI, MultiRuleenumsFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->

diff --git a/org.eclipse.xtext.web.example.entities/pom.xml b/org.eclipse.xtext.web.example.entities/pom.xml
@@ -27,6 +27,11 @@
 			<version>${project.version}</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.emf</groupId>
+			<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...c-gen/org/eclipse/xtext/web/example/entities/domainmodel/impl/DomainmodelPackageImpl.java b/...c-gen/org/eclipse/xtext/web/example/entities/domainmodel/impl/DomainmodelPackageImpl.java
@@ -107,7 +107,6 @@ private DomainmodelPackageImpl()
   {
     super(eNS_URI, DomainmodelFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->

diff --git a/org.eclipse.xtext.web.example.statemachine/pom.xml b/org.eclipse.xtext.web.example.statemachine/pom.xml
@@ -27,6 +27,11 @@
 			<version>${project.version}</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.emf</groupId>
+			<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...org/eclipse/xtext/web/example/statemachine/statemachine/impl/StatemachinePackageImpl.java b/...org/eclipse/xtext/web/example/statemachine/statemachine/impl/StatemachinePackageImpl.java
@@ -117,7 +117,6 @@ private StatemachinePackageImpl()
   {
     super(eNS_URI, StatemachineFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,6 @@ private BuilderTestLanguagePackageImpl() @@
       {
         super(eNS_URI, BuilderTestLanguageFactory.eINSTANCE);
       }
       /**
        * <!-- begin-user-doc -->
        * <!-- end-user-doc -->
@@ Expand Down @@