API-85 Lifting barcode height from ALinearBarcode to ABarcode

labelzoom · Nov 30, 2024 · 4eb7ab3 · 4eb7ab3
1 parent ee90715
commit 4eb7ab3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'com.labelzoom.api'
-version = '1.3.1'
+version = '1.3.2'
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/src/main/java/com/labelzoom/api/model/components/barcodes/ABarcode.java b/src/main/java/com/labelzoom/api/model/components/barcodes/ABarcode.java
@@ -27,6 +27,8 @@ public abstract class ABarcode extends AComponent implements IDynamicField
 
     private String fieldValue;
 
+    private Integer height;
+
     private boolean blankWhenNull = false;
 
     @Getter
@@ -84,6 +86,7 @@ protected ABarcode(final ABarcode original, final boolean cloneData)
         {
             expression = original.expression;
             blankWhenNull = original.blankWhenNull;
+            height = original.height;
             if (cloneData)
             {
                 fieldValue = original.fieldValue;

diff --git a/src/main/java/com/labelzoom/api/model/components/barcodes/linear/ALinearBarcode.java b/src/main/java/com/labelzoom/api/model/components/barcodes/linear/ALinearBarcode.java
@@ -25,8 +25,6 @@ public abstract class ALinearBarcode extends ABarcode implements IBarcodeWithMod
 {
 	private ZebraBarcodeSize barcodeSize = ZebraBarcodeSize.Normal;
 
-	private int height;
-
 	private boolean humanReadableEnabled;
 
 	private HumanReadableStyle humanReadablePosition;
@@ -52,7 +50,6 @@ protected ALinearBarcode(final ALinearBarcode original, final boolean cloneData)
 		if (original != null)
 		{
 			barcodeSize = original.barcodeSize;
-			height = original.height;
 			humanReadableEnabled = original.humanReadableEnabled;
 			humanReadablePosition = original.humanReadablePosition;
 		}