renamed -> LayerPainterFactory
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayerPainterTest.xtend b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayerPainterTest.xtend
index 55180a9..0eeac25 100644
--- a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayerPainterTest.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayerPainterTest.xtend
@@ -2,7 +2,7 @@
import org.eclipse.nebula.widgets.nattable.core.geometry.PixelArea
import org.eclipse.nebula.widgets.nattable.core.graphics.GraphicsContext
-import org.eclipse.nebula.widgets.nattable.core.graphics.PainterFactory
+import org.eclipse.nebula.widgets.nattable.core.graphics.LayerPainterFactory
import org.eclipse.nebula.widgets.nattable.core.layer.LayerPainter
import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.AxisImpl
import org.eclipse.nebula.widgets.nattable.core.layer.impl.DimensionallyDependentLayer
@@ -52,17 +52,17 @@
@Mock LayerPainter<RowHeaderLayer> rowHeaderLayerPainter
@Mock LayerPainter<DimensionallyDependentLayer> cornerLayerPainter
- @Mock PainterFactory painterFactory
+ @Mock LayerPainterFactory layerPainterFactory
@InjectMocks CompositeLayerPainter layerPainter = new CompositeLayerPainter
@Mock GraphicsContext testGC
@Before
def void before() {
- when(painterFactory.getLayerPainter(bodyLayer)).thenReturn(bodyLayerPainter)
- when(painterFactory.getLayerPainter(columnHeaderLayer)).thenReturn(columnHeaderLayerPainter)
- when(painterFactory.getLayerPainter(rowHeaderLayer)).thenReturn(rowHeaderLayerPainter)
- when(painterFactory.getLayerPainter(cornerLayer)).thenReturn(cornerLayerPainter)
+ when(layerPainterFactory.getLayerPainter(bodyLayer)).thenReturn(bodyLayerPainter)
+ when(layerPainterFactory.getLayerPainter(columnHeaderLayer)).thenReturn(columnHeaderLayerPainter)
+ when(layerPainterFactory.getLayerPainter(rowHeaderLayer)).thenReturn(rowHeaderLayerPainter)
+ when(layerPainterFactory.getLayerPainter(cornerLayer)).thenReturn(cornerLayerPainter)
}
@Test
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/DefaultPainterFactory.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/DefaultLayerPainterFactory.xtend
similarity index 96%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/DefaultPainterFactory.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/DefaultLayerPainterFactory.xtend
index ec02767..c58c315 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/DefaultPainterFactory.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/DefaultLayerPainterFactory.xtend
@@ -9,7 +9,7 @@
import org.eclipse.nebula.widgets.nattable.core.layer.impl.composite.CompositeLayer
import org.eclipse.nebula.widgets.nattable.core.layer.impl.composite.CompositeLayerPainter
-class DefaultPainterFactory implements PainterFactory {
+class DefaultLayerPainterFactory implements LayerPainterFactory {
@Inject Provider<CompositeLayerPainter> compositeLayerPainterProvider
@Inject Provider<GridLineCellLayerPainter> gridLineCellLayerPainterProvider
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/PainterFactory.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/LayerPainterFactory.xtend
similarity index 88%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/PainterFactory.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/LayerPainterFactory.xtend
index c5604e8..9987a3e 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/PainterFactory.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/graphics/LayerPainterFactory.xtend
@@ -3,7 +3,7 @@
import org.eclipse.nebula.widgets.nattable.core.layer.Layer
import org.eclipse.nebula.widgets.nattable.core.layer.LayerPainter
-interface PainterFactory {
+interface LayerPainterFactory {
def <T extends Layer> LayerPainter<T> getLayerPainter(T layer)
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayerPainter.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayerPainter.xtend
index 9de07f5..b3041ba 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayerPainter.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/composite/CompositeLayerPainter.xtend
@@ -4,14 +4,14 @@
import org.eclipse.nebula.widgets.nattable.core.geometry.PixelArea
import org.eclipse.nebula.widgets.nattable.core.geometry.PixelRectangle
import org.eclipse.nebula.widgets.nattable.core.graphics.GraphicsContext
-import org.eclipse.nebula.widgets.nattable.core.graphics.PainterFactory
+import org.eclipse.nebula.widgets.nattable.core.graphics.LayerPainterFactory
import org.eclipse.nebula.widgets.nattable.core.layer.LayerPainter
import static extension org.eclipse.nebula.widgets.nattable.core.layer.LayerInvariants.*
class CompositeLayerPainter implements LayerPainter<CompositeLayer> {
- @Inject extension PainterFactory
+ @Inject extension LayerPainterFactory
override paintLayer(CompositeLayer compositeLayer, PixelArea layerPaintArea, GraphicsContext gc) {
var yOffset = 0.0
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 e4fa32d..fedd2ba 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
@@ -4,16 +4,16 @@
import javafx.scene.canvas.Canvas
import javax.inject.Inject
import org.eclipse.nebula.widgets.nattable.core.geometry.PixelArea
-import org.eclipse.nebula.widgets.nattable.core.graphics.PainterFactory
import org.eclipse.nebula.widgets.nattable.core.layer.Layer
import org.eclipse.nebula.widgets.nattable.renderer.javafx.graphics.JavaFXGraphicsContext
+import org.eclipse.nebula.widgets.nattable.core.graphics.LayerPainterFactory
/**
* A JavaFX component that renders a NatTable Layer.
*/
class JavaFXNatTable extends Canvas {
- @Inject extension PainterFactory
+ @Inject extension LayerPainterFactory
Layer layer
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXNatTableModule.xtend b/org.eclipse.nebula.widgets.nattable.renderer.javafx/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXNatTableModule.xtend
index a79bd4c..33610d3 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.javafx/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXNatTableModule.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.javafx/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXNatTableModule.xtend
@@ -2,13 +2,13 @@
import com.google.inject.Binder
import com.google.inject.Module
-import org.eclipse.nebula.widgets.nattable.core.graphics.DefaultPainterFactory
-import org.eclipse.nebula.widgets.nattable.core.graphics.PainterFactory
+import org.eclipse.nebula.widgets.nattable.core.graphics.LayerPainterFactory
+import org.eclipse.nebula.widgets.nattable.core.graphics.DefaultLayerPainterFactory
class JavaFXNatTableModule implements Module {
override configure(Binder binder) {
- binder.bind(typeof(PainterFactory)).toInstance(new DefaultPainterFactory)
+ binder.bind(typeof(LayerPainterFactory)).toInstance(new DefaultLayerPainterFactory)
}
}
\ No newline at end of file
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 624cc31..381fe01 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
@@ -3,7 +3,7 @@
import com.google.inject.Injector
import javax.inject.Inject
import org.eclipse.nebula.widgets.nattable.core.geometry.PixelArea
-import org.eclipse.nebula.widgets.nattable.core.graphics.PainterFactory
+import org.eclipse.nebula.widgets.nattable.core.graphics.LayerPainterFactory
import org.eclipse.nebula.widgets.nattable.core.layer.Layer
import org.eclipse.nebula.widgets.nattable.renderer.swt.event.mode.Mode
import org.eclipse.nebula.widgets.nattable.renderer.swt.event.mode.ModeSwitcher
@@ -19,7 +19,7 @@
static val int DEFAULT_STYLE_OPTIONS = SWT::NO_BACKGROUND.bitwiseOr(SWT::DOUBLE_BUFFERED).bitwiseOr(SWT::NO_REDRAW_RESIZE)
@Inject extension Injector
- @Inject extension PainterFactory
+ @Inject extension LayerPainterFactory
Layer layer
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTableModule.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTableModule.xtend
index 57f27c4..af466e9 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTableModule.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTableModule.xtend
@@ -2,13 +2,13 @@
import com.google.inject.Binder
import com.google.inject.Module
-import org.eclipse.nebula.widgets.nattable.core.graphics.PainterFactory
-import org.eclipse.nebula.widgets.nattable.renderer.swt.graphics.SWTPainterFactory
+import org.eclipse.nebula.widgets.nattable.core.graphics.LayerPainterFactory
+import org.eclipse.nebula.widgets.nattable.renderer.swt.graphics.SWTLayerPainterFactory
class SWTNatTableModule implements Module {
override configure(Binder binder) {
- binder.bind(typeof(PainterFactory)).toInstance(new SWTPainterFactory)
+ binder.bind(typeof(LayerPainterFactory)).toInstance(new SWTLayerPainterFactory)
}
}
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/graphics/SWTPainterFactory.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/graphics/SWTLayerPainterFactory.xtend
similarity index 89%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/graphics/SWTPainterFactory.xtend
rename to org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/graphics/SWTLayerPainterFactory.xtend
index f8bec32..825be19 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/graphics/SWTPainterFactory.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/graphics/SWTLayerPainterFactory.xtend
@@ -2,13 +2,13 @@
import javax.inject.Inject
import javax.inject.Provider
-import org.eclipse.nebula.widgets.nattable.core.graphics.DefaultPainterFactory
+import org.eclipse.nebula.widgets.nattable.core.graphics.DefaultLayerPainterFactory
import org.eclipse.nebula.widgets.nattable.core.layer.Layer
import org.eclipse.nebula.widgets.nattable.core.layer.LayerPainter
import org.eclipse.nebula.widgets.nattable.core.layer.impl.viewport.ViewportLayer
import org.eclipse.nebula.widgets.nattable.renderer.swt.layer.viewport.SWTViewportLayerPainter
-class SWTPainterFactory extends DefaultPainterFactory {
+class SWTLayerPainterFactory extends DefaultLayerPainterFactory {
@Inject Provider<SWTViewportLayerPainter> swtViewportLayerPainterProvider
