def first
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/AxisTest.xtend b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/AxisTest.xtend
index 76495e5..d7f4169 100644
--- a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/AxisTest.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/AxisTest.xtend
@@ -10,11 +10,11 @@
class AxisTest {
- static def testAxis(Axis axis, List<? extends Serializable> expectedIds, List<Integer> expectedPixels) {
+ def static testAxis(Axis axis, List<? extends Serializable> expectedIds, List<Integer> expectedPixels) {
testAxis("", axis, expectedIds, expectedPixels)
}
- static def testAxis(String axisName, Axis axis, List<? extends Serializable> expectedIds, List<Integer> expectedPixels) {
+ def static testAxis(String axisName, Axis axis, List<? extends Serializable> expectedIds, List<Integer> expectedPixels) {
// Segment count
assertEquals('''«axisName» getSegmentCount''', expectedIds.size, axis.segmentCount)
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/event/EventListener.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/event/EventListener.xtend
index 71487ad..91341e3 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/event/EventListener.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/event/EventListener.xtend
@@ -2,6 +2,6 @@
interface EventListener {
- def void handleEvent(Event event)
+ def void handleEvent(Event event)
}
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/geometry/PixelRectangleInvariants.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/geometry/PixelRectangleInvariants.xtend
index 138a1b1..cd5c25b 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/geometry/PixelRectangleInvariants.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/geometry/PixelRectangleInvariants.xtend
@@ -4,7 +4,7 @@
class PixelRectangleInvariants {
- static def PixelRectangle intersect(PixelRectangle rect1, PixelRectangle rect2) {
+ def static PixelRectangle intersect(PixelRectangle rect1, PixelRectangle rect2) {
val startX = max(rect1.x, rect2.x)
val startY = max(rect1.y, rect2.y)
val endX = min(rect1.x + rect1.width, rect2.x + rect2.width)
@@ -12,7 +12,7 @@
new PixelRectangle(startX, startY, max(endX - startX, 0), max(endY - startY, 0))
}
- static def boolean isEmpty(PixelRectangle rect) {
+ def static boolean isEmpty(PixelRectangle rect) {
rect.width == 0 || rect.height == 0
}
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/LayerInvariants.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/LayerInvariants.xtend
index d7db4d6..47adab4 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/LayerInvariants.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/LayerInvariants.xtend
@@ -12,67 +12,67 @@
// Horizontal axis
- static def getColumnCount(Layer layer) {
+ def static getColumnCount(Layer layer) {
layer.horizontalAxis.segmentCount
}
- static def getColumnIdOfPosition(Layer layer, int columnPosition) {
+ def static getColumnIdOfPosition(Layer layer, int columnPosition) {
layer.horizontalAxis.getIdOfSegmentPosition(columnPosition)
}
- static def getStartXPixelOfColumnPosition(Layer layer, int columnPosition) {
+ def static getStartXPixelOfColumnPosition(Layer layer, int columnPosition) {
layer.horizontalAxis.getStartPixelOfSegmentPosition(columnPosition)
}
- static def getPixelWidthOfColumn(Layer layer, int columnPosition) {
+ def static getPixelWidthOfColumn(Layer layer, int columnPosition) {
layer.horizontalAxis.getPixelSizeOfSegmentPosition(columnPosition)
}
- static def getPixelWidth(Layer layer) {
+ def static getPixelWidth(Layer layer) {
layer.horizontalAxis.pixelSize
}
- static def getColumnPositionOfXPixel(Layer layer, int xPixel) {
+ def static getColumnPositionOfXPixel(Layer layer, int xPixel) {
layer.horizontalAxis.getSegmentPositionOfPixelLocation(xPixel)
}
// Vertical axis
- static def getRowCount(Layer layer) {
+ def static getRowCount(Layer layer) {
layer.verticalAxis.segmentCount
}
- static def getRowIdOfPosition(Layer layer, int rowPosition) {
+ def static getRowIdOfPosition(Layer layer, int rowPosition) {
layer.verticalAxis.getIdOfSegmentPosition(rowPosition)
}
- static def getStartYPixelOfRowPosition(Layer layer, int rowPosition) {
+ def static getStartYPixelOfRowPosition(Layer layer, int rowPosition) {
layer.verticalAxis.getStartPixelOfSegmentPosition(rowPosition)
}
- static def getPixelHeightOfRow(Layer layer, int rowPosition) {
+ def static getPixelHeightOfRow(Layer layer, int rowPosition) {
layer.verticalAxis.getPixelSizeOfSegmentPosition(rowPosition)
}
- static def getPixelHeight(Layer layer) {
+ def static getPixelHeight(Layer layer) {
layer.verticalAxis.pixelSize
}
- static def getRowPositionOfYPixel(Layer layer, int yPixel) {
+ def static getRowPositionOfYPixel(Layer layer, int yPixel) {
layer.verticalAxis.getSegmentPositionOfPixelLocation(yPixel)
}
// Contains
- static def boolean containsCellPosition(Layer layer, int columnPosition, int rowPosition) {
+ def static boolean containsCellPosition(Layer layer, int columnPosition, int rowPosition) {
layer.horizontalAxis.containsSegmentPosition(columnPosition) && layer.verticalAxis.containsSegmentPosition(rowPosition)
}
- static def boolean containsPixelLocation(Layer layer, int xPixel, int yPixel) {
+ def static boolean containsPixelLocation(Layer layer, int xPixel, int yPixel) {
layer.horizontalAxis.containsPixelLocation(xPixel) && layer.verticalAxis.containsPixelLocation(yPixel)
}
- static def PixelRectangle getPixelBounds(Layer layer) {
+ def static PixelRectangle getPixelBounds(Layer layer) {
new PixelRectangle(
layer.getStartXPixelOfColumnPosition(0),
layer.getStartYPixelOfRowPosition(0),
@@ -81,7 +81,7 @@
)
}
- static def PixelArea getPixelArea(Layer layer) {
+ def static PixelArea getPixelArea(Layer layer) {
new PixelArea(
layer.pixelWidth,
layer.pixelHeight
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/AxisInvariants.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/AxisInvariants.xtend
index 105b0b2..0b671ad 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/AxisInvariants.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/AxisInvariants.xtend
@@ -5,19 +5,19 @@
*/
class AxisInvariants {
- static def getPixelSize(Axis axis) {
+ def static getPixelSize(Axis axis) {
axis.getStartPixelOfSegmentPosition(axis.segmentCount) - axis.getStartPixelOfSegmentPosition(0)
}
- static def getPixelSizeOfSegmentPosition(Axis axis, int segmentPosition) {
+ def static getPixelSizeOfSegmentPosition(Axis axis, int segmentPosition) {
axis.getStartPixelOfSegmentPosition(segmentPosition + 1) - axis.getStartPixelOfSegmentPosition(segmentPosition)
}
- static def boolean containsPixelLocation(Axis axis, int pixelLocation) {
+ def static boolean containsPixelLocation(Axis axis, int pixelLocation) {
pixelLocation >= 0 && pixelLocation < axis.getStartPixelOfSegmentPosition(axis.segmentCount)
}
- static def boolean containsSegmentPosition(Axis axis, int segmentPosition) {
+ def static boolean containsSegmentPosition(Axis axis, int segmentPosition) {
segmentPosition >= 0 && segmentPosition < axis.segmentCount
}
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/AxisImpl.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/AxisImpl.xtend
index 27337ac..a55822a 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/AxisImpl.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/AxisImpl.xtend
@@ -60,7 +60,7 @@
else return findSegmentPositionOfPixelLocation(pixelLocation, 0, pixelSize, 0, segmentCount)
}
- private def int findSegmentPositionOfPixelLocation(int pixelLocation, int fromPixel, int toPixel, int fromSegmentPosition, int toSegmentPosition) {
+ def private int findSegmentPositionOfPixelLocation(int pixelLocation, int fromPixel, int toPixel, int fromSegmentPosition, int toSegmentPosition) {
// guess segment position = pixelLocation / size of guess region
val guessSegmentSize = (toPixel - fromPixel) / (toSegmentPosition - fromSegmentPosition)
val guessSegmentPosition = fromSegmentPosition + ((pixelLocation - fromPixel) / guessSegmentSize)
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/CellInvariants.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/CellInvariants.xtend
index 36126a0..9eb45cd 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/CellInvariants.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/CellInvariants.xtend
@@ -12,7 +12,7 @@
/**
* @return The pixel bounds of the cell relative to its owning layer.
*/
- static def getPixelBounds(Cell cell) {
+ def static getPixelBounds(Cell cell) {
val layer = cell.layer
val positionBounds = cell.positionBounds
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainter.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainter.xtend
index 8fc8f60..bad09fe 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainter.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/CellLayerPainter.xtend
@@ -48,7 +48,7 @@
//
- protected def getAdjustedPixelBounds(Cell cell) {
+ def protected getAdjustedPixelBounds(Cell cell) {
cell.pixelBounds
}
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayer.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayer.xtend
index 993ce70..517e341 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayer.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayer.xtend
@@ -2,9 +2,9 @@
import java.util.ArrayList
import java.util.List
+import org.eclipse.nebula.widgets.nattable.core.command.Command
import org.eclipse.nebula.widgets.nattable.core.layer.Layer
import org.eclipse.nebula.widgets.nattable.core.layer.impl.AbstractLayer
-import org.eclipse.nebula.widgets.nattable.core.command.Command
/**
* A Layer which is composed of a number of other layers. Sublayers are arranged in rows and columns to create this larger composite layer.
@@ -64,7 +64,7 @@
//
- private def CompositeLayoutInfo getSubLayerLayoutPositionInfo(CompositeAxis compositeAxis, int segmentPosition) {
+ def private CompositeLayoutInfo getSubLayerLayoutPositionInfo(CompositeAxis compositeAxis, int segmentPosition) {
val subLayers = compositeAxis.subLayers
val axisAccessor = compositeAxis.axisAccessor
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/example/JavaFXExample.xtend b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/example/JavaFXExample.xtend
index 656aceb..4af9382 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/example/JavaFXExample.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/example/JavaFXExample.xtend
@@ -11,7 +11,7 @@
class JavaFXExample extends Application {
- def static void main(String[] args) {
+ def static void main(String[] args) {
launch(args)
}
@@ -30,7 +30,7 @@
natTable.heightProperty.bind(root.heightProperty)
}
- def Layer getLayer() {
+ def Layer getLayer() {
new DummyLayer(
new AxisImpl(4, 200),
new AxisImpl(4, 100)
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXNatTable.xtend b/org.eclipse.nebula.widgets.nattable.renderer.javafx/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXNatTable.xtend
index 33ff2a2..c8ea8f0 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.javafx/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXNatTable.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.javafx/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXNatTable.xtend
@@ -27,12 +27,12 @@
])
}
- private def paintLayer() {
+ def private paintLayer() {
val paintArea = new PixelArea(boundsInLocal.width as int, boundsInLocal.height as int)
layer.layerPainter.paintLayer(layer, paintArea, new JavaFXGraphicsContext(this.graphicsContext2D))
}
- private def getLayerPainter(Layer layer) {
+ def private getLayerPainter(Layer layer) {
defaultLayerPainter
}
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTable.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTable.xtend
index c9aab90..a40f9fe 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTable.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTable.xtend
@@ -58,7 +58,7 @@
modeSwitcher.switchToMode(Mode::NORMAL)
}
- private def paintLayer(GC gc) {
+ def private paintLayer(GC gc) {
layer?.layerPainter?.paintLayer(layer, new PixelArea(bounds.width, bounds.height), new SWTGraphicsContext(this, gc))
}
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/mode/AbstractMode.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/mode/AbstractMode.xtend
index 55341a6..b2ed92f 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/mode/AbstractMode.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/mode/AbstractMode.xtend
@@ -12,8 +12,8 @@
this.modeSwitcher = modeSwitcher
}
- protected def switchToMode(String modeName) { modeSwitcher.switchToMode(modeName) }
- protected def void switchToMode(Mode mode) { modeSwitcher.switchToMode(mode) }
+ def protected switchToMode(String modeName) { modeSwitcher.switchToMode(modeName) }
+ def protected void switchToMode(Mode mode) { modeSwitcher.switchToMode(mode) }
// Mode interface
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/mode/MouseMode.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/mode/MouseMode.xtend
index 89e3143..d5c11e3 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/mode/MouseMode.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/mode/MouseMode.xtend
@@ -78,7 +78,7 @@
}
}
- private def void executeSingleClickAction(MouseAction action, MouseEvent event) {
+ def private void executeSingleClickAction(MouseAction action, MouseEvent event) {
//convert/validate/commit/close possible open editor
//needed in case of conversion/validation errors to cancel any action
// if (EditUtils.commitAndCloseActiveEditor()) {
