Updating API

Author: RobFaustLZ

build.gradle

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

src/main/java/com/labelzoom/api/input/LabelReader.java

@@ -1,8 +1,10 @@
 package com.labelzoom.api.input;
 
-import com.labelzoom.api.model.components.ILabel;
+import com.labelzoom.api.model.components.CLabel;
+
+import java.util.List;
 
 public interface LabelReader<E>
 {
-    ILabel read(E in);
+    List<CLabel> read(E in);
 }

src/main/java/com/labelzoom/api/model/BarcodeStyle.java

@@ -0,0 +1,77 @@
+package com.labelzoom.api.model.components;
+
+/* Copyright (C) 2021, LabelZoom, a subsidiary of RJF Technology Solutions, Inc.
+ * All rights reserved.  Proprietary and confidential.
+ *
+ * This file is subject to the license terms found at
+ * https://www.labelzoom.net/end-user-license-agreement/
+ *
+ * The methods and techniques described herein are considered
+ * confidential and/or trade secrets.
+ * No part of this file may be copied, modified, propagated,
+ * or distributed except as authorized by the license.
+ */
+
+import com.labelzoom.api.model.PositioningMode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+public abstract class AComponent implements Cloneable {
+
+    @Setter
+    protected int left;
+
+    @Setter
+    protected int top;
+
+    protected float rotation = 0;
+    public void setRotation(float rotation) { this.rotation = rotation % 360; }
+
+    @Setter
+    protected boolean reverse = false;
+
+    @Setter
+    protected Justification justification = Justification.Left;
+
+    @Setter
+    protected PositioningMode positioningMode = PositioningMode.Origin;
+
+    /**
+     * Parameterless constructor
+     */
+    public AComponent() { this(null); }
+
+    /**
+     * Cloning constructor
+     * @param original the AComponent to clone
+     */
+    protected AComponent(final AComponent original)
+    {
+        super();
+        if (original != null)
+        {
+            this.left = original.left;
+            this.top = original.top;
+            this.rotation = original.rotation;
+            this.reverse = original.reverse;
+            this.justification = original.justification;
+            this.positioningMode = original.positioningMode;
+        }
+    }
+
+    public boolean isRotated()
+    {
+        return (rotation % 180) != 0;
+    }
+
+    public boolean isInverted()
+    {
+        return (Math.abs(rotation) > 90 && Math.abs(rotation) < 270);
+    }
+
+    @Override
+    public abstract AComponent clone();
+
+    public abstract int getZIndex();
+}

src/main/java/com/labelzoom/api/model/DataCloneable.java

@@ -0,0 +1,48 @@
+package com.labelzoom.api.model.components;
+
+/* Copyright (C) 2021, LabelZoom, a subsidiary of RJF Technology Solutions, Inc.
+ * All rights reserved.  Proprietary and confidential.
+ *
+ * This file is subject to the license terms found at
+ * https://www.labelzoom.net/end-user-license-agreement/
+ *
+ * The methods and techniques described herein are considered
+ * confidential and/or trade secrets.
+ * No part of this file may be copied, modified, propagated,
+ * or distributed except as authorized by the license.
+ */
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Getter
+public abstract class AContainer extends AComponent
+{
+    protected List<AComponent> children = new ArrayList<>(); // Using ArrayList because that's what Jackson uses
+
+    /**
+     * Parameterless constructor
+     */
+    public AContainer() { this(null); }
+
+    /**
+     * Cloning constructor
+     * @param original the AContainer to clone
+     */
+    protected AContainer(final AContainer original)
+    {
+        super(original);
+
+        // Clone children
+        if (original.children != null)
+        {
+            for (final AComponent component : original.children)
+            {
+                children.add(component.clone());
+            }
+        }
+    }
+}

src/main/java/com/labelzoom/api/model/HorizontalAlignment.java

@@ -0,0 +1,55 @@
+package com.labelzoom.api.model.components;
+
+/* Copyright (C) 2021, LabelZoom, a subsidiary of RJF Technology Solutions, Inc.
+ * All rights reserved.  Proprietary and confidential.
+ *
+ * This file is subject to the license terms found at
+ * https://www.labelzoom.net/end-user-license-agreement/
+ *
+ * The methods and techniques described herein are considered
+ * confidential and/or trade secrets.
+ * No part of this file may be copied, modified, propagated,
+ * or distributed except as authorized by the license.
+ */
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public abstract class AFontComponent extends AComponent
+{
+    protected float horizontalScaling = 1.0f;
+
+    protected float fontSize = 10.0f;
+
+    protected String font = "0";
+
+    protected boolean blankWhenNull = false;
+
+    /**
+     * Parameterless constructor
+     */
+    public AFontComponent() { this(null); }
+
+    /**
+     * Cloning constructor
+     * @param original the AFontComponent to clone
+     */
+    protected AFontComponent(final AFontComponent original)
+    {
+    	super(original);
+        if (original != null)
+        {
+            fontSize = original.fontSize;
+            font = original.font;
+            blankWhenNull = original.blankWhenNull;
+            horizontalScaling = original.horizontalScaling;
+        }
+    }
+
+	@Override
+    public abstract AComponent clone();
+
+    @Override
+    public int getZIndex() { return 3; }
+}

src/main/java/com/labelzoom/api/model/Orientation.java

@@ -0,0 +1,68 @@
+package com.labelzoom.api.model.components;
+
+/* Copyright (C) 2021, LabelZoom, a subsidiary of RJF Technology Solutions, Inc.
+ * All rights reserved.  Proprietary and confidential.
+ *
+ * This file is subject to the license terms found at
+ * https://www.labelzoom.net/end-user-license-agreement/
+ *
+ * The methods and techniques described herein are considered
+ * confidential and/or trade secrets.
+ * No part of this file may be copied, modified, propagated,
+ * or distributed except as authorized by the license.
+ */
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class CAddressBlock extends AFontComponent
+{
+    protected boolean useLocalizedAddressFormat = true;
+
+    protected int staticAddressFormat = 1;
+
+    protected boolean showContactName = false;
+
+    protected boolean showCountry = false;
+
+    protected String addressId;
+
+    /**
+     * Parameterless constructor
+     */
+	public CAddressBlock() { this(null); }
+
+    /**
+     * Cloning constructor
+     * @param original the CAddressBlock to clone
+     */
+	protected CAddressBlock(final CAddressBlock original)
+    {
+    	super(original);
+        if (original != null)
+        {
+            useLocalizedAddressFormat = original.useLocalizedAddressFormat;
+            staticAddressFormat = original.staticAddressFormat;
+            showContactName = original.showContactName;
+            showCountry = original.showCountry;
+            addressId = original.addressId;
+        }
+    }
+
+	@Override
+	public AComponent clone() {
+		return new CAddressBlock(this);
+	}
+
+    /**
+     * We want to return null to signify an empty value, because Address Blocks will always be converted to a series of
+     * Static Text objects when filling the label with data. If this conversion doesn't happen, we want to print "null"
+     * @return
+     */
+    @Override
+    public String toString()
+    {
+        return null;
+    }
+}