#28 Adapt Chronograph for Passage Operator

Rename ChronographCanvas to Stage Signed-off-by: Alexander Fedorov <[email protected]>
eclipse-passage · May 16, 2020 · 95d9747 · 95d9747
1 parent 3533591
commit 95d9747
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.../org.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/SWTChronograph.java b/.../org.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/SWTChronograph.java
@@ -22,7 +22,7 @@
 import org.eclipse.chronograph.internal.api.Styler;
 import org.eclipse.chronograph.internal.api.providers.ContainerProvider;
 import org.eclipse.chronograph.internal.base.UnitConverter;
-import org.eclipse.chronograph.internal.swt.stage.ChronographCanvas;
+import org.eclipse.chronograph.internal.swt.stage.Stage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -33,11 +33,11 @@
  *
  */
 public class SWTChronograph implements Chronograph {
-	private final ChronographCanvas stage;
+	private final Stage stage;
 	private final List<Styler> stylers;
 
 	public SWTChronograph(Composite parent, ContainerProvider provider) {
-		this.stage = new ChronographCanvas(parent, provider);
+		this.stage = new Stage(parent, provider);
 		this.stage.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
 		this.stage.navigateToUnit(UnitConverter.localDatetoUnits(LocalDate.now().minusDays(7)));
 		stylers = new ArrayList<>();

diff --git a/...internal/swt/stage/ChronographCanvas.java → ...chronograph/internal/swt/stage/Stage.java b/...internal/swt/stage/ChronographCanvas.java → ...chronograph/internal/swt/stage/Stage.java
@@ -51,7 +51,7 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.ScrollBar;
 
-public final class ChronographCanvas extends Canvas {
+public final class Stage extends Canvas {
 
 	private final AreaRectangle areaRectangle;
 	private final ActualBricks actualBricks;
@@ -86,11 +86,11 @@ public final class ChronographCanvas extends Canvas {
 
 	private static ChronographManagerRenderers INSTANCE = ChronographManagerRenderers.getInstance();
 
-	public ChronographCanvas(Composite parent, ContainerProvider provider) {
+	public Stage(Composite parent, ContainerProvider provider) {
 		this(parent, SWT.NO_BACKGROUND | SWT.DOUBLE_BUFFERED | SWT.V_SCROLL | SWT.H_SCROLL, provider);
 	}
 
-	public ChronographCanvas(Composite parent, int style, ContainerProvider provider) {
+	public Stage(Composite parent, int style, ContainerProvider provider) {
 		super(parent, style);
 		this.areaRectangle = new AreaRectangle();
 		this.actualBricks = new ActualBricks();
@@ -176,7 +176,7 @@ protected void horizontalScroll(Event event) {
 			return;
 		}
 		setPositionByX(scrollBarHorizontal.getSelection() * pxlHint * stageScale);
-		getHint();
+		applyHint();
 		redraw();
 	}
 
@@ -434,7 +434,7 @@ private void drawSelectedObjects(final GC gc, Area area, final Collection<? exte
 
 	public void navigateToUnit(int hint) {
 		pX = hint * pxlHint * stageScale;
-		getHint();
+		applyHint();
 		redraw();
 	}
 
@@ -502,11 +502,11 @@ public void redraw() {
 		super.redraw();
 	}
 
-	public int getPositionByX() {
+	int getPositionByX() {
 		return pX;
 	}
 
-	public void setPositionByX(int x) {
+	void setPositionByX(int x) {
 		this.pX = x;
 	}
 
@@ -515,7 +515,7 @@ public Rectangle getClientArea() {
 		return super.getClientArea();
 	}
 
-	public void getHint() {
+	void applyHint() {
 		pXhint = pX / (pxlHint * stageScale);
 	}
 

diff --git a/...rg.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/stage/StageMouse.java b/...rg.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/stage/StageMouse.java
@@ -33,15 +33,15 @@
  */
 final class StageMouse implements MouseListener, MouseMoveListener, MouseTrackListener {
 
-	private ChronographCanvas stage;
+	private Stage stage;
 	private static final Cursor CURSOR_NONE = new Cursor(Display.getDefault(), SWT.NONE);
 	private static final Cursor CURSOR_HAND = new Cursor(Display.getDefault(), SWT.CURSOR_HAND);
 	private Point startPoint;
 	private Tracker tracker;
 	private boolean isMouseDown;
 	private int xPosition = 0;
 
-	public StageMouse(ChronographCanvas stage) {
+	public StageMouse(Stage stage) {
 		this.stage = stage;
 	}
 
@@ -59,7 +59,7 @@ public void mouseMove(MouseEvent me) {
 					deltaXPosition = 0;
 				}
 				stage.setPositionByX(deltaXPosition);
-				stage.getHint();
+				stage.applyHint();
 				stage.redraw();
 				stage.updateScrollers();
 			}

diff --git a/...rg.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/stage/StagePaint.java b/...rg.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/stage/StagePaint.java
@@ -18,9 +18,9 @@
 
 final class StagePaint implements PaintListener {
 
-	private final ChronographCanvas sceneComposer;
+	private final Stage sceneComposer;
 
-	public StagePaint(ChronographCanvas sceneComposer) {
+	public StagePaint(Stage sceneComposer) {
 		this.sceneComposer = sceneComposer;
 	}
 

diff --git a/...g.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/stage/StageResize.java b/...g.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/stage/StageResize.java
@@ -18,9 +18,9 @@
 
 final class StageResize implements Listener {
 
-	private final ChronographCanvas stage;
+	private final Stage stage;
 
-	public StageResize(ChronographCanvas stage) {
+	public StageResize(Stage stage) {
 		this.stage = stage;
 	}
 

diff --git a/...rg.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/stage/StageWheel.java b/...rg.eclipse.chronograph.swt/src/org/eclipse/chronograph/internal/swt/stage/StageWheel.java
@@ -19,9 +19,9 @@
 
 final class StageWheel implements Listener {
 
-	private final ChronographCanvas stage;
+	private final Stage stage;
 
-	public StageWheel(ChronographCanvas stage) {
+	public StageWheel(Stage stage) {
 		this.stage = stage;
 	}