renamed -> reorderSegmentPosition
diff --git a/NatTable/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/reorder/ReorderSegmentAxis.xtend b/NatTable/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/reorder/ReorderSegmentAxis.xtend
index face396..d51a538 100644
--- a/NatTable/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/reorder/ReorderSegmentAxis.xtend
+++ b/NatTable/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/reorder/ReorderSegmentAxis.xtend
@@ -62,12 +62,14 @@
reorderedSegmentIds.indexOf(segmentId)
}
+ //
+
/**
* Moves a segment from a given position to a new position.
* @param fromSegmentPosition The segment position to move.
* @param toSegmentPosition The new position to move the segment to.
*/
- def void reorderSegment(int fromSegmentPosition, int toSegmentPosition) {
+ def void reorderSegmentPosition(int fromSegmentPosition, int toSegmentPosition) {
val segmentId = reorderedSegmentIds.get(fromSegmentPosition)
reorderedSegmentIds.remove(segmentId)
diff --git a/NatTable/test/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/reorder/ReorderSegmentAxisTest.xtend b/NatTable/test/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/reorder/ReorderSegmentAxisTest.xtend
index e572235..4af5dbf 100644
--- a/NatTable/test/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/reorder/ReorderSegmentAxisTest.xtend
+++ b/NatTable/test/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/reorder/ReorderSegmentAxisTest.xtend
@@ -7,15 +7,15 @@
import static org.eclipse.nebula.widgets.nattable.core.layer.AxisTest.*
-class ReorderSegmentAxisTest {
+class reorderSegmentPositionAxisTest {
Axis underlyingAxis
- ReorderSegmentAxis reorderSegmentAxis
+ ReorderSegmentAxis reorderSegmentPositionAxis
@Before
def void before() {
underlyingAxis = new SimpleAxis(4, 100)
- reorderSegmentAxis = new ReorderSegmentAxis(underlyingAxis)
+ reorderSegmentPositionAxis = new ReorderSegmentAxis(underlyingAxis)
}
@Test
@@ -28,8 +28,8 @@
)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 0, 1, 2, 3 ],
#[ 0, 100, 200, 300, 400 ]
)
@@ -37,11 +37,11 @@
@Test
def void reorderFromBeginningToMiddle() {
- reorderSegmentAxis.reorderSegment(0, 2)
+ reorderSegmentPositionAxis.reorderSegmentPosition(0, 2)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 1, 2, 0, 3 ],
#[ 0, 100, 200, 300, 400 ]
)
@@ -49,11 +49,11 @@
@Test
def void reorderFromBeginningToEnd() {
- reorderSegmentAxis.reorderSegment(0, 3)
+ reorderSegmentPositionAxis.reorderSegmentPosition(0, 3)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 1, 2, 3, 0 ],
#[ 0, 100, 200, 300, 400 ]
)
@@ -61,11 +61,11 @@
@Test
def void reorderFromMiddleToBeginning() {
- reorderSegmentAxis.reorderSegment(2, 0)
+ reorderSegmentPositionAxis.reorderSegmentPosition(2, 0)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 2, 0, 1, 3 ],
#[ 0, 100, 200, 300, 400 ]
)
@@ -73,11 +73,11 @@
@Test
def void reorderFromMiddleToMiddleLeftToRight() {
- reorderSegmentAxis.reorderSegment(1, 2)
+ reorderSegmentPositionAxis.reorderSegmentPosition(1, 2)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 0, 2, 1, 3 ],
#[ 0, 100, 200, 300, 400 ]
)
@@ -85,11 +85,11 @@
@Test
def void reorderFromMiddleToMiddleRightToLeft() {
- reorderSegmentAxis.reorderSegment(2, 1)
+ reorderSegmentPositionAxis.reorderSegmentPosition(2, 1)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 0, 2, 1, 3 ],
#[ 0, 100, 200, 300, 400 ]
)
@@ -97,11 +97,11 @@
@Test
def void reorderFromMiddleToEnd() {
- reorderSegmentAxis.reorderSegment(1, 3)
+ reorderSegmentPositionAxis.reorderSegmentPosition(1, 3)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 0, 2, 3, 1 ],
#[ 0, 100, 200, 300, 400 ]
)
@@ -109,11 +109,11 @@
@Test
def void reorderFromEndToBeginning() {
- reorderSegmentAxis.reorderSegment(3, 0)
+ reorderSegmentPositionAxis.reorderSegmentPosition(3, 0)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 3, 0, 1, 2 ],
#[ 0, 100, 200, 300, 400 ]
)
@@ -121,11 +121,11 @@
@Test
def void reorderFromEndToMiddle() {
- reorderSegmentAxis.reorderSegment(3, 2)
+ reorderSegmentPositionAxis.reorderSegmentPosition(3, 2)
testAxis(
- "reorderSegmentAxis",
- reorderSegmentAxis,
+ "reorderSegmentPositionAxis",
+ reorderSegmentPositionAxis,
#[ 0, 1, 3, 2 ],
#[ 0, 100, 200, 300, 400 ]
)
diff --git a/NatTable/test/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTExample.xtend b/NatTable/test/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTExample.xtend
index afe639e..d54737c 100644
--- a/NatTable/test/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTExample.xtend
+++ b/NatTable/test/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTExample.xtend
@@ -49,9 +49,9 @@
val natTable = new SWTNatTable(shell)
val bodyHorizontalAxis = new ReorderSegmentAxis(new SimpleAxis(4, 200))
- bodyHorizontalAxis.reorderSegment(1, 2)
+ bodyHorizontalAxis.reorderSegmentPosition(1, 2)
val bodyVerticalAxis = new ReorderSegmentAxis(new SimpleAxis(4, 100))
- bodyVerticalAxis.reorderSegment(3, 1)
+ bodyVerticalAxis.reorderSegmentPosition(3, 1)
val bodyLayer = new DummyLayer(
bodyHorizontalAxis,
bodyVerticalAxis
