Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta: [72] trunk/daimonin/src/daieditor/textedit/textarea
|
From: <aki...@us...> - 2006-05-29 19:51:42
|
Revision: 72 Author: akirschbaum Date: 2006-05-29 12:51:19 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/gridarta/?rev=72&view=rev Log Message: ----------- Make fields private or protected; add accessor functions. Modified Paths: -------------- trunk/crossfire/src/cfeditor/textedit/scripteditor/ScriptEditView.java trunk/crossfire/src/cfeditor/textedit/textarea/KeywordMap.java trunk/crossfire/src/cfeditor/textedit/textarea/TextAreaDefaults.java trunk/crossfire/src/cfeditor/textedit/textarea/TextAreaPainter.java trunk/crossfire/src/cfeditor/textedit/textarea/Token.java trunk/crossfire/src/cfeditor/textedit/textarea/TokenMarker.java trunk/daimonin/src/daieditor/textedit/scripteditor/ScriptEditView.java trunk/daimonin/src/daieditor/textedit/textarea/JEditTextArea.java trunk/daimonin/src/daieditor/textedit/textarea/KeywordMap.java trunk/daimonin/src/daieditor/textedit/textarea/SyntaxUtilities.java trunk/daimonin/src/daieditor/textedit/textarea/TextAreaDefaults.java trunk/daimonin/src/daieditor/textedit/textarea/TextAreaPainter.java trunk/daimonin/src/daieditor/textedit/textarea/Token.java trunk/daimonin/src/daieditor/textedit/textarea/TokenMarker.java Modified: trunk/crossfire/src/cfeditor/textedit/scripteditor/ScriptEditView.java =================================================================== --- trunk/crossfire/src/cfeditor/textedit/scripteditor/ScriptEditView.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/crossfire/src/cfeditor/textedit/scripteditor/ScriptEditView.java 2006-05-29 19:51:19 UTC (rev 72) @@ -303,11 +303,11 @@ */ private final class EditTabListener implements ChangeListener { - final ScriptEditControl control; // controler + private final ScriptEditControl control; // controler - final ScriptEditView view; // view + private final ScriptEditView view; // view - int index; // index of selected tab + private int index; // index of selected tab public EditTabListener(final ScriptEditControl control, final ScriptEditView view) { this.control = control; @@ -330,7 +330,7 @@ */ private static final class EditWindowListener implements WindowListener { - final ScriptEditControl control; // controller + private final ScriptEditControl control; // controller /** * Constructor. Modified: trunk/crossfire/src/cfeditor/textedit/textarea/KeywordMap.java =================================================================== --- trunk/crossfire/src/cfeditor/textedit/textarea/KeywordMap.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/crossfire/src/cfeditor/textedit/textarea/KeywordMap.java 2006-05-29 19:51:19 UTC (rev 72) @@ -97,7 +97,7 @@ } // protected members - protected final int mapLength; + private final int mapLength; protected final int getStringMapKey(final String s) { return (Character.toUpperCase(s.charAt(0)) + Character.toUpperCase(s.charAt(s.length() - 1))) % mapLength; @@ -116,11 +116,11 @@ this.next = next; } - public final char[] keyword; + private final char[] keyword; - public final byte id; + private final byte id; - public final Keyword next; + private final Keyword next; } private final Keyword[] map; Modified: trunk/crossfire/src/cfeditor/textedit/textarea/TextAreaDefaults.java =================================================================== --- trunk/crossfire/src/cfeditor/textedit/textarea/TextAreaDefaults.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/crossfire/src/cfeditor/textedit/textarea/TextAreaDefaults.java 2006-05-29 19:51:19 UTC (rev 72) @@ -178,4 +178,5 @@ public JPopupMenu getPopup() { return popup; } + } // class TextAreaDefaults Modified: trunk/crossfire/src/cfeditor/textedit/textarea/TextAreaPainter.java =================================================================== --- trunk/crossfire/src/cfeditor/textedit/textarea/TextAreaPainter.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/crossfire/src/cfeditor/textedit/textarea/TextAreaPainter.java 2006-05-29 19:51:19 UTC (rev 72) @@ -547,7 +547,7 @@ } } - final protected void paintPlainLine(final Graphics gfx, final int line, final Font defaultFont, final Color defaultColor, int x, int y) { + protected final void paintPlainLine(final Graphics gfx, final int line, final Font defaultFont, final Color defaultColor, int x, int y) { paintHighlight(gfx, line, y); textArea.getLineText(line, currentLine); @@ -567,7 +567,7 @@ * When syntax highlighting is enabled, this method is called from * paintLine() to do the actual drawing of the line. */ - final protected void paintSyntaxLine(final Graphics gfx, final TokenMarker tokenMarker, final int line, final Font defaultFont, final Color defaultColor, int x, int y) { + protected final void paintSyntaxLine(final Graphics gfx, final TokenMarker tokenMarker, final int line, final Font defaultFont, final Color defaultColor, int x, int y) { textArea.getLineText(currentLineIndex, currentLine); currentLineTokens = tokenMarker.markTokens(currentLine, currentLineIndex); @@ -587,7 +587,7 @@ } } - final protected void paintHighlight(final Graphics gfx, final int line, final int y) { + protected final void paintHighlight(final Graphics gfx, final int line, final int y) { if (line >= textArea.getSelectionStartLine() && line <= textArea.getSelectionEndLine()) { paintLineHighlight(gfx, line, y); } @@ -605,7 +605,7 @@ } } - final protected void paintLineHighlight(final Graphics gfx, final int line, int y) { + protected final void paintLineHighlight(final Graphics gfx, final int line, int y) { final int height = fm.getHeight(); y += fm.getLeading() + fm.getMaxDescent(); @@ -653,7 +653,7 @@ } - final protected void paintBracketHighlight(final Graphics gfx, final int line, int y) { + protected final void paintBracketHighlight(final Graphics gfx, final int line, int y) { final int position = textArea.getBracketPosition(); if (position == -1) { return; @@ -668,7 +668,7 @@ gfx.drawRect(x, y, fm.charWidth('(') - 1, fm.getHeight() - 1); } - final protected void paintCaret(final Graphics gfx, final int line, int y) { + protected final void paintCaret(final Graphics gfx, final int line, int y) { if (textArea.isCaretVisible()) { final int offset = textArea.getCaretPosition() - textArea.getLineStartOffset(line); final int caretX = textArea._offsetToX(line, offset); @@ -708,4 +708,5 @@ public void setCurrentLineTokens(Token token) { currentLineTokens = token; } + } // class TextAreaPainter Modified: trunk/crossfire/src/cfeditor/textedit/textarea/Token.java =================================================================== --- trunk/crossfire/src/cfeditor/textedit/textarea/Token.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/crossfire/src/cfeditor/textedit/textarea/Token.java 2006-05-29 19:51:19 UTC (rev 72) @@ -146,4 +146,5 @@ public void setNext(Token next_) { next = next_; } + } // class Token Modified: trunk/crossfire/src/cfeditor/textedit/textarea/TokenMarker.java =================================================================== --- trunk/crossfire/src/cfeditor/textedit/textarea/TokenMarker.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/crossfire/src/cfeditor/textedit/textarea/TokenMarker.java 2006-05-29 19:51:19 UTC (rev 72) @@ -284,8 +284,8 @@ * Creates a new LineInfo object with the specified parameters. */ public LineInfo(final byte token, final Object obj) { - this.token = token; - this.obj = obj; + this.setToken(token); + this.setObj(obj); } /** The id of the last token of the line. */ Modified: trunk/daimonin/src/daieditor/textedit/scripteditor/ScriptEditView.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/scripteditor/ScriptEditView.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/daimonin/src/daieditor/textedit/scripteditor/ScriptEditView.java 2006-05-29 19:51:19 UTC (rev 72) @@ -285,7 +285,7 @@ private int index; // index of selected tab - EditTabListener(final ScriptEditView view) { + public EditTabListener(final ScriptEditView view) { this.view = view; index = view.getSelectedIndex(); } @@ -311,7 +311,7 @@ * Constructor. * @param control ScriptEditControl */ - EditWindowListener(final ScriptEditControl control) { + public EditWindowListener(final ScriptEditControl control) { this.control = control; } Modified: trunk/daimonin/src/daieditor/textedit/textarea/JEditTextArea.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/textarea/JEditTextArea.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/daimonin/src/daieditor/textedit/textarea/JEditTextArea.java 2006-05-29 19:51:19 UTC (rev 72) @@ -141,14 +141,14 @@ addFocusListener(new FocusHandler()); // Load the defaults - setInputHandler(defaults.inputHandler); - setDocument(defaults.document); - editable = defaults.editable; - caretVisible = defaults.caretVisible; - caretBlinks = defaults.caretBlinks; - electricScroll = defaults.electricScroll; + setInputHandler(defaults.getInputHandler()); + setDocument(defaults.getDocument()); + editable = defaults.getEditable(); + caretVisible = defaults.getCaretVisible(); + caretBlinks = defaults.getCaretBlinks(); + electricScroll = defaults.getElectricScroll(); - popup = defaults.popup; + popup = defaults.getPopup(); // free tab key from the focus traversal manager freeTabKeyFromFocusTraversal(); @@ -515,7 +515,7 @@ */ public final int offsetToX(final int line, final int offset) { // don't use cached tokens - painter.currentLineTokens = null; + painter.setCurrentLineTokens(null); return _offsetToX(line, offset); } @@ -546,18 +546,19 @@ /* If syntax coloring is enabled, we have to do this because * tokens can vary in width */ Token tokens; - if (painter.currentLineIndex == line && painter.currentLineTokens != null) { - tokens = painter.currentLineTokens; + if (painter.getCurrentLineIndex() == line && painter.getCurrentLineTokens() != null) { + tokens = painter.getCurrentLineTokens(); } else { - painter.currentLineIndex = line; - tokens = painter.currentLineTokens = tokenMarker.markTokens(lineSegment, line); + painter.setCurrentLineIndex(line); + tokens = tokenMarker.markTokens(lineSegment, line); + painter.setCurrentLineTokens(tokens); } final Font defaultFont = painter.getFont(); final SyntaxStyle[] styles = painter.getStyles(); while (true) { - final byte id = tokens.id; + final byte id = tokens.getId(); if (id == Token.END) { return x; } @@ -568,7 +569,7 @@ fm = styles[id].getFontMetrics(defaultFont, painter.getGraphics()); } - final int length = tokens.length; + final int length = tokens.getLength(); if (offset + segmentOffset < lineSegment.offset + length) { lineSegment.count = offset - (lineSegment.offset - segmentOffset); @@ -577,7 +578,7 @@ lineSegment.count = length; x += Utilities.getTabbedTextWidth(lineSegment, fm, x, painter, 0); lineSegment.offset += length; - tokens = tokens.next; + tokens = tokens.getNext(); } } } @@ -627,11 +628,12 @@ return segmentCount; } else { Token tokens; - if (painter.currentLineIndex == line && painter .currentLineTokens != null) { - tokens = painter.currentLineTokens; + if (painter.getCurrentLineIndex() == line && painter.getCurrentLineTokens() != null) { + tokens = painter.getCurrentLineTokens(); } else { - painter.currentLineIndex = line; - tokens = painter.currentLineTokens = tokenMarker.markTokens(lineSegment, line); + painter.setCurrentLineIndex(line); + tokens = tokenMarker.markTokens(lineSegment, line); + painter.setCurrentLineTokens(tokens); } int offset = 0; @@ -639,7 +641,7 @@ final SyntaxStyle[] styles = painter.getStyles(); while (true) { - final byte id = tokens.id; + final byte id = tokens.getId(); if (id == Token.END) { return offset; } @@ -650,7 +652,7 @@ fm = styles[id].getFontMetrics(defaultFont, painter.getGraphics()); } - final int length = tokens.length; + final int length = tokens.getLength(); for (int i = 0; i < length; i++) { final char c = segmentArray[segmentOffset + offset + i]; @@ -675,7 +677,7 @@ } offset += length; - tokens = tokens.next; + tokens = tokens.getNext(); } } } @@ -1500,7 +1502,7 @@ protected boolean rectSelect; - final void fireCaretEvent() { + protected final void fireCaretEvent() { final Object[] listeners = listenerList.getListenerList(); for (int i = listeners.length - 2; i >= 0; i--) { if (listeners[i] == CaretListener.class) { @@ -1509,7 +1511,7 @@ } } - final void updateBracketHighlight(final int newCaretPosition) { + protected final void updateBracketHighlight(final int newCaretPosition) { if (newCaretPosition == 0) { bracketPosition = bracketLine = -1; return; @@ -1529,7 +1531,7 @@ bracketLine = bracketPosition = -1; } - final void documentChanged(final DocumentEvent evt) { + protected final void documentChanged(final DocumentEvent evt) { final DocumentEvent.ElementChange ch = evt.getChange(document.getDefaultRootElement()); final int count; Modified: trunk/daimonin/src/daieditor/textedit/textarea/KeywordMap.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/textarea/KeywordMap.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/daimonin/src/daieditor/textedit/textarea/KeywordMap.java 2006-05-29 19:51:19 UTC (rev 72) @@ -98,30 +98,30 @@ } // protected members - final int mapLength; + private final int mapLength; - final int getStringMapKey(final String s) { + public final int getStringMapKey(final String s) { return (Character.toUpperCase(s.charAt(0)) + Character.toUpperCase(s.charAt(s.length() - 1))) % mapLength; } - final int getSegmentMapKey(final Segment s, final int off, final int len) { + public final int getSegmentMapKey(final Segment s, final int off, final int len) { return (Character.toUpperCase(s.array[off]) + Character.toUpperCase(s.array[off + len - 1])) % mapLength; } // private members static final class Keyword { - Keyword(final char[] keyword, final byte id, final Keyword next) { + public Keyword(final char[] keyword, final byte id, final Keyword next) { this.keyword = keyword; this.id = id; this.next = next; } - final char[] keyword; + private final char[] keyword; - final byte id; + private final byte id; - final Keyword next; + private final Keyword next; } private final Keyword[] map; Modified: trunk/daimonin/src/daieditor/textedit/textarea/SyntaxUtilities.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/textarea/SyntaxUtilities.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/daimonin/src/daieditor/textedit/textarea/SyntaxUtilities.java 2006-05-29 19:51:19 UTC (rev 72) @@ -122,12 +122,12 @@ int offset = 0; while (true) { - final byte id = tokens.id; + final byte id = tokens.getId(); if (id == Token.END) { break; } - final int length = tokens.length; + final int length = tokens.getLength(); if (id == Token.NULL) { if (!defaultColor.equals(gfx.getColor())) { gfx.setColor(defaultColor); @@ -144,7 +144,7 @@ line.offset += length; offset += length; - tokens = tokens.next; + tokens = tokens.getNext(); } return x; Modified: trunk/daimonin/src/daieditor/textedit/textarea/TextAreaDefaults.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/textarea/TextAreaDefaults.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/daimonin/src/daieditor/textedit/textarea/TextAreaDefaults.java 2006-05-29 19:51:19 UTC (rev 72) @@ -22,45 +22,45 @@ private static TextAreaDefaults DEFAULTS; - public InputHandler inputHandler; + private InputHandler inputHandler; - public SyntaxDocument document; + private SyntaxDocument document; - public boolean editable; + private boolean editable; - public boolean caretVisible; + private boolean caretVisible; - public boolean caretBlinks; + private boolean caretBlinks; - public boolean blockCaret; + private boolean blockCaret; - public int electricScroll; + private int electricScroll; - public int cols; + private int cols; - public int rows; + private int rows; - public SyntaxStyle[] styles; + private SyntaxStyle[] styles; - public Color caretColor; + private Color caretColor; - public Color selectionColor; + private Color selectionColor; - public Color lineHighlightColor; + private Color lineHighlightColor; - public boolean lineHighlight; + private boolean lineHighlight; - public Color bracketHighlightColor; + private Color bracketHighlightColor; - public boolean bracketHighlight; + private boolean bracketHighlight; - public Color eolMarkerColor; + private Color eolMarkerColor; - public boolean eolMarkers; + private boolean eolMarkers; - public boolean paintInvalid; + private boolean paintInvalid; - public JPopupMenu popup; + private JPopupMenu popup; /** * Returns a new TextAreaDefaults object with the default values filled in. @@ -98,4 +98,84 @@ return DEFAULTS; } + public InputHandler getInputHandler() { + return inputHandler; + } + + public SyntaxDocument getDocument() { + return document; + } + + public boolean getEditable() { + return editable; + } + + public boolean getCaretVisible() { + return caretVisible; + } + + public boolean getCaretBlinks() { + return caretBlinks; + } + + public boolean getBlockCaret() { + return blockCaret; + } + + public int getElectricScroll() { + return electricScroll; + } + + public int getCols() { + return cols; + } + + public int getRows() { + return rows; + } + + public SyntaxStyle[] getStyles() { + return styles; + } + + public Color getCaretColor() { + return caretColor; + } + + public Color getSelectionColor() { + return selectionColor; + } + + public Color getLineHighlightColor() { + return lineHighlightColor; + } + + public boolean getLineHighlight() { + return lineHighlight; + } + + public Color getBracketHighlightColor() { + return bracketHighlightColor; + } + + public boolean getBracketHighlight() { + return bracketHighlight; + } + + public Color getEolMarkerColor() { + return eolMarkerColor; + } + + public boolean getEolMarkers() { + return eolMarkers; + } + + public boolean getPaintInvalid() { + return paintInvalid; + } + + public JPopupMenu getPopup() { + return popup; + } + } // class TextAreaDefaults Modified: trunk/daimonin/src/daieditor/textedit/textarea/TextAreaPainter.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/textarea/TextAreaPainter.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/daimonin/src/daieditor/textedit/textarea/TextAreaPainter.java 2006-05-29 19:51:19 UTC (rev 72) @@ -42,11 +42,11 @@ private static final long serialVersionUID = 1L; // package-private members - int currentLineIndex; + private int currentLineIndex; - Token currentLineTokens; + private Token currentLineTokens; - final Segment currentLine; + private final Segment currentLine; // protected members protected final JEditTextArea textArea; @@ -113,19 +113,19 @@ setForeground(Color.black); setBackground(Color.white); - blockCaret = defaults.blockCaret; - styles = defaults.styles; - cols = defaults.cols; - rows = defaults.rows; - caretColor = defaults.caretColor; - selectionColor = defaults.selectionColor; - lineHighlightColor = defaults.lineHighlightColor; - lineHighlight = defaults.lineHighlight; - bracketHighlightColor = defaults.bracketHighlightColor; - bracketHighlight = defaults.bracketHighlight; - paintInvalid = defaults.paintInvalid; - eolMarkerColor = defaults.eolMarkerColor; - eolMarkers = defaults.eolMarkers; + blockCaret = defaults.getBlockCaret(); + styles = defaults.getStyles(); + cols = defaults.getCols(); + rows = defaults.getRows(); + caretColor = defaults.getCaretColor(); + selectionColor = defaults.getSelectionColor(); + lineHighlightColor = defaults.getLineHighlightColor(); + lineHighlight = defaults.getLineHighlight(); + bracketHighlightColor = defaults.getBracketHighlightColor(); + bracketHighlight = defaults.getBracketHighlight(); + paintInvalid = defaults.getPaintInvalid(); + eolMarkerColor = defaults.getEolMarkerColor(); + eolMarkers = defaults.getEolMarkers(); needMetricsUpdate = true; // need to update font metrics before drawing needLineUpdate = true; } @@ -526,7 +526,7 @@ * This is the first method which gets directly called from paint(). All * lines which are sceduled for redraw get drawn with this method. */ - final void paintLine(final Graphics gfx, final TokenMarker tokenMarker, final int line, final int x) { + protected final void paintLine(final Graphics gfx, final TokenMarker tokenMarker, final int line, final int x) { final Font defaultFont = getFont(); final Color defaultColor = getForeground(); @@ -546,7 +546,7 @@ } } - final void paintPlainLine(final Graphics gfx, final int line, final Font defaultFont, final Color defaultColor, int x, int y) { + protected final void paintPlainLine(final Graphics gfx, final int line, final Font defaultFont, final Color defaultColor, int x, int y) { paintHighlight(gfx, line, y); textArea.getLineText(line, currentLine); @@ -566,7 +566,7 @@ * When syntax highlighting is enabled, this method is called from * paintLine() to do the actual drawing of the line. */ - final void paintSyntaxLine(final Graphics gfx, final TokenMarker tokenMarker, final int line, final Font defaultFont, final Color defaultColor, int x, int y) { + protected final void paintSyntaxLine(final Graphics gfx, final TokenMarker tokenMarker, final int line, final Font defaultFont, final Color defaultColor, int x, int y) { textArea.getLineText(currentLineIndex, currentLine); currentLineTokens = tokenMarker.markTokens(currentLine, currentLineIndex); @@ -586,7 +586,7 @@ } } - final void paintHighlight(final Graphics gfx, final int line, final int y) { + protected final void paintHighlight(final Graphics gfx, final int line, final int y) { if (line >= textArea.getSelectionStartLine() && line <= textArea.getSelectionEndLine()) { paintLineHighlight(gfx, line, y); } @@ -604,7 +604,7 @@ } } - final void paintLineHighlight(final Graphics gfx, final int line, int y) { + protected final void paintLineHighlight(final Graphics gfx, final int line, int y) { final int height = fm.getHeight(); y += fm.getLeading() + fm.getMaxDescent(); @@ -654,7 +654,7 @@ } - final void paintBracketHighlight(final Graphics gfx, final int line, int y) { + protected final void paintBracketHighlight(final Graphics gfx, final int line, int y) { final int position = textArea.getBracketPosition(); if (position == -1) { return; @@ -669,7 +669,7 @@ gfx.drawRect(x, y, fm.charWidth('(') - 1, fm.getHeight() - 1); } - final void paintCaret(final Graphics gfx, final int line, int y) { + protected final void paintCaret(final Graphics gfx, final int line, int y) { if (textArea.isCaretVisible()) { final int offset = textArea.getCaretPosition() - textArea.getLineStartOffset(line); final int caretX = textArea._offsetToX(line, offset); @@ -693,4 +693,21 @@ } } } + + public int getCurrentLineIndex() { + return currentLineIndex; + } + + public void setCurrentLineIndex(int lineIndex) { + currentLineIndex = lineIndex; + } + + public Token getCurrentLineTokens() { + return currentLineTokens; + } + + public void setCurrentLineTokens(Token token) { + currentLineTokens = token; + } + } // class TextAreaPainter Modified: trunk/daimonin/src/daieditor/textedit/textarea/Token.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/textarea/Token.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/daimonin/src/daieditor/textedit/textarea/Token.java 2006-05-29 19:51:19 UTC (rev 72) @@ -100,13 +100,13 @@ public static final byte END = 127; /** The length of this token. */ - public int length; + private int length; /** The id of this token. */ - public byte id; + private byte id; /** The next token in the linked list. */ - public Token next; + private Token next; /** * Creates a new token. @@ -123,4 +123,28 @@ return "[id=" + id + ",length=" + length + "]"; } + public byte getId() { + return id; + } + + public void setId(byte id_) { + id = id_; + } + + public int getLength() { + return length; + } + + public void setLength(int length_) { + length = length_; + } + + public Token getNext() { + return next; + } + + public void setNext(Token next_) { + next = next_; + } + } // class Token Modified: trunk/daimonin/src/daieditor/textedit/textarea/TokenMarker.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/textarea/TokenMarker.java 2006-05-29 19:06:56 UTC (rev 71) +++ trunk/daimonin/src/daieditor/textedit/textarea/TokenMarker.java 2006-05-29 19:51:19 UTC (rev 72) @@ -258,15 +258,15 @@ lastToken = firstToken; } else if (lastToken == null) { lastToken = firstToken; - firstToken.length = length; - firstToken.id = id; - } else if (lastToken.next == null) { - lastToken.next = new Token(length, id); - lastToken = lastToken.next; + firstToken.setLength(length); + firstToken.setId(id); + } else if (lastToken.getNext() == null) { + lastToken.setNext(new Token(length, id)); + lastToken = lastToken.getNext(); } else { - lastToken = lastToken.next; - lastToken.length = length; - lastToken.id = id; + lastToken = lastToken.getNext(); + lastToken.setLength(length); + lastToken.setId(id); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
