Create new layout package

Move Canvas and associated classes from "rendering" to a new package "layout".

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/AbstractCanvas.java → src/main/java/de/tudresden/inf/mci/brailleplot/layout/AbstractCanvas.java

-package de.tudresden.inf.mci.brailleplot.rendering;
+package de.tudresden.inf.mci.brailleplot.layout;
 
 import de.tudresden.inf.mci.brailleplot.configparser.Format;
 import de.tudresden.inf.mci.brailleplot.configparser.Printer;

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/InsufficientRenderingAreaException.java → src/main/java/de/tudresden/inf/mci/brailleplot/layout/InsufficientRenderingAreaException.java

-package de.tudresden.inf.mci.brailleplot.rendering;
+package de.tudresden.inf.mci.brailleplot.layout;
 
 /**
  * Exception that indicates too few space available to display the amount of data contained in the given renderable representation.

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/RasterCanvas.java → src/main/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvas.java

-package de.tudresden.inf.mci.brailleplot.rendering;
+package de.tudresden.inf.mci.brailleplot.layout;
 
 import de.tudresden.inf.mci.brailleplot.configparser.Format;
 import de.tudresden.inf.mci.brailleplot.configparser.Printer;

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rectangle.java → src/main/java/de/tudresden/inf/mci/brailleplot/layout/Rectangle.java

-package de.tudresden.inf.mci.brailleplot.rendering;
+package de.tudresden.inf.mci.brailleplot.layout;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/SixDotBrailleRasterCanvas.java → src/main/java/de/tudresden/inf/mci/brailleplot/layout/SixDotBrailleRasterCanvas.java

-package de.tudresden.inf.mci.brailleplot.rendering;
+package de.tudresden.inf.mci.brailleplot.layout;
 
 import de.tudresden.inf.mci.brailleplot.configparser.Format;
 import de.tudresden.inf.mci.brailleplot.configparser.Printer;
+import de.tudresden.inf.mci.brailleplot.printabledata.BrailleCell6;
 
 /**
  * Represents a raster consisting of 6-dot braille cells. (May be removed completely in favor of dynamic {@link RasterCanvas})
  * @author Leonard Kupper
  * @version 2019.07.20
  */
-class SixDotBrailleRasterCanvas extends RasterCanvas {
+public class SixDotBrailleRasterCanvas extends RasterCanvas {
 
-    private static final int CELL_WIDTH = 2;
-    private static final int CELL_HEIGHT = 3;
-
-    SixDotBrailleRasterCanvas(final Printer printer, final Format format) throws InsufficientRenderingAreaException {
-        super(printer, format, CELL_WIDTH, CELL_HEIGHT);
+    public SixDotBrailleRasterCanvas(final Printer printer, final Format format) throws InsufficientRenderingAreaException {
+        super(printer, format, BrailleCell6.COLUMN_COUNT, BrailleCell6.ROW_COUNT);
     }
 }

src/main/java/de/tudresden/inf/mci/brailleplot/layout/package-info.java

+/**
+ * Contains classes required for the layout of the rendered data.
+ */
+package de.tudresden.inf.mci.brailleplot.layout;

src/main/java/de/tudresden/inf/mci/brailleplot/printabledata/BrailleCell6.java

@@ -16,9 +16,9 @@ package de.tudresden.inf.mci.brailleplot.printabledata;
  */
 public final class BrailleCell6<T> {
 
-    static final int DOT_COUNT = 6;
-    static final int ROW_COUNT = 3;
-    static final int COLUMN_COUNT = 2;
+    public static final int DOT_COUNT = 6;
+    public static final int ROW_COUNT = 3;
+    public static final int COLUMN_COUNT = 2;
 
     private T[] mDots;
 

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Axis.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.Rectangle;
+
 import java.util.Map;
 import java.util.Objects;
 

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleText.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.Rectangle;
+
 import java.util.Objects;
 
 /**

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleTextRasterizer.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
+
 /**
  * A rasterizer for text on braille grids. This class is still a stub and must be implemented!
  * @version 2019.07.21

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizer.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRenderingBase.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +83,7 @@ public class FunctionalRenderingBase {
      * Sets a new canvas for any rasterizing operations performed by this rendering base. The rasterizing results are
      * 'drawn' on the currently selected canvas instance. There are no restrictions on the raster canvas. It is also
      * possible to pass a canvas which already contains data to 'overlay' the new data.
-     * @param raster The {@link AbstractCanvas} instance which will be used for all subsequent rasterizing operations.
+     * @param raster The {@link RasterCanvas} instance which will be used for all subsequent rasterizing operations.
      */
     public void setRasterCanvas(final RasterCanvas raster) {
         mRaster = Objects.requireNonNull(raster);
@@ -89,8 +91,8 @@ public class FunctionalRenderingBase {
     }
 
     /**
-     * Gets the currently set {@link AbstractCanvas} of the rendering base.
-     * @return An instance of {@link AbstractCanvas}.
+     * Gets the currently set {@link RasterCanvas} of the rendering base.
+     * @return An instance of {@link RasterCanvas}.
      */
     public RasterCanvas getRaster() {
         return mRaster;

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/ImageRasterizer.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
+import de.tudresden.inf.mci.brailleplot.layout.Rectangle;
 import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LinearMappingAxisRasterizer.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
+import de.tudresden.inf.mci.brailleplot.layout.Rectangle;
 import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData;
 
 import static de.tudresden.inf.mci.brailleplot.rendering.Axis.Type.X_AXIS;

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRenderer.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
+import de.tudresden.inf.mci.brailleplot.layout.SixDotBrailleRasterCanvas;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rasterizer.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
 
+import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
+import de.tudresden.inf.mci.brailleplot.layout.Rectangle;
 import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData;
 
 import static java.lang.Math.max;

src/test/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizerTest.java

@@ -4,6 +4,8 @@ import de.tudresden.inf.mci.brailleplot.configparser.ConfigurationParser;
 import de.tudresden.inf.mci.brailleplot.configparser.Format;
 import de.tudresden.inf.mci.brailleplot.configparser.JavaPropertiesConfigurationParser;
 import de.tudresden.inf.mci.brailleplot.configparser.Printer;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
+import de.tudresden.inf.mci.brailleplot.layout.SixDotBrailleRasterCanvas;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

src/test/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRendererTest.java

@@ -4,6 +4,8 @@ import de.tudresden.inf.mci.brailleplot.configparser.ConfigurationParser;
 import de.tudresden.inf.mci.brailleplot.configparser.Format;
 import de.tudresden.inf.mci.brailleplot.configparser.JavaPropertiesConfigurationParser;
 import de.tudresden.inf.mci.brailleplot.configparser.Printer;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
+import de.tudresden.inf.mci.brailleplot.layout.Rectangle;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

src/test/java/de/tudresden/inf/mci/brailleplot/rendering/RasterCanvasTest.java

@@ -2,6 +2,9 @@ package de.tudresden.inf.mci.brailleplot.rendering;
 
 import de.tudresden.inf.mci.brailleplot.configparser.ConfigurationParser;
 import de.tudresden.inf.mci.brailleplot.configparser.JavaPropertiesConfigurationParser;
+import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas;
+import de.tudresden.inf.mci.brailleplot.layout.Rectangle;
+import de.tudresden.inf.mci.brailleplot.layout.SixDotBrailleRasterCanvas;
 import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

src/test/java/de/tudresden/inf/mci/brailleplot/rendering/RectangleTest.java

 package de.tudresden.inf.mci.brailleplot.rendering;
 
+import de.tudresden.inf.mci.brailleplot.layout.Rectangle;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;