Changeset 37 in default for trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java

Timestamp:

11/04/10 11:24:11 (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) (18 diffs)

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

@@ -69 +69 @@
         }
 
-        private boolean isCommentNode(LeafNode node) {
+        protected boolean isCommentNode(LeafNode node) {
                 if ((node.getText().trim().startsWith("//") || node.getText().trim().startsWith("/*")) && (node.isHidden()))
                         return true;
@@ -75 +75 @@
         }
         
-        private void collectAllComments(CompositeNode node) {
+        protected void collectAllComments(CompositeNode node) {
                 for (int i=0; i < node.getChildren().size(); i++) {
                         AbstractNode currentNode = node.getChildren().get(i);
@@ -91 +91 @@
         }
 
-        private boolean isSingleLineComment(String str) {
+        protected boolean isSingleLineComment(String str) {
                 if (str.startsWith("//"))
                         return true;
@@ -97 +97 @@
         }
         
-        private boolean isMultiLineComment(String str) {
+        protected boolean isMultiLineComment(String str) {
                 if (str.startsWith("/*"))
                         return true;
@@ -103 +103 @@
         }
 
-        private boolean isWhitespace(char ch) {
+        protected boolean isWhitespace(char ch) {
                 if ((ch==' ') || (ch == '\t') || (ch == '\n') || (ch == '\r'))
                         return true;
@@ -109 +109 @@
         }
         
-        private void skipWhitespacesOriginalText() {
+        protected void skipWhitespacesOriginalText() {
                 while (bufferPositionOriginalText < originalText.length() && isWhitespace(originalText.charAt(bufferPositionOriginalText))) {
                         bufferPositionOriginalText++;
@@ -115 +115 @@
         }
 
-        private void skipWhitespacesFormattedText(StringBuffer result) {
+        protected void skipWhitespacesFormattedText(StringBuffer result) {
                 while (bufferPositionFormattedText < formattedText.length() && isWhitespace(formattedText.charAt(bufferPositionFormattedText))) {
                         result.append(formattedText.substring(bufferPositionFormattedText, bufferPositionFormattedText+1));
@@ -122 +122 @@
         }
 
-        private boolean isSingleLineCommentNext(String str, int position) {
+        protected boolean isSingleLineCommentNext(String str, int position) {
                 if ((str.charAt(position) == '/') && (str.charAt(position) == '/'))
                         return true;
@@ -128 +128 @@
         }
         
-        private boolean isMultiLineCommentNext(String str, int position) {
+        protected boolean isMultiLineCommentNext(String str, int position) {
                 if ((str.charAt(position) == '/') && (str.charAt(position) == '*'))
                         return true;
@@ -134 +134 @@
         }
                 
-        private boolean isCommentNext(String str, int position) {
+        protected boolean isCommentNext(String str, int position) {
                 if (isSingleLineCommentNext(str, position) || isMultiLineCommentNext(str, position))
                         return true;
@@ -141 +141 @@
         }
         
-        private String scanBackWhitespaces(String str, int position) {
+        protected String scanBackWhitespaces(String str, int position) {
                 StringBuffer whiteSpaces = new StringBuffer();
                 int currentPosition = position;
@@ -151 +151 @@
         }
         
-        private String stripEndingNewline(String str) {
+        protected String stripEndingNewline(String str) {
                 int position = str.length() - 1;
                 while ((str.charAt(position) == '\n') || (str.charAt(position) == '\r')) {
@@ -159 +159 @@
         }
         
-        private int scanBackNewlinesCount(String str, int position) {
+        protected int scanBackNewlinesCount(String str, int position) {
                 int newLinesCount = 0;
                 int currentPosition = position;
@@ -179 +179 @@
         }
         
-        private void weaveComments() {
+        protected void weaveComments() {
                 bufferPositionOriginalText = 0;
                 bufferPositionFormattedTextNoWhitespaces = 0;
@@ -255 +255 @@
         }
 
-        private void newLine() {
+        protected void newLine() {
                 buf.append("\n");
                 if ((ruleSpacingStack != null) && (!ruleSpacingStack.empty())) {
@@ -264 +264 @@
         }
         
-        private void text(String str) {
+        protected void text(String str) {
                 buf.append(str);
                 newLineOffsetCounter += str.length();
         }
 
-        private void space() {
+        protected void space() {
                 buf.append(" ");
                 newLineOffsetCounter++;
         }
         
-        private void spaces(int count) {
+        protected void spaces(int count) {
                 for (int i=0; i < count; i++) {
                         buf.append(" ");
@@ -280 +280 @@
         }
 
-        private boolean lastIsClosingParentheses() {
+        protected boolean lastIsClosingParentheses() {
                 char ch = buf.toString().charAt(buf.toString().length()-1);
                 if ((ch == ')') || (ch == ']') || (ch == '}'))
@@ -287 +287 @@
         }
 
-        private void wrap() {
+        protected void wrap() {
                 if ((config.isWrapAfterThreshold()) && (newLineOffsetCounter > config.getWrapThreshold())) {
                         char last = buf.toString().charAt(buf.toString().length()-1);