Index: trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions/GenerateDefaultMergeDSLAction.java
===================================================================
--- trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions/GenerateDefaultMergeDSLAction.java	(revision 19)
+++ trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions/GenerateDefaultMergeDSLAction.java	(revision 20)
@@ -42,5 +42,5 @@
 	private IStructuredSelection selection = StructuredSelection.EMPTY;
 	private IFile file=null;
-	private LinkedList<CompositeNode> deltas;
+	private LinkedList<CompositeNode> deltas = null;
 	private LinkedList<String> deltaLabels;
 	
@@ -116,10 +116,10 @@
 				int counter=1;
 				
-				for(int p=0; p<a.length; p++) {
+				for(int p=0; p < a.length; p++) {
 						
 						File b = (File) a[p];
 						if(!b.getFileExtension().equals("bnf"))
 								continue;
-					
+
 						URI ur = URI.createFileURI(b.getRawLocation().toPortableString());
 						
@@ -135,4 +135,5 @@
 							if(((EtsiBnfImpl) xres.getParseResult().getRootNode().getElement()).getType().equals("/delta")) {
 								if(checkImport(xres.getParseResult().getRootNode(), uri.segment(uri.segmentCount()-1))) {
+									
 									deltas.add(xres.getParseResult().getRootNode());
 									deltaLabels.add("Package" + counter);
@@ -177,5 +178,5 @@
 		String name = ((Rule) node.getElement()).getName().trim();
 		
-		for(int i=0; i<deltas.size(); i++) {
+		for(int i=0; i < deltas.size(); i++) {
 			for(AbstractNode node2: NodeUtil.getAllContents(deltas.get(i))){
 				if(node2.getElement() instanceof ExtRule)
@@ -194,12 +195,12 @@
 			
 			boolean start = true;
-			while(rules.size()>0) {
+			while(rules.size() > 0) {
 				current = selectFirstExtension(rules);
-				int index = deltas.indexOf(current.getParent());
+				int index = deltas.indexOf(current.getParent().getParent());
 				if(start) {
 					old = current;
 				} 
 			///	URI uri = current.getElement().eResource().getURI();
-				if((((ExtRule) current.getElement()).getRuleext()!=((ExtRule) old.getElement()).getRuleext())||start) {
+				if((((ExtRule) current.getElement()).getRuleext()!=((ExtRule) old.getElement()).getRuleext()) || start) {
 					
 					createNewLine('\n' + "hook combinator: " + name + " (" +  
@@ -252,4 +253,5 @@
 		int index = 0;
 		for(int i=0; i<rules.size(); i++) {
+			
 			if(((ExtRule) first.getElement()).getRuleext() > ((ExtRule) rules.get(i).getElement()).getRuleext()) {
 				first=rules.get(i);
Index: trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions/GenerateDeltaBnfAction.java
===================================================================
--- trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions/GenerateDeltaBnfAction.java	(revision 19)
+++ trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions/GenerateDeltaBnfAction.java	(revision 20)
@@ -221,5 +221,5 @@
 		boolean rightSide2=true;
 		
-		while((p<pLeaves.size())){
+		while((p < pLeaves.size())){
 			
 			if(rightSide) {
@@ -239,5 +239,5 @@
 			}
 			
-			if(c==cLeaves.size()) {
+			if(c == cLeaves.size()) {
 				if(!(pLeaves.get(p).getGrammarElement() instanceof org.eclipse.xtext.impl.TerminalRuleImpl))
 				temp=temp.concat(pLeaves.get(p).serialize());
@@ -294,5 +294,5 @@
 			}
 			
-			else {
+//			else {
 				if(last) {
 					//check if its the end of the extension
@@ -330,5 +330,5 @@
 			}
 			
-		}
+//		}
 	}