Added a class to represent a selected range in the textpane

Added some static methods in TextPane for getting text from lines
Fixed an unchecked type conversion in the parser

git-svn-id: http://svn.dmdirc.com/trunk@3486 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/parser/ProcessQuit.java

@@ -55,7 +55,7 @@ public class ProcessQuit extends IRCProcessor {
 		String sReason = "";
 		if (token.length > 2) { sReason = token[token.length-1]; }
 		
-		ArrayList<ChannelInfo> channelList = new ArrayList(myParser.getChannels());
+		ArrayList<ChannelInfo> channelList = new ArrayList<ChannelInfo>(myParser.getChannels());
 		for (ChannelInfo iChannel : channelList) {
 			iChannelClient = iChannel.getUser(iClient);
 			if (iChannelClient != null) {

src/com/dmdirc/ui/swing/components/SwingSearchBar.java

@@ -28,6 +28,7 @@ import com.dmdirc.ui.interfaces.SearchBar;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.ui.swing.actions.SearchAction;
+import com.dmdirc.ui.swing.textpane.LinePosition;
 import com.dmdirc.ui.swing.textpane.TextPane;
 
 import java.awt.event.ActionEvent;
@@ -274,7 +275,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
                 } else {
                     //found, select and return found
                     textPane.setScrollBarPosition(line);
-                    textPane.setSelectedTexT(line, position, line, position + text.length());
+                    textPane.setSelectedTexT(new LinePosition(line, position, line, position + text.length()));
                     index = position;
                     return true;
                 }
@@ -339,7 +340,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
                 } else {
                     //found, select and return found
                     textPane.setScrollBarPosition(line);
-                    textPane.setSelectedTexT(line, position, line, position + text.length());
+                    textPane.setSelectedTexT(new LinePosition(line, position, line, position + text.length()));
                     position = position + text.length();
                     index = position;
                     return true;
@@ -377,7 +378,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
                 lineText = textPane.getTextFromLine(i).toLowerCase(Locale.getDefault());
                 position = lineText.indexOf(text.toLowerCase(Locale.getDefault()));
             }
-            if (position != -1 && textPane.getSelectedRange()[0] != i) {
+            if (position != -1 && textPane.getSelectedRange().getStartLine() != i) {
                 foundText = true;
                 break;
             }

src/com/dmdirc/ui/swing/components/TextFrame.java

@@ -47,6 +47,7 @@ import com.dmdirc.ui.swing.actions.HyperlinkCopyAction;
 import com.dmdirc.ui.swing.actions.NicknameCopyAction;
 import com.dmdirc.ui.swing.actions.SearchAction;
 import com.dmdirc.ui.swing.actions.TextPaneCopyAction;
+import com.dmdirc.ui.swing.textpane.LineInfo;
 import com.dmdirc.ui.swing.textpane.TextPane;
 import com.dmdirc.ui.swing.textpane.TextPane.ClickType;
 import com.dmdirc.ui.swing.textpane.TextPanePageUpAction;
@@ -562,10 +563,9 @@ public abstract class TextFrame extends JInternalFrame implements Window,
             final MouseClickType type) {
         final Point point = getTextPane().getMousePosition();
         if (e.getSource() == getTextPane() && point != null) {
-            final int[] lineInfo = getTextPane().getClickPosition(point);
+            final LineInfo lineInfo = getTextPane().getClickPosition(point);
             final ClickType clickType = getTextPane().getClickType(lineInfo);
-            final String attribute = (String) getTextPane().
-                    getAttributeValueAtPoint(lineInfo);
+            final String attribute = (String) getTextPane().getAttributeValueAtPoint(lineInfo);
             if (e.isPopupTrigger()) {
                 showPopupMenuInternal(clickType, point, attribute);
             } else {

src/com/dmdirc/ui/swing/textpane/LineInfo.java

@@ -31,6 +31,8 @@ public final class LineInfo {
     private final int line;
     /** What part of a line. */
     private final int part;
+    /** Character index? */
+    private final int index;
     
     /** 
      * Creates a new instance of LineInfo. 
@@ -39,8 +41,20 @@ public final class LineInfo {
      * @param part line wrap number
      */
     public LineInfo(final int line, final int part) {
+        this(line, part, -1);
+    }
+    
+    /** 
+     * Creates a new instance of LineInfo. 
+     *
+     * @param line Line number
+     * @param part line wrap number
+     * @param index Position index
+     */
+    public LineInfo(final int line, final int part, final int index) {
         this.line = line;
         this.part = part;
+        this.index = index;
     }
     
     /**
@@ -60,4 +74,13 @@ public final class LineInfo {
     public int getPart() {
         return part;
     }
+    
+    /**
+     * Returns the index for this line.
+     * 
+     * @return Index for the line of -1
+     */
+    public int getIndex() {
+        return index;
+    }
 }

src/com/dmdirc/ui/swing/textpane/LinePosition.java

@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.ui.swing.textpane;
+
+/**
+ * Holds information about a range of text.
+ */
+public class LinePosition {
+
+    /** Starting line. */
+    private int startLine;
+    /** Ending line. */
+    private int endLine;
+    /** Starting position. */
+    private int startPos;
+    /** Ending position. */
+    private int endPos;
+
+    /**
+     * Constructs a new line position.
+     * 
+     * @param startLine Starting line
+     * @param endLine Ending line
+     * @param startPos Starting position
+     * @param endPos Ending position
+     */
+    public LinePosition(final int startLine, final int startPos,
+            final int endLine, final int endPos) {
+        this.startLine = startLine;
+        this.endLine = endLine;
+        this.startPos = startPos;
+        this.endPos = endPos;
+    }
+
+    /**
+     * Returns the end line for this position.
+     * 
+     * @return End line
+     */
+    public int getEndLine() {
+        return endLine;
+    }
+
+    /**
+     * Returns the end position for this position.
+     * 
+     * @return End position
+     */
+    public int getEndPos() {
+        return endPos;
+    }
+
+    /**
+     * Returns the start line for this position.
+     * 
+     * @return Start line
+     */
+    public int getStartLine() {
+        return startLine;
+    }
+
+    /**
+     * Returns the start position for this position.
+     * 
+     * @return Start position
+     */
+    public int getStartPos() {
+        return startPos;
+    }
+    
+    /**
+     * Sets the positions end line.
+     * 
+     * @param endLine new end line
+     */
+    public void setEndLine(int endLine) {
+        this.endLine = endLine;
+    }
+
+    /**
+     * Sets the positions end line.
+     * 
+     * @param endPos new end line
+     */
+    public void setEndPos(int endPos) {
+        this.endPos = endPos;
+    }
+
+    /**
+     * Sets the positions start line.
+     * 
+     * @param startLine new start line
+     */
+    public void setStartLine(int startLine) {
+        this.startLine = startLine;
+    }
+
+    /**
+     * Sets the positions start position.
+     * 
+     * @param startPos new start position
+     */
+    public void setStartPos(int startPos) {
+        this.startPos = startPos;
+    }
+}

src/com/dmdirc/ui/swing/textpane/TextPane.java

@@ -305,13 +305,21 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         }
     }
     
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse wheel event
+     */
     @Override
     public void adjustmentValueChanged(final AdjustmentEvent e) {
         setScrollBarPosition(e.getValue());
     }
     
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse wheel event
+     */
     @Override
     public void mouseWheelMoved(final MouseWheelEvent e) {
         if (scrollBar.isEnabled()) {
@@ -331,36 +339,41 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      *
      * @return line number, line part, position in whole line
      */
-    public int[] getClickPosition(final Point point) {
+    public LineInfo getClickPosition(final Point point) {
         return canvas.getClickPosition(point);
     }
     
     /**
      * Returns the selected text.
+     * 
+     *     *    <li>0 = start line</li>
+     *    <li>1 = start char</li>
+     *    <li>2 = end line</li>
+     *    <li>3 = end char</li>
      *
      * @return Selected text
      */
     public String getSelectedText() {
         final StringBuffer selectedText = new StringBuffer();
-        final int[] selectedRange = canvas.getSelectedRange();
+        final LinePosition selectedRange = canvas.getSelectedRange();
         
-        for (int i = selectedRange[0]; i <= selectedRange[2]; i++) {
-            if (i != selectedRange[0]) {
+        for (int i = selectedRange.getStartLine(); i <= selectedRange.getEndLine(); i++) {
+            if (i != selectedRange.getStartLine()) {
                 selectedText.append('\n');
             }
             if (document.getLine(i) == null) {
                 return "";
             }
             final AttributedCharacterIterator iterator = document.getLine(i).getIterator();
-            if (selectedRange[2] == selectedRange[0]) {
+            if (selectedRange.getEndLine() == selectedRange.getStartLine()) {
                 //loop through range
-                selectedText.append(getTextFromLine(iterator, selectedRange[1], selectedRange[3]));
-            } else if (i == selectedRange[0]) {
+                selectedText.append(getTextFromLine(iterator, selectedRange.getStartPos(), selectedRange.getEndPos()));
+            } else if (i == selectedRange.getStartLine()) {
                 //loop from start of range to the end
-                selectedText.append(getTextFromLine(iterator, selectedRange[1], iterator.getEndIndex()));
-            } else if (i == selectedRange[2]) {
+                selectedText.append(getTextFromLine(iterator, selectedRange.getStartPos(), iterator.getEndIndex()));
+            } else if (i == selectedRange.getEndLine()) {
                 //loop from start to end of range
-                selectedText.append(getTextFromLine(iterator, 0, selectedRange[3]));
+                selectedText.append(getTextFromLine(iterator, 0, selectedRange.getEndPos()));
             } else {
                 //loop the whole line
                 selectedText.append(getTextFromLine(iterator, 0, iterator.getEndIndex()));
@@ -374,14 +387,8 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      * Returns the selected range.
      *
      * @return selected range
-     *  <ul>
-     *    <li>0 = start line</li>
-     *    <li>1 = start char</li>
-     *    <li>2 = end line</li>
-     *    <li>3 = end char</li>
-     *  </ul>
      */
-    public int[] getSelectedRange() {
+    public LinePosition getSelectedRange() {
         return canvas.getSelectedRange();
     }
     
@@ -391,21 +398,17 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      * @return true iif there is a selected range
      */
     public boolean hasSelectedRange() {
-        final int[] selectedRange = canvas.getSelectedRange();
-        return !(selectedRange[0] == selectedRange[2] && selectedRange[1] == selectedRange[3]);
+        final LinePosition selectedRange = canvas.getSelectedRange();
+        return !(selectedRange.getStartLine() == selectedRange.getEndLine() && selectedRange.getStartPos() == selectedRange.getEndPos());
     }
     
     /**
      * Selects the specified region of text.
      *
-     * @param startLine Start line
-     * @param startChar Start char
-     * @param endLine End line
-     * @param endChar End char
+     * @param position Line position
      */
-    public void setSelectedTexT(final int startLine, final int startChar,
-            final int endLine, final int endChar) {
-        canvas.setSelectedRange(startLine, startChar, endLine, endChar);
+    public void setSelectedTexT(final LinePosition position) {
+        canvas.setSelectedRange(position);
     }
     
     /**
@@ -417,7 +420,20 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      */
     public String getTextFromLine(final int line) {
         final AttributedCharacterIterator iterator = document.getLine(line).getIterator();
-        return getTextFromLine(iterator, 0, iterator.getEndIndex());
+        return getTextFromLine(iterator, 0, iterator.getEndIndex(), document);
+    }
+    
+    /**
+     * Returns the entire text from the specified line.
+     *
+     * @param line line to retrieve text from
+     * @param document Document to retrieve text from
+     * 
+     * @return Text from the line
+     */
+    public static String getTextFromLine(final int line, final IRCDocument document) {
+        final AttributedCharacterIterator iterator = document.getLine(line).getIterator();
+        return getTextFromLine(iterator, 0, iterator.getEndIndex(), document);
     }
     
     /**
@@ -431,7 +447,22 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      */
     public String getTextFromLine(final int line, final int start,
             final int end) {
-        return getTextFromLine(document.getLine(line).getIterator(), start, end);
+        return getTextFromLine(document.getLine(line).getIterator(), start, end, document);
+    }
+    
+    /**
+     * Returns the range of text from the specified iterator.
+     *
+     * @param line line to retrieve text from
+     * @param start Start index in the iterator
+     * @param end End index in the iterator
+     * @param document Document to retrieve text from
+     *
+     * @return Text in the range from the line
+     */
+    public static String getTextFromLine(final int line, final int start,
+            final int end, final IRCDocument document) {
+        return getTextFromLine(document.getLine(line).getIterator(), start, end, document);
     }
     
     /**
@@ -442,13 +473,19 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      * @return Text in the range from the line
      */
     public String getTextFromLine(final AttributedCharacterIterator iterator) {
-        final int end = iterator.getEndIndex();
-        final int start = iterator.getBeginIndex();
-        final StringBuffer text = new StringBuffer();
-        for (iterator.setIndex(start); iterator.getIndex() < end; iterator.next()) {
-            text.append(iterator.current());
-        }
-        return text.toString();
+        return getTextFromLine(iterator, iterator.getBeginIndex(), iterator.getEndIndex(), document);
+    }
+    
+    /**
+     * Returns the range of text from the specified iterator.
+     *
+     * @param iterator iterator to get text from
+     * @param document Document to retrieve text from
+     *
+     * @return Text in the range from the line
+     */
+    public static String getTextFromLine(final AttributedCharacterIterator iterator, final IRCDocument document) {
+        return getTextFromLine(iterator, iterator.getBeginIndex(), iterator.getEndIndex(), document);
     }
     
     /**
@@ -462,6 +499,21 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      */
     public String getTextFromLine(final AttributedCharacterIterator iterator,
             final int start, final int end) {
+        return getTextFromLine(iterator, start, end, document);
+    }
+    
+    /**
+     * Returns the range of text from the specified iterator.
+     *
+     * @param iterator iterator to get text from
+     * @param start Start index in the iterator
+     * @param end End index in the iterator
+     * @param document Document to retrieve text from
+     *
+     * @return Text in the range from the line
+     */
+    public static String getTextFromLine(final AttributedCharacterIterator iterator,
+            final int start, final int end, final IRCDocument document) {
         final StringBuffer text = new StringBuffer();
         for (iterator.setIndex(start); iterator.getIndex() < end; iterator.next()) {
             text.append(iterator.current());
@@ -476,7 +528,7 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      * 
      * @return Click type for specified position
      */
-    public ClickType getClickType(final int[] lineInfo) {
+    public ClickType getClickType(final LineInfo lineInfo) {
         return canvas.getClickType(lineInfo);
     }
     
@@ -503,7 +555,7 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      * 
      * @return Specified value
      */
-    public Object getAttributeValueAtPoint(int[] lineInfo) {
+    public Object getAttributeValueAtPoint(LineInfo lineInfo) {
         return canvas.getAttributeValueAtPoint(lineInfo);
     }
     
@@ -538,20 +590,19 @@ public final class TextPane extends JComponent implements AdjustmentListener,
             return;
         }
         final int trimmedLines = document.getNumLines() - numLines;
-        final int[] selectedRange = getSelectedRange();
+        final LinePosition selectedRange = getSelectedRange();
         
-        selectedRange[0] -= trimmedLines;
-        selectedRange[2] -= trimmedLines;
+        selectedRange.setStartLine(selectedRange.getStartLine() - trimmedLines);
+        selectedRange.setEndLine(selectedRange.getEndLine() - trimmedLines);
         
-        if (selectedRange[0] < 0) {
-            selectedRange[0] = 0;
+        if (selectedRange.getStartLine() < 0) {
+            selectedRange.setStartLine(0);
         }
-        if (selectedRange[2] < 0) {
-            selectedRange[2] = 0;
+        if (selectedRange.getEndLine() < 0) {
+            selectedRange.setEndLine(0);
         }
         
-        setSelectedTexT(selectedRange[0], selectedRange[1], 
-                selectedRange[2], selectedRange[3]);
+        setSelectedTexT(selectedRange);
         document.trim(numLines);
     }
     

src/com/dmdirc/ui/swing/textpane/TextPaneCanvas.java

@@ -388,28 +388,28 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         final int start;
         final int end;
         
-        final int[] lineInfo = getClickPosition(getMousePosition());
+        final LineInfo lineInfo = getClickPosition(getMousePosition());
         
-        if (lineInfo[0] != -1) {
-            clickedText = textPane.getTextFromLine(lineInfo[0]);
+        if (lineInfo.getLine() != -1) {
+            clickedText = textPane.getTextFromLine(lineInfo.getLine());
             
-            if (lineInfo[2] == -1) {
+            if (lineInfo.getIndex() == -1) {
                 start = -1;
                 end = -1;
             } else {
-                final int[] extent = getSurroundingWordIndexes(clickedText, lineInfo[2]);
+                final int[] extent = getSurroundingWordIndexes(clickedText, lineInfo.getIndex());
                 start = extent[0];
                 end = extent[1];
             }
             
             if (e.getClickCount() == 2) {
-                selStartLine = lineInfo[0];
-                selEndLine = lineInfo[0];
+                selStartLine = lineInfo.getLine();
+                selEndLine = lineInfo.getLine();
                 selStartChar = start;
                 selEndChar = end;
             } else if (e.getClickCount() == 3) {
-                selStartLine = lineInfo[0];
-                selEndLine = lineInfo[0];
+                selStartLine = lineInfo.getLine();
+                selEndLine = lineInfo.getLine();
                 selStartChar = 0;
                 selEndChar = clickedText.length();
             }
@@ -426,10 +426,10 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * 
      * @return Click type for specified position
      */
-    public ClickType getClickType(final int[] lineInfo) {
-        if (lineInfo[0] != -1) {
-            final AttributedCharacterIterator iterator = document.getLine(lineInfo[0]).getIterator();
-            iterator.setIndex(lineInfo[2]);
+    public ClickType getClickType(final LineInfo lineInfo) {
+        if (lineInfo.getLine() != -1) {
+            final AttributedCharacterIterator iterator = document.getLine(lineInfo.getLine()).getIterator();
+            iterator.setIndex(lineInfo.getIndex());
             Object linkattr = iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
             if (linkattr instanceof String) {
                 return ClickType.HYPERLINK;
@@ -454,10 +454,10 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * 
      * @return Specified value
      */
-    public Object getAttributeValueAtPoint(int[] lineInfo) {
-        if (lineInfo[0] != -1) {
-            final AttributedCharacterIterator iterator = document.getLine(lineInfo[0]).getIterator();
-            iterator.setIndex(lineInfo[2]);
+    public Object getAttributeValueAtPoint(LineInfo lineInfo) {
+        if (lineInfo.getLine() != -1) {
+            final AttributedCharacterIterator iterator = document.getLine(lineInfo.getLine()).getIterator();
+            iterator.setIndex(lineInfo.getIndex());
             Object linkattr = iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
             if (linkattr instanceof String) {
                 return linkattr;
@@ -583,14 +583,14 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
     
     /** Checks for a link under the cursor and sets appropriately. */
     private void checkForLink() {
-        final int[] info = getClickPosition(getMousePosition());
+        final LineInfo info = getClickPosition(getMousePosition());
         
-        if (info[0] != -1 && document.getLine(info[0]) != null) {
-            final AttributedCharacterIterator iterator = document.getLine(info[0]).getIterator();
-            if (info[2] < iterator.getBeginIndex() || info[2] > iterator.getEndIndex()) {
+        if (info.getLine() != -1 && document.getLine(info.getLine()) != null) {
+            final AttributedCharacterIterator iterator = document.getLine(info.getLine()).getIterator();
+            if (info.getIndex() < iterator.getBeginIndex() || info.getIndex() > iterator.getEndIndex()) {
                 return;
             }
-            iterator.setIndex(info[2]);
+            iterator.setIndex(info.getIndex());
             Object linkattr = iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
             if (linkattr instanceof String) {
                 setCursor(HAND_CURSOR);
@@ -631,14 +631,14 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
                     }
                 }
             } else {
-                final int[] info = getClickPosition(point);
-                if (info[0] != -1 && info[1] != -1) {
+                final LineInfo info = getClickPosition(point);
+                if (info.getIndex() != -1 && info.getPart() != -1) {
                     if (type == MouseEventType.CLICK) {
-                        selStartLine = info[0];
-                        selStartChar = info[2];
+                        selStartLine = info.getLine();
+                        selStartChar = info.getIndex();
                     }
-                    selEndLine = info[0];
-                    selEndChar = info[2];
+                    selEndLine = info.getLine();
+                    selEndChar = info.getIndex();
                     
                     if (isVisible()) {
                         repaint();
@@ -656,7 +656,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      *
      * @return line number, line part, position in whole line
      */
-    public int[] getClickPosition(final Point point) {
+    public LineInfo getClickPosition(final Point point) {
         int lineNumber = -1;
         int linePart = -1;
         int pos = 0;
@@ -682,30 +682,24 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
             }
         }
         
-        return new int[]{lineNumber, linePart, pos};
+        return new LineInfo(lineNumber, linePart, pos);
     }
     
     /**
      * Returns the selected range info.
-     *  <ul>
-     *    <li>0 = start line</li>
-     *    <li>1 = start char</li>
-     *    <li>2 = end line</li>
-     *    <li>3 = end char</li>
-     *  </ul>
      *
      * @return Selected range info
      */
-    protected int[] getSelectedRange() {
+    protected LinePosition getSelectedRange() {
         if (selStartLine > selEndLine) {
             // Swap both
-            return new int[]{selEndLine, selEndChar, selStartLine, selStartChar, };
+            return new LinePosition(selEndLine, selEndChar, selStartLine, selStartChar);
         } else if (selStartLine == selEndLine && selStartChar > selEndChar) {
             // Just swap the chars
-            return new int[]{selStartLine, selEndChar, selEndLine, selStartChar, };
+            return new LinePosition(selStartLine, selEndChar, selEndLine, selStartChar);
         } else {
             // Swap nothing
-            return new int[]{selStartLine, selStartChar, selEndLine, selEndChar, };
+            return new LinePosition(selStartLine, selStartChar, selEndLine, selEndChar);
         }
     }
     
@@ -721,17 +715,13 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
     /**
      * Selects the specified region of text.
      *
-     * @param startLine Start line
-     * @param startChar Start char
-     * @param endLine End line
-     * @param endChar End char
+     * @param position Line position
      */
-    public void setSelectedRange(final int startLine, final int startChar,
-            final int endLine, final int endChar) {
-        selStartLine = startLine;
-        selStartChar = startChar;
-        selEndLine = endLine;
-        selEndChar = endChar;
+    public void setSelectedRange(final LinePosition position) {
+        selStartLine = position.getStartLine();
+        selStartChar = position.getStartPos();
+        selEndLine = position.getEndLine();
+        selEndChar = position.getEndPos();
         if (isVisible()) {
             repaint();
         }