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

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/ui

Files:

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

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;