diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractIndentationAwareUiTestLanguageValidator.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractIndentationAwareUiTestLanguageValidator.java index 8928dbe6f..90e15df40 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractIndentationAwareUiTestLanguageValidator.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractIndentationAwareUiTestLanguageValidator.java @@ -20,5 +20,4 @@ public abstract class AbstractIndentationAwareUiTestLanguageValidator extends Ab result.add(org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.IndentationAwareUiTestLanguagePackage.eINSTANCE); return result; } - } diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractPartialContentAssistTestLanguageValidator.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractPartialContentAssistTestLanguageValidator.java index daf45bfab..ee4ace6e1 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractPartialContentAssistTestLanguageValidator.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractPartialContentAssistTestLanguageValidator.java @@ -20,5 +20,4 @@ public abstract class AbstractPartialContentAssistTestLanguageValidator extends result.add(org.eclipse.xtext.ide.tests.testlanguage.partialContentAssistTestLanguage.PartialContentAssistTestLanguagePackage.eINSTANCE); return result; } - } diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractPartialSerializationTestLanguageValidator.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractPartialSerializationTestLanguageValidator.java index d730e8782..b41b4dc77 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractPartialSerializationTestLanguageValidator.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractPartialSerializationTestLanguageValidator.java @@ -21,5 +21,4 @@ public abstract class AbstractPartialSerializationTestLanguageValidator extends result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/emf/2002/Ecore")); return result; } - } diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractTestLanguageValidator.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractTestLanguageValidator.java index 3596476ed..e511299d7 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractTestLanguageValidator.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractTestLanguageValidator.java @@ -20,5 +20,4 @@ public abstract class AbstractTestLanguageValidator extends AbstractDeclarativeV result.add(org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage.eINSTANCE); return result; } - } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractBeeLangTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractBeeLangTestLanguageValidator.java index ac9ddb01e..e16e7b683 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractBeeLangTestLanguageValidator.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractBeeLangTestLanguageValidator.java @@ -16,5 +16,4 @@ public abstract class AbstractBeeLangTestLanguageValidator extends AbstractDecla result.add(org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage.eINSTANCE); return result; } - } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractExBeeLangTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractExBeeLangTestLanguageValidator.java index 90e0d993b..eee12f370 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractExBeeLangTestLanguageValidator.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractExBeeLangTestLanguageValidator.java @@ -15,5 +15,4 @@ public abstract class AbstractExBeeLangTestLanguageValidator extends BeeLangTest result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/2010/tmf/xtext/beeLangTestLanguage")); return result; } - } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractSimpleBeeLangTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractSimpleBeeLangTestLanguageValidator.java index 7803bc643..fa572cf1f 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractSimpleBeeLangTestLanguageValidator.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/validation/AbstractSimpleBeeLangTestLanguageValidator.java @@ -15,5 +15,4 @@ public abstract class AbstractSimpleBeeLangTestLanguageValidator extends BeeLang result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/2010/tmf/xtext/beeLangTestLanguage")); return result; } - } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/validation/AbstractFileAwareTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/validation/AbstractFileAwareTestLanguageValidator.java index b3cbe3ce0..145e59578 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/validation/AbstractFileAwareTestLanguageValidator.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/validation/AbstractFileAwareTestLanguageValidator.java @@ -16,5 +16,4 @@ public abstract class AbstractFileAwareTestLanguageValidator extends AbstractDec result.add(org.eclipse.xtext.testlanguages.fileAware.fileAware.FileAwarePackage.eINSTANCE); return result; } - } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/validation/AbstractNoJdtTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/validation/AbstractNoJdtTestLanguageValidator.java index 43d60af06..15c62aca3 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/validation/AbstractNoJdtTestLanguageValidator.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/validation/AbstractNoJdtTestLanguageValidator.java @@ -16,5 +16,4 @@ public abstract class AbstractNoJdtTestLanguageValidator extends AbstractDeclara result.add(org.eclipse.xtext.testlanguages.noJdt.noJdt.NoJdtPackage.eINSTANCE); return result; } - } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/validation/XtextGrammarTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/validation/XtextGrammarTestLanguageValidator.java index bd3271399..33c4de14e 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/validation/XtextGrammarTestLanguageValidator.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/validation/XtextGrammarTestLanguageValidator.java @@ -16,5 +16,4 @@ public class XtextGrammarTestLanguageValidator extends AbstractDeclarativeValida result.add(org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.XtextGrammarTestPackage.eINSTANCE); return result; } - } diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen index 452e4b196..9ff00bfa1 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen @@ -490,7 +490,7 @@ Export-Package: org.eclipse.xtext, org.eclipse.xtext.xtextTest, org.eclipse.xtext.xtextTest.impl, org.eclipse.xtext.xtextTest.util -Require-Bundle: org.antlr.runtime, +Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.emf.common, org.eclipse.emf.ecore, org.eclipse.xtext, @@ -498,11 +498,5 @@ Require-Bundle: org.antlr.runtime, org.eclipse.xtext.util, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.xbase.testing -Import-Package: org.apache.log4j, - org.hamcrest.core, - org.junit.runner.manipulation;version="4.5.0", - org.junit.runner.notification;version="4.5.0", - org.junit.runner;version="4.5.0", - org.junit.runners.model;version="4.5.0", - org.junit.runners;version="4.5.0", - org.junit;version="4.5.0" +Import-Package: org.apache.log4j +Automatic-Module-Name: org.eclipse.xtext.tests diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java index 4cca96dea..b605cd530 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java @@ -59,7 +59,7 @@ public class SerializationErrorTestLanguageSemanticSequencer extends AbstractDel * Indent returns Indent * * Constraint: - * ((((req=TwoRequired opt=TwoOptions) | opt=TwoOptions)? indent+=Indent+) | indent+=Indent+)? + * ((req=TwoRequired? opt=TwoOptions indent+=Indent+) | (req=TwoRequired? indent+=Indent+) | indent+=Indent+)? */ protected void sequence_Indent(ISerializationContext context, Indent semanticObject) { genericSequencer.createSequence(context, semanticObject);