Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/AbstractEbnfUiModule.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/AbstractEbnfUiModule.java	(revision 64)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/AbstractEbnfUiModule.java	(revision 65)
@@ -39,27 +39,7 @@
 	}
 
-	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
 	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
 		return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() {
-		return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() {
-		return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class;
 	}
 
@@ -154,59 +134,4 @@
 	}
 
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtBasedSimpleTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider> bindITypesProposalProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtTypesProposalProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider> bindIJavaProjectProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.XtextResourceSetBasedProjectProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper> bindIHyperlinkHelper() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareHyperlinkHelper.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
-		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider.ReferenceProposalCreator> bindAbstractJavaBasedContentProposalProvider$ReferenceProposalCreator() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareReferenceProposalCreator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IValidationJobScheduler> bindIValidationJobScheduler() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtValidationJobScheduler.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.impl.RefactoringResourceSetProvider> bindRefactoringResourceSetProvider() {
-		return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
-		return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
-	}
-
 	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
 	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/quickfix/EbnfQuickfixProvider.xtend
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/quickfix/EbnfQuickfixProvider.xtend	(revision 64)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/quickfix/EbnfQuickfixProvider.xtend	(revision 65)
@@ -27,4 +27,6 @@
  */
 class EbnfQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {
+
+	//*****************************************************************************************
 	//works
 	@Fix(EbnfValidator.ruleReferencedOneDescription)
@@ -37,4 +39,5 @@
 		) [ element, context |
 			var Rule rule = element as Rule;
+			
 			var IXtextDocument xtextDocument = context.getXtextDocument();
 			var ICompositeNode node = NodeModelUtils.findActualNodeFor(rule);
@@ -50,5 +53,5 @@
 			var boolean foundRule = false;
 			var EObject r = references.get(0) as EObject;
-			var Rule containingRule=null;
+			var Rule containingRule = null;
 			while (!foundRule) {
 				r = r.eContainer;
@@ -69,52 +72,53 @@
 				}
 			}
-		
-
-		// delete rule
-		xtextDocument.replace(offset, textLength, "");
+			// delete rule
+			xtextDocument.replace(offset, textLength, "");
 		]
 
 	}
 
+	//*****************************************************************************************
+	
+	//		@Fix(EbnfValidator.passthroughRuleDescription)
+	//	def void fixRemovePassthroughRule(Issue issue, IssueResolutionAcceptor acceptor) {
+	//		acceptor.accept(
+	//			issue,
+	//			"Remove passthrough rule",
+	//			"Delete the passthrough rule and replace its references with its right side",
+	//			"upcase.png",
+	//			[ element, context |
+	//				var Rule rule = element as Rule;
+	//				var IXtextDocument xtextDocument = context.getXtextDocument();
+	//				var ICompositeNode node = NodeModelUtils.findActualNodeFor(rule);
+	//				var String nodeText = node.text;
+	//				var int textLength = nodeText.length - 2;
+	//				var int offset = node.textRegion.offset;
+	//				var ICompositeNode dList = NodeModelUtils.findActualNodeFor(rule.definitionList);
+	//				var String refText = "(" + dList.text + ")";
+	//				var int refLength = rule.name.length;
+	//				var List<RuleReference> references = EbnfAnalysisUtils.findReferences(rule);
+	//				//sort references by offset
+	//				var int i = 0;
+	//				var List<RuleReference> referenceHleper = new ArrayList<RuleReference>();
+	//				while(i<references.length){
+	//					
+	//					i++;
+	//				}
+	//				for (ruleRef : references) {
+	//					var ICompositeNode refNode = NodeModelUtils.findActualNodeFor(ruleRef);
+	//					var int refOffset = refNode.textRegion.offset;
+	//
+	//					xtextDocument.replace(refOffset, refLength, refText);
+	//					if (refOffset < offset) {
+	//						offset += refText.length - refLength;
+	//					}
+	//				}
+	//			]
+	//		);
+	//	}
+	
+	//*****************************************************************************************
 	//works
-//		@Fix(EbnfValidator.passthroughRuleDescription)
-//	def void fixRemovePassthroughRule(Issue issue, IssueResolutionAcceptor acceptor) {
-//		acceptor.accept(
-//			issue,
-//			"Remove passthrough rule",
-//			"Delete the passthrough rule and replace its references with its right side",
-//			"upcase.png",
-//			[ element, context |
-//				var Rule rule = element as Rule;
-//				var IXtextDocument xtextDocument = context.getXtextDocument();
-//				var ICompositeNode node = NodeModelUtils.findActualNodeFor(rule);
-//				var String nodeText = node.text;
-//				var int textLength = nodeText.length - 2;
-//				var int offset = node.textRegion.offset;
-//				var ICompositeNode dList = NodeModelUtils.findActualNodeFor(rule.definitionList);
-//				var String refText = "(" + dList.text + ")";
-//				var int refLength = rule.name.length;
-//				var List<RuleReference> references = EbnfAnalysisUtils.findReferences(rule);
-//				//sort references by offset
-//				var int i = 0;
-//				var List<RuleReference> referenceHleper = new ArrayList<RuleReference>();
-//				while(i<references.length){
-//					
-//					i++;
-//				}
-//				for (ruleRef : references) {
-//					var ICompositeNode refNode = NodeModelUtils.findActualNodeFor(ruleRef);
-//					var int refOffset = refNode.textRegion.offset;
-//
-//					xtextDocument.replace(refOffset, refLength, refText);
-//					if (refOffset < offset) {
-//						offset += refText.length - refLength;
-//					}
-//				}
-//			]
-//		);
-//	}
-
-		@Fix(EbnfValidator.unusedRuleDescription)
+	@Fix(EbnfValidator.unusedRuleDescription)
 	def void fixUnusedRule(Issue issue, IssueResolutionAcceptor acceptor) {
 
@@ -131,3 +135,2 @@
 	}
 }
-		
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/contentassist/EbnfProposalProvider.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/contentassist/EbnfProposalProvider.java	(revision 64)
+++ 	(revision )
@@ -1,13 +1,0 @@
-/**
- * generated by Xtext
- */
-package de.ugoe.cs.swe.bnftools.ui.contentassist;
-
-import de.ugoe.cs.swe.bnftools.ui.contentassist.AbstractEbnfProposalProvider;
-
-/**
- * see http://www.eclipse.org/Xtext/documentation.html#contentAssist on how to customize content assistant
- */
-@SuppressWarnings("all")
-public class EbnfProposalProvider extends AbstractEbnfProposalProvider {
-}
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfDescriptionLabelProvider.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfDescriptionLabelProvider.java	(revision 64)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/**
- * generated by Xtext
- */
-package de.ugoe.cs.swe.bnftools.ui.labeling;
-
-import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider;
-
-/**
- * Provides labels for a IEObjectDescriptions and IResourceDescriptions.
- * 
- * see http://www.eclipse.org/Xtext/documentation.html#labelProvider
- */
-@SuppressWarnings("all")
-public class EbnfDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
-}
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfLabelProvider.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfLabelProvider.java	(revision 64)
+++ 	(revision )
@@ -1,21 +1,0 @@
-/**
- * generated by Xtext
- */
-package de.ugoe.cs.swe.bnftools.ui.labeling;
-
-import com.google.inject.Inject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;
-
-/**
- * Provides labels for a EObjects.
- * 
- * see http://www.eclipse.org/Xtext/documentation.html#labelProvider
- */
-@SuppressWarnings("all")
-public class EbnfLabelProvider extends DefaultEObjectLabelProvider {
-  @Inject
-  public EbnfLabelProvider(final AdapterFactoryLabelProvider delegate) {
-    super(delegate);
-  }
-}
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/outline/EbnfOutlineTreeProvider.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/outline/EbnfOutlineTreeProvider.java	(revision 64)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/**
- * generated by Xtext
- */
-package de.ugoe.cs.swe.bnftools.ui.outline;
-
-import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
-
-/**
- * Customization of the default outline structure.
- * 
- * see http://www.eclipse.org/Xtext/documentation.html#outline
- */
-@SuppressWarnings("all")
-public class EbnfOutlineTreeProvider extends DefaultOutlineTreeProvider {
-}
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/quickfix/EbnfQuickfixProvider.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/xtend-gen/de/ugoe/cs/swe/bnftools/ui/quickfix/EbnfQuickfixProvider.java	(revision 64)
+++ 	(revision )
@@ -1,16 +1,0 @@
-/**
- * generated by Xtext
- */
-package de.ugoe.cs.swe.bnftools.ui.quickfix;
-
-import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider;
-
-/**
- * Custom quickfixes.
- * 
- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes
- */
-@SuppressWarnings("all")
-public class EbnfQuickfixProvider extends DefaultQuickfixProvider {
-  private final static String ruleReferencedOneDescription = "The rule is only referenced by one other rule";
-}