Changeset 27 in default

Timestamp:

11/02/10 15:59:35 (14 years ago)

Author:

zeiss

Message:

 

File:

• trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java (modified) (12 diffs)

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

@@ -257 +257 @@
         }
 
-        
+        private void newLine() {
+                buf.append("\n");
+        }
+        
+        private void text(String str) {
+                buf.append(str);
+        }
+
+        private void space() {
+                buf.append(" ");
+        }
+
         // -----------------------------------------------------------------------------
 
@@ -267 +278 @@
                 
                 //System.out.println(allComments.toString());
-                buf.append("grammar " + node.getName());
+                text("grammar " + node.getName());
                 if (node.getType() != null)
-                        buf.append(node.getType());
-                buf.append(";");
-
-                buf.append("\n\n");
+                        text(node.getType());
+                text(";");
+
+                newLine();
+                newLine();
         }
 
@@ -283 +295 @@
 
         protected void visitAfter(ImportSection node) {
-                buf.append("\n");
+                newLine();
         }
 
@@ -315 +327 @@
         protected void visitAfter(Term node) {
                 if (!isLastElement())
-                        buf.append(" ");
+                        space();
         }
 
@@ -337 +349 @@
 
         protected void visitBefore(GroupedSequence node) {
-                buf.append("(");
+                text("(");
         }
 
         protected void visitAfter(GroupedSequence node) {
-                buf.append(")");
+                text(")");
         }
 
@@ -351 +363 @@
 
         protected void visitBefore(Import node) {
-                buf.append("import \"" + node.getImportURI() + "\";");
-                buf.append("\n");
+                text("import \"" + node.getImportURI() + "\";");
+                newLine();
         }
 
@@ -365 +377 @@
 
         protected void visitBefore(OptionalSequence node) {
-                buf.append("[");
+                text("[");
         }
 
         protected void visitAfter(OptionalSequence node) {
-                buf.append("]");
+                text("]");
         }
 
         protected void visitBefore(RepeatedSequence node) {
-                buf.append("{");
+                text("{");
         }
 
         protected void visitAfter(RepeatedSequence node) {
-                buf.append("}");
+                text("}");
                 if (node.isMorethanonce())
-                        buf.append("+");
+                        text("+");
         }
 
         protected void visitBefore(Rule node) {
                 if (lastWasSectionHeading)
-                        buf.append("\n");
+                        newLine();
                 
                 lastWasSectionHeading=false;
 
                 if (node.getRulenumber() > 0)
-                        buf.append(node.getRulenumber() + ". ");
-                
-                buf.append(node.getName() + " ::= ");
+                        text(node.getRulenumber() + ". ");
+                
+                text(node.getName() + " ::= ");
         }
 
         protected void visitAfter(Rule node) {
-                buf.append(";");
-//              appendComments(node);
-                buf.append("\n");
+                text(";");
+                newLine();
         }
 
@@ -407 +418 @@
 
         protected void visitBefore(RuleReference node) {
-                buf.append(node.getRuleref().getName());
+                text(node.getRuleref().getName());
         }
 
@@ -415 +426 @@
         protected void visitBefore(SectionHeading node) {
                 if (!lastWasSectionHeading && !buf.substring(buf.length()-2).equals("\n\n"))
-                        buf.append("\n");
+                        newLine();
                 
                 lastWasSectionHeading=true;
@@ -422 +433 @@
 //                      buf.append("\n");
                 
-                buf.append(node.getSectionHeader());
+                text(node.getSectionHeader());
         }
 
         protected void visitAfter(SectionHeading node) {
-//              buf.append("\n");
         }
 
@@ -434 +444 @@
         protected void visitAfter(SingleDefinition node) {
                 if (!isLastElement())
-                        buf.append(" | ");
+                        text(" | ");
                 
         }
@@ -440 +450 @@
         protected void visitBefore(StringRule node) {
                 if (node.getLiteral() != null)
-                        buf.append("\"" + node.getLiteral() + "\"");
+                        text("\"" + node.getLiteral() + "\"");
                 else if (node.getColon() != null)
-                        buf.append("\"\"\"");
+                        text("\"\"\"");
         }
 
         protected void visitAfter(StringRule node) {
         }
-
-        
         
 }