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

Timestamp:

10/22/10 16:48:56 (14 years ago)

Author:

zeiss

Message:

sdfsd

Location:

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

Files:

• ui/actions/GenerateCompositeBNFAction.java (modified) (2 diffs)
• ui/actions/PackageConsistencyCheckerAction.java (modified) (1 diff)
• ui/formatter/EbnfFormatterVisitor.java (modified) (3 diffs)
• ui/refactoring/rename/RenameRefactoringHandler.java (modified) (1 diff)
• utils/Utils.java (modified) (3 diffs)

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

@@ -93 +93 @@
                                         String coreName = null;
                                         // get the core grammar
-                                        EList<Import> imports = ((EtsiBnfImpl) xtextResource.getParseResult().getRootNode().getElement()).getImports();
+                                        EList<Import> imports = ((EtsiBnfImpl) xtextResource.getParseResult().getRootNode().getElement()).getImportSection().getImports();
                                         for(int j=0; j< imports.size(); j++) {
                                                 if(imports.get(j).getGrammarType().equals("core"))
@@ -113 +113 @@
                                         packageGrammars = new LinkedList<XtextResource>();
                                         deltas = new LinkedList<URI>();
-                                    EList<Import> packages = ((EtsiBnfImpl) xtextResource.getParseResult().getRootNode().getElement()).getImports();
+                                    EList<Import> packages = ((EtsiBnfImpl) xtextResource.getParseResult().getRootNode().getElement()).getImportSection().getImports();
                                         for(int j=0; j<packages.size(); j++) {
                                                 if(packages.get(j).getGrammarType().equals("package")) {

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

@@ -65 +65 @@
                                 Resource coreRes = null;
                                 Resource updatedRes = null;
-                                EList<Import> imports = ((EtsiBnfImpl) xtextResource.getParseResult().getRootNode().getElement()).getImports();
+                                EList<Import> imports = ((EtsiBnfImpl) xtextResource.getParseResult().getRootNode().getElement()).getImportSection().getImports();
                                 
                                 for(int j=0; j<imports.size(); j++) {

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java

@@ -32 +32 @@
         private FormatterConfig config;
 
+        private boolean lastWasSectionHeading=false;
+        
         public EbnfFormatterVisitor(EObject rootNode, FormatterConfig config) {
                 super(rootNode);
@@ -164 +166 @@
 
         protected void visitBefore(Rule node) {
+                if (lastWasSectionHeading)
+                        buf.append("\n");
+                
+                lastWasSectionHeading=false;
+
                 if (node.getRulenumber() > 0)
                         buf.append(node.getRulenumber() + ". ");
@@ -188 +195 @@
 
         protected void visitBefore(SectionHeading node) {
-                if (!buf.substring(buf.length()-2).equals("\n\n"))
+                if (!lastWasSectionHeading && !buf.substring(buf.length()-2).equals("\n\n"))
                         buf.append("\n");
                 
+                lastWasSectionHeading=true;
+//              if (!lastWasSectionHeading || !buf.substring(buf.length()-2).equals("\n\n"))
+//              if (!buf.substring(buf.length()-2).equals("\n\n"))
+//                      buf.append("\n");
+                
                 buf.append(node.getSectionHeader());
         }
 
         protected void visitAfter(SectionHeading node) {
-                buf.append("\n");
+//              buf.append("\n");
         }
 

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

@@ -72 +72 @@
                                         "Error while applying refactoring to workbench/wizard: "
                                                         + e.getMessage());
-                        e.printStackTrace();
+                        //e.printStackTrace();
                 }
                 return null;

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/utils/Utils.java

@@ -4 +4 @@
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.text.BadLocationException;
@@ -22 +21 @@
 import com.google.common.collect.Iterables;
 
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
+import de.ugoe.cs.swe.bnftools.ebnf.DeltaEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.EtsiBnf;
+import de.ugoe.cs.swe.bnftools.ebnf.MergeEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.Rule;
 
@@ -29 +31 @@
         static public NodeAdapter findNodeFromSelection(
                         final XtextEditor xtextEditor, ITextSelection mySelection) {
-                NodeAdapter node = null;
                 if ((xtextEditor == null) || (xtextEditor.getDocument() == null))
                         return null;
                 EtsiBnf root = (EtsiBnf) xtextEditor.getDocument().readOnly(
                                 new RootEObjectFinder());
-                EList<Rule> rules = root.getRule();
-                for (int i = 0; i < rules.size(); i++) {
-                        node = NodeUtil.getNodeAdapter(rules.get(i));
-                        if ((node.getParserNode().getOffset() <= mySelection.getOffset())
-                                        && (mySelection.getOffset() <= node.getParserNode()
-                                                        .getOffset()
-                                                        + node.getParserNode().getLength())) {
-                                return node;
+                
+                NodeAdapter resultNode = null;
+                if (root.getBnfEntry() != null) {
+                        System.out.println("bnf grammar!");
+                        for (int i=0; i < root.getBnfEntry().size(); i++) {
+                                BnfEntry entry = root.getBnfEntry().get(i);
+                                if (entry.getRule() != null) {
+                                        resultNode = findNodeInRule(entry.getRule(), mySelection);
+                                        if (resultNode != null)
+                                                return resultNode;
+                                }
+                        }
+                } else if (root.getDeltaEntry() != null) {
+                        for (int i=0; i < root.getDeltaEntry().size(); i++) {
+                                DeltaEntry entry = root.getDeltaEntry().get(i);
+                                if (entry.getRule() != null) {
+                                        resultNode = findNodeInRule(entry.getRule(), mySelection);
+                                        if (resultNode != null)
+                                                return resultNode;
+                                }
+                        }
+                } else if (root.getMergeEntry() != null) {
+                        for (int i=0; i < root.getMergeEntry().size(); i++) {
+                                MergeEntry entry = root.getMergeEntry().get(i);
+                                if (entry.getMergeRule() != null) {
+                                        // TODO: doesn't work here...
+//                                      resultNode = findNodeInRule(entry.getgetRule(), mySelection);
+//                                      if (resultNode != null)
+//                                              return resultNode;
+                                }
                         }
                 }
+                
+                return resultNode;
+        }
+        
+        // --------------------------------------------------------------------------------
+
+        static private NodeAdapter findNodeInRule(Rule rule, ITextSelection mySelection) {
+                NodeAdapter node = NodeUtil.getNodeAdapter(rule);
+                if ((node.getParserNode().getOffset() <= mySelection.getOffset())
+                                && (mySelection.getOffset() <= node.getParserNode()
+                                                .getOffset()
+                                                + node.getParserNode().getLength())) {
+                        return node;
+                }
+                
                 return null;
         }