Thread: [Gridarta-commit] SF.net SVN: gridarta: [64] trunk/daimonin/src/daieditor/textedit/textarea

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 64
Author:   akirschbaum
Date:     2006-05-28 15:04:50 -0700 (Sun, 28 May 2006)
ViewCVS:  http://svn.sourceforge.net/gridarta/?rev=64&view=rev

Log Message:
-----------
Unified classes: whitespace changes, add final/static.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/textedit/textarea/TokenMarker.java
    trunk/daimonin/src/daieditor/textedit/textarea/TokenMarker.java
Modified: trunk/crossfire/src/cfeditor/textedit/textarea/TokenMarker.java
===================================================================

--- trunk/crossfire/src/cfeditor/textedit/textarea/TokenMarker.java	2006-05-28 21:56:20 UTC (rev 63)
+++ trunk/crossfire/src/cfeditor/textedit/textarea/TokenMarker.java	2006-05-28 22:04:50 UTC (rev 64)
@@ -31,24 +31,23 @@
      * @param line      the line
      * @param lineIndex the line number
      */
-    public Token markTokens(Segment line, int lineIndex) {
+    public final Token markTokens(final Segment line, final int lineIndex) {
         if (lineIndex >= length) {
             throw new IllegalArgumentException("Tokenizing invalid line: " + lineIndex);
         }
 
         lastToken = null;
 
-        LineInfo info = lineInfo[lineIndex];
-        LineInfo prev;
+        final LineInfo info = lineInfo[lineIndex];
+        final LineInfo prev;
         if (lineIndex == 0) {
             prev = null;
         } else {
             prev = lineInfo[lineIndex - 1];
         }
 
-        byte oldToken = info.token;
-        byte token = markTokensImpl(prev == null ?
-                Token.NULL : prev.token, line, lineIndex);
+        final byte oldToken = info.token;
+        final byte token = markTokensImpl(prev == null ? Token.NULL : prev.token, line, lineIndex);
 
         info.token = token;
 
@@ -91,7 +90,7 @@
          * duplicate it.
          */
         if (!(lastLine == lineIndex && nextLineRequested)) {
-            nextLineRequested = (oldToken != token);
+            nextLineRequested = oldToken != token;
         }
 
         lastLine = lineIndex;
@@ -115,8 +114,7 @@
      * @param lineIndex the index of the line in the document, starting at 0
      * @return the initial token type for the next line
      */
-    protected abstract byte markTokensImpl(byte token, Segment line,
-                                           int lineIndex);
+    protected abstract byte markTokensImpl(byte token, Segment line, int lineIndex);
 
     /**
      * Returns if the token marker supports tokens that span multiple lines. If
@@ -127,7 +125,7 @@
      * The default implementation returns true; it should be overridden to
      * return false on simpler token markers for increased speed.
      */
-    public boolean supportsMultilineTokens() {
+    public static final boolean supportsMultilineTokens() {
         return true;
     }
 
@@ -137,14 +135,13 @@
      * @param index the first line number
      * @param lines the number of lines
      */
-    public void insertLines(int index, int lines) {
+    public final void insertLines(final int index, final int lines) {
         if (lines <= 0) {
             return;
         }
-
         length += lines;
         ensureCapacity(length);
-        int len = index + lines;
+        final int len = index + lines;
         System.arraycopy(lineInfo, index, lineInfo, len, lineInfo.length - len);
 
         for (int i = index + lines - 1; i >= index; i--) {
@@ -158,18 +155,17 @@
      * @param index the first line number
      * @param lines the number of lines
      */
-    public void deleteLines(int index, int lines) {
+    public final void deleteLines(final int index, final int lines) {
         if (lines <= 0) {
             return;
         }
-
-        int len = index + lines;
+        final int len = index + lines;
         length -= lines;
         System.arraycopy(lineInfo, len, lineInfo, index, lineInfo.length - len);
     }
 
     /** Returns the number of lines in this token marker. */
-    public int getLineCount() {
+    public final int getLineCount() {
         return length;
     }
 
@@ -178,7 +174,7 @@
      * after a line has been tokenized that starts a multiline token that
      * continues onto the next line.
      */
-    public boolean isNextLineRequested() {
+    public final boolean isNextLineRequested() {
         return nextLineRequested;
     }
 
@@ -233,11 +229,11 @@
      * array automatically.
      * @param index the array index
      */
-    protected void ensureCapacity(int index) {
+    protected final void ensureCapacity(final int index) {
         if (lineInfo == null) {
             lineInfo = new LineInfo[index + 1];
         } else if (lineInfo.length <= index) {
-            LineInfo[] lineInfoN = new LineInfo[(index + 1) * 2];
+            final LineInfo[] lineInfoN = new LineInfo[(index + 1) * 2];
             System.arraycopy(lineInfo, 0, lineInfoN, 0, lineInfo.length);
             lineInfo = lineInfoN;
         }
@@ -248,7 +244,7 @@
      * @param length the length of the token
      * @param id     the id of the token
      */
-    protected void addToken(int length, byte id) {
+    protected final void addToken(final int length, final byte id) {
         if (id >= Token.INTERNAL_FIRST && id <= Token.INTERNAL_LAST) {
             throw new InternalError("Invalid id: " + id);
         }
@@ -275,7 +271,7 @@
     }
 
     /** Inner class for storing information about tokenized lines. */
-    public class LineInfo {
+    public static final class LineInfo {
 
         /**
          * Creates a new LineInfo object with token = Token.NULL and obj =
@@ -284,8 +280,10 @@
         public LineInfo() {
         }
 
-        /** Creates a new LineInfo object with the specified parameters. */
-        public LineInfo(byte token, Object obj) {
+        /**
+         * Creates a new LineInfo object with the specified parameters.
+         */
+        public LineInfo(final byte token, final Object obj) {
             this.token = token;
             this.obj = obj;
         }
@@ -299,5 +297,6 @@
          * exist on a per-line basis.
          */
         public Object obj;
-    }
-}
+    } // class LineInfo
+
+} // class TokenMarker

Modified: trunk/daimonin/src/daieditor/textedit/textarea/TokenMarker.java
===================================================================
--- trunk/daimonin/src/daieditor/textedit/textarea/TokenMarker.java	2006-05-28 21:56:20 UTC (rev 63)
+++ trunk/daimonin/src/daieditor/textedit/textarea/TokenMarker.java	2006-05-28 22:04:50 UTC (rev 64)
@@ -12,25 +12,24 @@
 import javax.swing.text.Segment;
 
 /**
- * A token marker that splits lines of text into tokens. Each token carries
- * a length field and an indentification tag that can be mapped to a color
- * for painting that token.<p>
+ * A token marker that splits lines of text into tokens. Each token carries a
+ * length field and an indentification tag that can be mapped to a color for
+ * painting that token.<p>
  * <p/>
- * For performance reasons, the linked list of tokens is reused after each
- * line is tokenized. Therefore, the return value of <code>markTokens</code>
- * should only be used for immediate painting. Notably, it cannot be
- * cached.
+ * For performance reasons, the linked list of tokens is reused after each line
+ * is tokenized. Therefore, the return value of <code>markTokens</code> should
+ * only be used for immediate painting. Notably, it cannot be cached.
  * @author Slava Pestov
  * @version $Id: TokenMarker.java,v 1.8 2005/08/09 13:41:55 christianhujer Exp $
- * @see "org.gjt.sp.jedit.syntax.Token"
+ * @see Token
  */
 public abstract class TokenMarker {
 
     /**
-     * A wrapper for the lower-level <code>markTokensImpl</code> method
-     * that is called to split a line up into tokens.
-     * @param line      The line
-     * @param lineIndex The line number
+     * A wrapper for the lower-level <code>markTokensImpl</code> method that is
+     * called to split a line up into tokens.
+     * @param line      the line
+     * @param lineIndex the line number
      */
     public final Token markTokens(final Segment line, final int lineIndex) {
         if (lineIndex >= length) {
@@ -102,42 +101,39 @@
     }
 
     /**
-     * An abstract method that splits a line up into tokens. It
-     * should parse the line, and call <code>addToken()</code> to
-     * add syntax tokens to the token list. Then, it should return
-     * the initial token type for the next line.<p>
+     * An abstract method that splits a line up into tokens. It should parse
+     * the line, and call <code>addToken()</code> to add syntax tokens to the
+     * token list. Then, it should return the initial token type for the next
+     * line.<p>
      * <p/>
-     * For example if the current line contains the start of a
-     * multiline comment that doesn't end on that line, this method
-     * should return the comment token type so that it continues on
-     * the next line.
-     * @param token     The initial token type for this line
-     * @param line      The line to be tokenized
-     * @param lineIndex The index of the line in the document,
-     *                  starting at 0
-     * @return The initial token type for the next line
+     * For example if the current line contains the start of a multiline
+     * comment that doesn't end on that line, this method should return the
+     * comment token type so that it continues on the next line.
+     * @param token     the initial token type for this line
+     * @param line      the line to be tokenized
+     * @param lineIndex the index of the line in the document, starting at 0
+     * @return the initial token type for the next line
      */
     protected abstract byte markTokensImpl(byte token, Segment line, int lineIndex);
 
     /**
-     * Returns if the token marker supports tokens that span multiple
-     * lines. If this is true, the object using this token marker is
-     * required to pass all lines in the document to the
-     * <code>markTokens()</code> method (in turn).<p>
+     * Returns if the token marker supports tokens that span multiple lines. If
+     * this is true, the object using this token marker is required to pass all
+     * lines in the document to the <code>markTokens()</code> method (in
+     * turn).<p>
      * <p/>
-     * The default implementation returns true; it should be overridden
-     * to return false on simpler token markers for increased speed.
+     * The default implementation returns true; it should be overridden to
+     * return false on simpler token markers for increased speed.
      */
     public static final boolean supportsMultilineTokens() {
         return true;
     }
 
     /**
-     * Informs the token marker that lines have been inserted into
-     * the document. This inserts a gap in the <code>lineInfo</code>
-     * array.
-     * @param index The first line number
-     * @param lines The number of lines
+     * Informs the token marker that lines have been inserted into the
+     * document. This inserts a gap in the <code>lineInfo</code> array.
+     * @param index the first line number
+     * @param lines the number of lines
      */
     public final void insertLines(final int index, final int lines) {
         if (lines <= 0) {
@@ -154,11 +150,10 @@
     }
 
     /**
-     * Informs the token marker that line have been deleted from
-     * the document. This removes the lines in question from the
-     * <code>lineInfo</code> array.
-     * @param index The first line number
-     * @param lines The number of lines
+     * Informs the token marker that line have been deleted from the document.
+     * This removes the lines in question from the <code>lineInfo</code> array.
+     * @param index the first line number
+     * @param lines the number of lines
      */
     public final void deleteLines(final int index, final int lines) {
         if (lines <= 0) {
@@ -175,9 +170,9 @@
     }
 
     /**
-     * Returns true if the next line should be repainted. This
-     * will return true after a line has been tokenized that starts
-     * a multiline token that continues onto the next line.
+     * Returns true if the next line should be repainted. This will return true
+     * after a line has been tokenized that starts a multiline token that
+     * continues onto the next line.
      */
     public final boolean isNextLineRequested() {
         return nextLineRequested;
@@ -186,27 +181,27 @@
     // protected members
 
     /**
-     * The first token in the list. This should be used as the return
-     * value from <code>markTokens()</code>.
+     * The first token in the list. This should be used as the return value
+     * from <code>markTokens()</code>.
      */
     protected Token firstToken;
 
     /**
-     * The last token in the list. New tokens are added here.
-     * This should be set to null before a new line is to be tokenized.
+     * The last token in the list. New tokens are added here. This should be
+     * set to null before a new line is to be tokenized.
      */
     protected Token lastToken;
 
     /**
-     * An array for storing information about lines. It is enlarged and
-     * shrunk automatically by the <code>insertLines()</code> and
+     * An array for storing information about lines. It is enlarged and shrunk
+     * automatically by the <code>insertLines()</code> and
      * <code>deleteLines()</code> methods.
      */
     protected LineInfo[] lineInfo;
 
     /**
-     * The number of lines in the model being tokenized. This can be
-     * less than the length of the <code>lineInfo</code> array.
+     * The number of lines in the model being tokenized. This can be less than
+     * the length of the <code>lineInfo</code> array.
      */
     protected int length;
 
@@ -217,29 +212,28 @@
     protected boolean nextLineRequested;
 
     /**
-     * Creates a new <code>TokenMarker</code>. This DOES NOT create
-     * a lineInfo array; an initial call to <code>insertLines()</code>
-     * does that.
+     * Creates a new <code>TokenMarker</code>. This DOES NOT create a lineInfo
+     * array; an initial call to <code>insertLines()</code> does that.
      */
     protected TokenMarker() {
         lastLine = -1;
     }
 
     /**
-     * Ensures that the <code>lineInfo</code> array can contain the
-     * specified index. This enlarges it if necessary. No action is
-     * taken if the array is large enough already.<p>
+     * Ensures that the <code>lineInfo</code> array can contain the specified
+     * index. This enlarges it if necessary. No action is taken if the array is
+     * large enough already.<p>
      * <p/>
-     * It should be unnecessary to call this under normal
-     * circumstances; <code>insertLine()</code> should take care of
-     * enlarging the line info array automatically.
-     * @param index The array index
+     * It should be unnecessary to call this under normal circumstances;
+     * <code>insertLine()</code> should take care of enlarging the line info
+     * array automatically.
+     * @param index the array index
      */
     protected final void ensureCapacity(final int index) {
         if (lineInfo == null) {
             lineInfo = new LineInfo[index + 1];
         } else if (lineInfo.length <= index) {
-            final LineInfo[] lineInfoN = new LineInfo[index + 1 << 1];
+            final LineInfo[] lineInfoN = new LineInfo[(index + 1) * 2];
             System.arraycopy(lineInfo, 0, lineInfoN, 0, lineInfo.length);
             lineInfo = lineInfoN;
         }
@@ -247,8 +241,8 @@
 
     /**
      * Adds a token to the token list.
-     * @param length The length of the token
-     * @param id     The id of the token
+     * @param length the length of the token
+     * @param id     the id of the token
      */
     protected final void addToken(final int length, final byte id) {
         if (id >= Token.INTERNAL_FIRST && id <= Token.INTERNAL_LAST) {
@@ -280,15 +274,14 @@
     public static final class LineInfo {
 
         /**
-         * Creates a new LineInfo object with token = Token.NULL
-         * and obj = null.
+         * Creates a new LineInfo object with token = Token.NULL and obj =
+         * null.
          */
         public LineInfo() {
         }
 
         /**
-         * Creates a new LineInfo object with the specified
-         * parameters.
+         * Creates a new LineInfo object with the specified parameters.
          */
         public LineInfo(final byte token, final Object obj) {
             this.setToken(token);
@@ -299,10 +292,9 @@
         private byte token;
 
         /**
-         * This is for use by the token marker implementations
-         * themselves. It can be used to store anything that
-         * is an object and that needs to exist on a per-line
-         * basis.
+         * This is for use by the token marker implementations themselves. It
+         * can be used to store anything that is an object and that needs to
+         * exist on a per-line basis.
          */
         private Object obj;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Gridarta-commit] SF.net SVN: gridarta: [64] trunk/daimonin/src/daieditor/textedit/textarea

gridarta-commit