Merge pull request #11 from csmith/lineposition

Add normalise method to line position, unit test.

src/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.dmdirc.Main
+

src/com/dmdirc/ui/messages/LinePosition.java

@@ -136,10 +136,30 @@ public class LinePosition {
         this.startPos = startPos;
     }
 
+    /**
+     * Gets a new, normalised version of this position. Start and end lines and positions are
+     * normalised such that the same range of lines and positions are included, but the start
+     * line and position comes before the end line and position.
+     *
+     * @return A normalised copy of this position.
+     */
+    public LinePosition getNormalised() {
+        if (startLine > endLine) {
+            // Multi-line "backwards" selection; swap both lines and positions.
+            return new LinePosition(endLine, endPos, startLine, startPos);
+        } else if (startLine == endLine && startPos > endPos) {
+            // Single-line "backwards" selection; just swap the positions.
+            return new LinePosition(startLine, endPos, endLine, startPos);
+        } else {
+            // Single- or multi-line "forward" selection; swap nothing.
+            return new LinePosition(startLine, startPos, endLine, endPos);
+        }
+    }
+
     @Override
     public String toString() {
         return "Position[" + startLine + ", " + startPos + ", " + endLine
-                + ", " + endPos + "]";
+                + ", " + endPos + ']';
     }
 
 }

test/com/dmdirc/ui/messages/LinePositionTest.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.messages;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class LinePositionTest {
+
+    @Test
+    public void testNormaliseWithForwardMultiLineSelection() {
+        final LinePosition input = new LinePosition(2, 5, 4, 1);
+        assertEquals(input.toString(), input.getNormalised().toString());
+    }
+
+    @Test
+    public void testNormaliseWithForwardSingleLineSelection() {
+        final LinePosition input = new LinePosition(2, 5, 2, 8);
+        assertEquals(input.toString(), input.getNormalised().toString());
+    }
+
+    @Test
+    public void testNormaliseWithBackwardMultiLineSelection() {
+        final LinePosition input = new LinePosition(5, 8, 2, 5);
+        final LinePosition expected = new LinePosition(2, 5, 5, 8);
+        assertEquals(expected.toString(), input.getNormalised().toString());
+    }
+
+    @Test
+    public void testNormaliseWithBackwardSingleLineSelection() {
+        final LinePosition input = new LinePosition(2, 8, 2, 5);
+        final LinePosition expected = new LinePosition(2, 5, 2, 8);
+        assertEquals(expected.toString(), input.getNormalised().toString());
+    }
+
+    @Test
+    public void testCloneConstructor() {
+        final LinePosition input = new LinePosition(2, 4, 6, 8);
+        assertEquals(input.toString(), new LinePosition(input).toString());
+    }
+
+    @Test
+    public void testGetters() {
+        final LinePosition input = new LinePosition(2, 4, 6, 8);
+        assertEquals(2, input.getStartLine());
+        assertEquals(4, input.getStartPos());
+        assertEquals(6, input.getEndLine());
+        assertEquals(8, input.getEndPos());
+    }
+
+    @Test
+    public void testSetters() {
+        final LinePosition input = new LinePosition(2, 4, 6, 8);
+
+        input.setStartLine(17);
+        assertEquals(17, input.getStartLine());
+        input.setStartPos(27);
+        assertEquals(27, input.getStartPos());
+        input.setEndLine(13);
+        assertEquals(13, input.getEndLine());
+        input.setEndPos(786);
+        assertEquals(786, input.getEndPos());
+
+        final LinePosition expected = new LinePosition(17, 27, 13, 786);
+        assertEquals(expected.toString(), input.toString());
+    }
+
+}