Changeset 18 in default for trunk/de.ugoe.cs.swe.bnftools.ebnf.ui

Timestamp:

10/26/10 11:53:37 (14 years ago)

Author:

zeiss

Message:

 

Location:

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

Files:

• autorenumber/AutoRenumberRefactoringProcessor.java (modified) (3 diffs)
• inlinesinglereferencedrules/InlineSingleReferencedRulesRefactoringHandler.java (modified) (2 diffs)
• inlinetokenrules/InlineTokenRulesRefactoringHandler.java (modified) (2 diffs)
• removeunusedrules/RemoveUnusedRulesRefactoringHandler.java (modified) (2 diffs)
• replacepassthroughrules/ReplaceAllPassthroughRulesRefactoringHandler.java (modified) (2 diffs)
• uppercasetokenrules/UppercaseTokenRulesRefactoringHandler.java (modified) (2 diffs)

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/refactoring/autorenumber/AutoRenumberRefactoringProcessor.java

@@ -5 +5 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.ltk.core.refactoring.Change;
@@ -19 +20 @@
 import org.eclipse.xtext.parsetree.AbstractNode;
 import org.eclipse.xtext.parsetree.CompositeNode;
+import org.eclipse.xtext.parsetree.NodeUtil;
 import org.eclipse.xtext.ui.editor.XtextEditor;
 import org.eclipse.xtext.ui.editor.model.XtextDocument;
 
-import de.ugoe.cs.swe.bnftools.ebnf.Rule;
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
 
 public class AutoRenumberRefactoringProcessor extends RefactoringProcessor {
@@ -113 +115 @@
                 for (int i=0; i < rootNode.getChildren().size(); i++) {
                         AbstractNode child = rootNode.getChildren().get(i);
-                        if (!(child.getElement() instanceof Rule))
+                        EObject element = child.getElement();
+                        if (!(element instanceof BnfEntry))
                                 continue;
+                        BnfEntry bnfEntry = (BnfEntry) element;
+                        if (bnfEntry.getRule() == null)
+                                continue;
+                        
+                        child = NodeUtil.getNodeAdapter(bnfEntry.getRule()).getParserNode();
+                        
                         String ruleText;
                         try {

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/refactoring/inlinesinglereferencedrules/InlineSingleReferencedRulesRefactoringHandler.java

@@ -22 +22 @@
 import com.google.inject.Inject;
 
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.Rule;
 import de.ugoe.cs.swe.bnftools.ui.quickfix.processors.InlineRulesProcessor;
@@ -52 +53 @@
                 for (int i=0; i < rootNode.getParserNode().getChildren().size(); i++) {
                         AbstractNode currentNode = rootNode.getParserNode().getChildren().get(i);
+
+                        EObject element = currentNode.getElement();
+                        if (!(element instanceof BnfEntry))
+                                continue;
+                        BnfEntry bnfEntry = (BnfEntry) element;
+                        if (bnfEntry.getRule() == null)
+                                continue;
+                        
+                        currentNode = NodeUtil.getNodeAdapter(bnfEntry.getRule()).getParserNode();
+
                         if (currentNode.getElement() instanceof Rule) {
                                 Rule rule = (Rule) currentNode.getElement();

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/refactoring/inlinetokenrules/InlineTokenRulesRefactoringHandler.java

@@ -23 +23 @@
 
 import de.ugoe.cs.swe.bnftools.analysis.EbnfAnalysisUtils;
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.Rule;
 import de.ugoe.cs.swe.bnftools.ui.refactoring.generic.GenericRefactoring;
@@ -51 +52 @@
                 for (int i=0; i < rootNode.getParserNode().getChildren().size(); i++) {
                         AbstractNode currentNode = rootNode.getParserNode().getChildren().get(i);
+
+                        EObject element = currentNode.getElement();
+                        if (!(element instanceof BnfEntry))
+                                continue;
+                        BnfEntry bnfEntry = (BnfEntry) element;
+                        if (bnfEntry.getRule() == null)
+                                continue;
+                        
+                        currentNode = NodeUtil.getNodeAdapter(bnfEntry.getRule()).getParserNode();
+
                         if (currentNode.getElement() instanceof Rule) {
                                 Rule rule = (Rule) currentNode.getElement();

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/refactoring/removeunusedrules/RemoveUnusedRulesRefactoringHandler.java

@@ -22 +22 @@
 import com.google.inject.Inject;
 
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.Rule;
 import de.ugoe.cs.swe.bnftools.ui.quickfix.processors.RemoveUnusedRulesProcessor;
@@ -52 +53 @@
                 for (int i=0; i < rootNode.getParserNode().getChildren().size(); i++) {
                         AbstractNode currentNode = rootNode.getParserNode().getChildren().get(i);
+                        
+                        EObject element = currentNode.getElement();
+                        if (!(element instanceof BnfEntry))
+                                continue;
+                        BnfEntry bnfEntry = (BnfEntry) element;
+                        if (bnfEntry.getRule() == null)
+                                continue;
+                        
+                        currentNode = NodeUtil.getNodeAdapter(bnfEntry.getRule()).getParserNode();
+                        
                         if (currentNode.getElement() instanceof Rule) {
                                 Rule rule = (Rule) currentNode.getElement();

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/refactoring/replacepassthroughrules/ReplaceAllPassthroughRulesRefactoringHandler.java

@@ -23 +23 @@
 
 import de.ugoe.cs.swe.bnftools.analysis.EbnfAnalysisUtils;
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.Rule;
 import de.ugoe.cs.swe.bnftools.ui.quickfix.processors.ReplacePassthroughRuleProcessor;
@@ -55 +56 @@
                 for (int i=0; i < rootNode.getParserNode().getChildren().size(); i++) {
                         AbstractNode currentNode = rootNode.getParserNode().getChildren().get(i);
+                        
+                        EObject element = currentNode.getElement();
+                        if (!(element instanceof BnfEntry))
+                                continue;
+                        BnfEntry bnfEntry = (BnfEntry) element;
+                        if (bnfEntry.getRule() == null)
+                                continue;
+                        
+                        currentNode = NodeUtil.getNodeAdapter(bnfEntry.getRule()).getParserNode();
+                        
                         if (currentNode.getElement() instanceof Rule) {
                                 Rule rule = (Rule) currentNode.getElement();

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/refactoring/uppercasetokenrules/UppercaseTokenRulesRefactoringHandler.java

@@ -23 +23 @@
 
 import de.ugoe.cs.swe.bnftools.analysis.EbnfAnalysisUtils;
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.Rule;
 import de.ugoe.cs.swe.bnftools.ui.refactoring.generic.GenericRefactoring;
@@ -51 +52 @@
                 for (int i=0; i < rootNode.getParserNode().getChildren().size(); i++) {
                         AbstractNode currentNode = rootNode.getParserNode().getChildren().get(i);
+
+                        EObject element = currentNode.getElement();
+                        if (!(element instanceof BnfEntry))
+                                continue;
+                        BnfEntry bnfEntry = (BnfEntry) element;
+                        if (bnfEntry.getRule() == null)
+                                continue;
+                        
+                        currentNode = NodeUtil.getNodeAdapter(bnfEntry.getRule()).getParserNode();
+
+                        
                         if (currentNode.getElement() instanceof Rule) {
                                 Rule rule = (Rule) currentNode.getElement();