Code cleanup

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.labelzoom.api'
-version = '1.0.8'
+version = '1.0.9'
 
 repositories {
     mavenCentral()

src/main/java/com/labelzoom/api/model/components/AComponent.java

@@ -20,22 +20,22 @@
 public abstract class AComponent implements Cloneable {
 
     @Setter
-    protected int left;
+    private int left;
 
     @Setter
-    protected int top;
+    private int top;
 
-    protected float rotation = 0;
+    private float rotation = 0;
     public void setRotation(float rotation) { this.rotation = rotation % 360; }
 
     @Setter
-    protected boolean reverse = false;
+    private boolean reverse = false;
 
     @Setter
-    protected Justification justification = Justification.Left;
+    private Justification justification = Justification.Left;
 
     @Setter
-    protected PositioningMode positioningMode = PositioningMode.Origin;
+    private PositioningMode positioningMode = PositioningMode.Origin;
 
     /**
      * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/AContainer.java

@@ -21,7 +21,7 @@
 @Getter
 public abstract class AContainer extends AComponent
 {
-    protected List<AComponent> children = new ArrayList<>(); // Using ArrayList because that's what Jackson uses
+    private final List<AComponent> children = new ArrayList<>(); // Using ArrayList because that's what Jackson uses
 
     /**
      * Parameterless constructor
@@ -37,12 +37,9 @@ protected AContainer(final AContainer original)
         super(original);
 
         // Clone children
-        if (original.children != null)
+        for (final AComponent component : original.children)
         {
-            for (final AComponent component : original.children)
-            {
-                children.add(component.clone());
-            }
+            children.add(component.clone());
         }
     }
 }

src/main/java/com/labelzoom/api/model/components/AFontComponent.java

@@ -18,13 +18,13 @@
 @Getter @Setter
 public abstract class AFontComponent extends AComponent
 {
-    protected float horizontalScaling = 1.0f;
+    private float horizontalScaling = 1.0f;
 
-    protected float fontSize = 10.0f;
+    private float fontSize = 10.0f;
 
-    protected String font = "0";
+    private String font = "0";
 
-    protected boolean blankWhenNull = false;
+    private boolean blankWhenNull = false;
 
     /**
      * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/CAddressBlock.java

@@ -18,15 +18,15 @@
 @Getter @Setter
 public class CAddressBlock extends AFontComponent
 {
-    protected boolean useLocalizedAddressFormat = true;
+    private boolean useLocalizedAddressFormat = true;
 
-    protected int staticAddressFormat = 1;
+    private int staticAddressFormat = 1;
 
-    protected boolean showContactName = false;
+    private boolean showContactName = false;
 
-    protected boolean showCountry = false;
+    private boolean showCountry = false;
 
-    protected String addressId;
+    private String addressId;
 
     /**
      * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/CDataCommand.java

@@ -18,9 +18,9 @@
 @Getter @Setter
 public class CDataCommand implements Cloneable
 {
-	protected String language;
+	private String language;
 
-	protected String dataCommand;
+	private String dataCommand;
 
 	/**
 	 * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/CImage.java

@@ -21,11 +21,11 @@
 @Getter @Setter
 public class CImage extends AComponent
 {
-    protected BufferedImage image;
+    private BufferedImage image;
 
-    protected float horizontalScaling = 1;
+    private float horizontalScaling = 1;
 
-    protected float verticalScaling = 1;
+    private float verticalScaling = 1;
 
     /**
      * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/CLabel.java

@@ -21,33 +21,33 @@ public class CLabel
 {
     // Fields
     @Getter @Setter
-    protected int width;
+    private int width;
 
     @Getter @Setter
-    protected int height;
+    private int height;
 
     @Getter @Setter
-    protected boolean isHighRes = false;
+    private boolean isHighRes = false;
 
     @Getter @Setter
-    protected PageOrientation orientation = PageOrientation.Portrait;
+    private PageOrientation orientation = PageOrientation.Portrait;
 
     @Getter @Setter
-    protected List<CLayer> layers = new ArrayList<>(); // Using ArrayList because that's what Jackson uses
+    private List<CLayer> layers = new ArrayList<>(); // Using ArrayList because that's what Jackson uses
 
-    protected final Map<String, CLayer> layerMap = new TreeMap<>();
+    private final Map<String, CLayer> layerMap = new TreeMap<>();
 
     @Getter @Setter
-    protected CDataCommand dataCommand;
+    private CDataCommand dataCommand;
 
     @Getter @Setter
-    protected String schemaLocation;
+    private String schemaLocation;
 
     @Getter @Setter
-    protected String schemaVersion = "v1";
+    private String schemaVersion = "v1";
 
     @Getter @Setter
-    protected UUID id = UUID.randomUUID();
+    private UUID id = UUID.randomUUID();
 
     // Static/constants
     public static final String DEFAULT_LAYER_NAME = "background";
@@ -170,7 +170,13 @@ public CLabel clone(final boolean cloneData)
 
     public void addElement(final AComponent component)
     {
-        getLayerMap().get(DEFAULT_LAYER_NAME).getElements().add(component);
+        if (layers.isEmpty())
+        {
+            final CLayer mainContainer = new CLayer();
+            mainContainer.setName(DEFAULT_LAYER_NAME);
+            layers.add(mainContainer);
+        }
+        layers.get(0).getElements().add(component);
     }
 
     /**

src/main/java/com/labelzoom/api/model/components/CLayer.java

@@ -21,9 +21,9 @@
 @Getter @Setter
 public class CLayer
 {
-    protected String name;
+    private String name;
 
-    protected List<AComponent> elements = new ArrayList<>(); // Using ArrayList because that's what Jackson uses
+    private List<AComponent> elements = new ArrayList<>(); // Using ArrayList because that's what Jackson uses
 
     /**
      * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/CLine.java

@@ -23,11 +23,11 @@ public enum Orientation
         Horizontal, Vertical;
     }
 
-    protected Orientation orientation;
+    private Orientation orientation;
 
-    protected int thickness;
+    private int thickness;
 
-    protected int length;
+    private int length;
 
     /**
      * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/CRectangle.java

@@ -18,11 +18,11 @@
 @Getter @Setter
 public class CRectangle extends AComponent
 {
-    protected int width;
+    private int width;
 
-    protected int height;
+    private int height;
 
-    protected int thickness;
+    private int thickness;
 
     /**
      * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/CStaticText.java

@@ -18,7 +18,7 @@
 @Getter @Setter
 public class CStaticText extends AFontComponent
 {
-    protected String text;
+    private String text;
 
     /**
      * Parameterless constructor

src/main/java/com/labelzoom/api/model/components/CVariableText.java

@@ -18,17 +18,17 @@
 @Getter @Setter
 public class CVariableText extends AFontComponent implements IDynamicField
 {
-    protected String expression;
+    private String expression;
 
-    protected String fieldValue;
+    private String fieldValue;
 
-    protected boolean autoSize = true;
+    private boolean autoSize = true;
 
-    protected int width = 0;
+    private int width = 0;
 
-    protected int height = 0;
+    private int height = 0;
 
-    protected HorizontalAlignment horizontalAlignment = HorizontalAlignment.Left;
+    private HorizontalAlignment horizontalAlignment = HorizontalAlignment.Left;
 
     public enum HorizontalAlignment
     {

src/main/java/com/labelzoom/api/model/components/barcodes/ABarcode.java

@@ -23,13 +23,13 @@
 @Getter @Setter
 public abstract class ABarcode extends AComponent implements IDynamicField
 {
-    protected String expression;
+    private String expression;
 
-    protected String fieldValue;
+    private String fieldValue;
 
-    protected BarcodeStyle barcodeStyle = BarcodeStyle.Unknown;
+    private BarcodeStyle barcodeStyle = BarcodeStyle.Unknown;
 
-    protected boolean blankWhenNull = false;
+    private boolean blankWhenNull = false;
 
     @Getter
     public enum BarcodeStyle

src/main/java/com/labelzoom/api/model/components/barcodes/linear/ALinearBarcode.java

@@ -22,13 +22,13 @@
 @Getter @Setter
 public abstract class ALinearBarcode extends ABarcode
 {
-	protected ZebraBarcodeSize barcodeSize;
+	private ZebraBarcodeSize barcodeSize;
 
-	protected int height;
+	private int height;
 
-	protected boolean humanReadableEnabled;
+	private boolean humanReadableEnabled;
 
-	protected HumanReadableStyle humanReadablePosition;
+	private HumanReadableStyle humanReadablePosition;
 
 	@Getter
 	public enum ZebraBarcodeSize

src/main/java/com/labelzoom/api/model/components/barcodes/linear/CBarcodeAnsiCodabar.java

@@ -24,13 +24,13 @@
 @Getter @Setter
 public class CBarcodeAnsiCodabar extends ALinearBarcode implements IBarcodeWithCheckDigit, IBarcodeWithWideToNarrowRatio
 {
-    protected boolean checkDigitEnabled = false;
+    private boolean checkDigitEnabled = false;
 
-    protected char startCharacter = 'A';
+    private char startCharacter = 'A';
 
-    protected char stopCharacter = 'A';
+    private char stopCharacter = 'A';
 
-    protected float wideToNarrowRatio = 3.0f;
+    private float wideToNarrowRatio = 3.0f;
 
     /**
      * Parameterless constructor
@@ -44,7 +44,7 @@ public class CBarcodeAnsiCodabar extends ALinearBarcode implements IBarcodeWithC
     protected CBarcodeAnsiCodabar(final CBarcodeAnsiCodabar original, final boolean cloneData)
     {
         super(original, cloneData);
-        barcodeStyle = BarcodeStyle.ANSICodabar;
+        setBarcodeStyle(BarcodeStyle.ANSICodabar);
         if (original != null)
         {
             this.checkDigitEnabled = original.checkDigitEnabled;

src/main/java/com/labelzoom/api/model/components/barcodes/linear/CBarcodeCode11.java

@@ -24,9 +24,9 @@
 @Getter @Setter
 public class CBarcodeCode11 extends ALinearBarcode implements IBarcodeWithCheckDigit, IBarcodeWithWideToNarrowRatio
 {
-    protected boolean checkDigitEnabled = false;
+    private boolean checkDigitEnabled = false;
 
-    protected float wideToNarrowRatio = 3.0f;
+    private float wideToNarrowRatio = 3.0f;
 
     /**
      * Parameterless constructor
@@ -40,7 +40,7 @@ public class CBarcodeCode11 extends ALinearBarcode implements IBarcodeWithCheckD
     protected CBarcodeCode11(final CBarcodeCode11 original, final boolean cloneData)
     {
         super(original, cloneData);
-        barcodeStyle = BarcodeStyle.Code11;
+        setBarcodeStyle(BarcodeStyle.Code11);
         if (original != null)
         {
             this.checkDigitEnabled = original.checkDigitEnabled;

src/main/java/com/labelzoom/api/model/components/barcodes/linear/CBarcodeCode128.java

@@ -23,9 +23,9 @@
 @Getter @Setter
 public class CBarcodeCode128 extends ALinearBarcode implements IBarcodeWithCheckDigit
 {
-    protected boolean checkDigitEnabled = false;
+    private boolean checkDigitEnabled = false;
 
-    protected char uccCaseMode = 'N';
+    private char uccCaseMode = 'N';
 
     /**
      * Parameterless constructor
@@ -39,7 +39,7 @@ public class CBarcodeCode128 extends ALinearBarcode implements IBarcodeWithCheck
     protected CBarcodeCode128(final CBarcodeCode128 original, final boolean cloneData)
     {
         super(original, cloneData);
-        barcodeStyle = BarcodeStyle.Code128;
+        setBarcodeStyle(BarcodeStyle.Code128);
         if (original != null)
         {
             this.checkDigitEnabled = original.checkDigitEnabled;

src/main/java/com/labelzoom/api/model/components/barcodes/linear/CBarcodeCode39.java

@@ -24,9 +24,9 @@
 @Getter @Setter
 public class CBarcodeCode39 extends ALinearBarcode implements IBarcodeWithCheckDigit, IBarcodeWithWideToNarrowRatio
 {
-    protected boolean checkDigitEnabled = false;
+    private boolean checkDigitEnabled = false;
 
-    protected float wideToNarrowRatio = 3.0f;
+    private float wideToNarrowRatio = 3.0f;
 
     /**
      * Parameterless constructor
@@ -40,7 +40,7 @@ public class CBarcodeCode39 extends ALinearBarcode implements IBarcodeWithCheckD
     protected CBarcodeCode39(final CBarcodeCode39 original, final boolean cloneData)
     {
         super(original, cloneData);
-        barcodeStyle = BarcodeStyle.Code39;
+        setBarcodeStyle(BarcodeStyle.Code39);
         if (original != null)
         {
             this.checkDigitEnabled = original.checkDigitEnabled;