Changeset 20 in default

Timestamp:

10/29/10 15:39:17 (14 years ago)

Author:

zeiss

Message:

 

Location:

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions

Files:

• GenerateDefaultMergeDSLAction.java (modified) (6 diffs)
• GenerateDeltaBnfAction.java (modified) (4 diffs)

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions/GenerateDefaultMergeDSLAction.java

@@ -42 +42 @@
         private IStructuredSelection selection = StructuredSelection.EMPTY;
         private IFile file=null;
-        private LinkedList<CompositeNode> deltas;
+        private LinkedList<CompositeNode> deltas = null;
         private LinkedList<String> deltaLabels;
         
@@ -116 +116 @@
                                 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 +135 @@
                                                         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 +178 @@
                 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 +195 @@
                         
                         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 +253 @@
                 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);

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/actions/GenerateDeltaBnfAction.java

@@ -221 +221 @@
                 boolean rightSide2=true;
                 
-                while((p<pLeaves.size())){
+                while((p < pLeaves.size())){
                         
                         if(rightSide) {
@@ -239 +239 @@
                         }
                         
-                        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 +294 @@
                         }
                         
-                        else {
+//                      else {
                                 if(last) {
                                         //check if its the end of the extension
@@ -330 +330 @@
                         }
                         
-                }
+//              }
         }