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

Timestamp:

11/03/10 16:02:27 (14 years ago)

Author:

zeiss

Message:

 

Location:

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

Files:

• plugin.xml (modified) (3 diffs)
• src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java (modified) (2 diffs)
• src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfHtmlFormatterVisitor.java (added)
• src/de/ugoe/cs/swe/bnftools/ui/formatter/HtmlFormatterHandler.java (added)

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/plugin.xml

@@ -119 +119 @@
               class="de.ugoe.cs.swe.bnftools.ui.EbnfExecutableExtensionFactory:de.ugoe.cs.swe.bnftools.ui.formatter.FormatterHandler"
               commandId="de.ugoe.cs.swe.bnftools.Ebnf.formatter">
+            <activeWhen>
+                <reference
+                    definitionId="de.ugoe.cs.swe.bnftools.Ebnf.Editor.opened">
+                </reference>
+            </activeWhen>
+        </handler>
+        <handler
+              class="de.ugoe.cs.swe.bnftools.ui.EbnfExecutableExtensionFactory:de.ugoe.cs.swe.bnftools.ui.formatter.HtmlFormatterHandler"
+              commandId="de.ugoe.cs.swe.bnftools.Ebnf.htmlformatter">
             <activeWhen>
                 <reference
@@ -186 +195 @@
       </command>
       <command
+            description="Trigger custom bnftools html formatter"
+            id="de.ugoe.cs.swe.bnftools.Ebnf.htmlformatter"
+            name="Save as HTML">
+      </command>
+      <command
             description="Rename Refactoring"
             id="de.ugoe.cs.swe.bnftools.Ebnf.refactoring.rename"
@@ -244 +258 @@
             </visibleWhen>
          </command>
-             <command
+         <command
                  commandId="de.ugoe.cs.swe.bnftools.Ebnf.formatter"
                  style="push"
                  tooltip="Trigger custom bnftools formatting">
+            <visibleWhen checkEnabled="false">
+                <reference
+                    definitionId="de.ugoe.cs.swe.bnftools.Ebnf.Editor.opened">
+                </reference>
+            </visibleWhen>
+         </command>
+         <command
+                 commandId="de.ugoe.cs.swe.bnftools.Ebnf.htmlformatter"
+                 style="push"
+                 tooltip="Save as HTML">
             <visibleWhen checkEnabled="false">
                 <reference

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

@@ -35 +35 @@
 
 public class EbnfFormatterVisitor extends EbnfVisitor {
-        private StringBuffer buf;
-        private FormatterConfig config;
-        private int bufferPositionFormattedTextNoWhitespaces = 0;
-        private int bufferPositionOriginalText = 0;
-        private int allCommentsPosition = 0;
-        private ArrayList<LeafNode> allComments = new ArrayList<LeafNode>();
-        
-        private boolean lastWasSectionHeading=false;
-        private CompositeNode parserEtsiBnfNode;
-        private String originalText;
-        private int bufferPositionFormattedText;
-        private String formattedText;
-        private String formattedTextNoWhitespaces;
-        private String originalTextNoWhitespaces;
-        private int newLineOffsetCounter = 0;
-        private int rightHandSideRuleOffset = 0;
-        private Stack<Integer> ruleSpacingStack = new Stack<Integer>();
-        private Double averageSingleDefinitionLength;
+        protected StringBuffer buf;
+        protected FormatterConfig config;
+        protected int bufferPositionFormattedTextNoWhitespaces = 0;
+        protected int bufferPositionOriginalText = 0;
+        protected int allCommentsPosition = 0;
+        protected ArrayList<LeafNode> allComments = new ArrayList<LeafNode>();
+        
+        protected boolean lastWasSectionHeading=false;
+        protected CompositeNode parserEtsiBnfNode;
+        protected String originalText;
+        protected int bufferPositionFormattedText;
+        protected String formattedText;
+        protected String formattedTextNoWhitespaces;
+        protected String originalTextNoWhitespaces;
+        protected int newLineOffsetCounter = 0;
+        protected int rightHandSideRuleOffset = 0;
+        protected Stack<Integer> ruleSpacingStack = new Stack<Integer>();
+        protected Double averageSingleDefinitionLength;
         
         public EbnfFormatterVisitor(EObject rootNode, FormatterConfig config) {
@@ -392 +392 @@
 
         protected void visitBefore(Import node) {
-                text("import \"" + node.getImportURI() + "\";");
+                text("import \"" + node.getImportURI() + "\"");
+                if (node.getGrammarType() != null) {
+                        text("/" + node.getGrammarType());
+                }
+                if (node.getLabel() != null) {
+                        space();
+                        text("label: " + node.getLabel());
+                }
+                text(";");
                 newLine();
         }