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

Timestamp:

11/04/10 17:47:29 (14 years ago)

Author:

zeiss

Message:

 

File:

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

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

@@ -19 +19 @@
         private ArrayList<MetaTextEntry> metaTexts = new ArrayList<MetaTextEntry>();
         private ArrayList<MetaTextEntry> transformedTexts = new ArrayList<MetaTextEntry>();
+        private int lastMetaTextBlock = 0;
         
         public EbnfHtmlFormatterVisitor(EObject rootNode, FormatterConfig config) {
@@ -110 +111 @@
                                 }
                         } else {
-                                if ((currentMetaText != null) && (bufferPositionFormattedTextNoWhitespaces == currentMetaText.getOffset())) {
+                                if (lastMetaTextBlock == 0 && (currentMetaText != null) && (bufferPositionFormattedTextNoWhitespaces == currentMetaText.getOffset())) {
                                         result.append(currentMetaText.getText());
                                         metaTexts.remove(currentMetaText);
@@ -117 +118 @@
                                         else
                                                 currentMetaText = null;
+                                        lastMetaTextBlock = 1;
                                 }
 
@@ -137 +139 @@
                                 }
 
-//                              if ((currentMetaText != null) && (bufferPositionFormattedTextNoWhitespaces == currentMetaText.getOffset())) {
-//                                      result.append(currentMetaText.getText());
-//                                      metaTexts.remove(currentMetaText);
-//                                      if (metaTexts.iterator().hasNext())
-//                                              currentMetaText = metaTexts.iterator().next();
-//                                      else
-//                                              currentMetaText = null;
-//                              }
-
-//                              }
+                                if (lastMetaTextBlock == 1 && (currentMetaText != null) && (bufferPositionFormattedTextNoWhitespaces == currentMetaText.getOffset())) {
+                                        result.append(currentMetaText.getText());
+                                        metaTexts.remove(currentMetaText);
+                                        if (metaTexts.iterator().hasNext())
+                                                currentMetaText = metaTexts.iterator().next();
+                                        else
+                                                currentMetaText = null;
+                                        lastMetaTextBlock = 0;
+                                }
                         }
                 }