Skip to content

Commit b920ec1

Browse files
committed
Deep Clone tests
1 parent 729cc4c commit b920ec1

27 files changed

+80
-40
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = 'com.labelzoom.api'
8-
version = '1.0.15'
8+
version = '1.0.16'
99

1010
java {
1111
sourceCompatibility = JavaVersion.VERSION_1_8

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ protected AComponent(final AComponent original)
6363

6464
public boolean isRotated()
6565
{
66-
return (rotation % 180) != 0;
66+
return (getRotation() % 180) != 0;
6767
}
6868

6969
public boolean isInverted()
7070
{
71-
return (Math.abs(rotation) > 90 && Math.abs(rotation) < 270);
71+
return (Math.abs(getRotation()) > 90 && Math.abs(getRotation()) < 270);
7272
}
7373

7474
@Override

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public abstract class ABarcode extends AComponent implements IDynamicField
2727

2828
private String fieldValue;
2929

30-
private BarcodeStyle barcodeStyle = BarcodeStyle.Unknown;
31-
3230
private boolean blankWhenNull = false;
3331

3432
@Getter
@@ -85,7 +83,6 @@ protected ABarcode(final ABarcode original, final boolean cloneData)
8583
if (original != null)
8684
{
8785
expression = original.expression;
88-
barcodeStyle = original.barcodeStyle;
8986
blankWhenNull = original.blankWhenNull;
9087
if (cloneData)
9188
{
@@ -94,6 +91,8 @@ protected ABarcode(final ABarcode original, final boolean cloneData)
9491
}
9592
}
9693

94+
public abstract BarcodeStyle getBarcodeStyle();
95+
9796
@Override
9897
public String toString() { return getFieldValue(); }
9998

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public class CBarcodeAnsiCodabar extends ALinearBarcode implements IBarcodeWithC
4444
protected CBarcodeAnsiCodabar(final CBarcodeAnsiCodabar original, final boolean cloneData)
4545
{
4646
super(original, cloneData);
47-
setBarcodeStyle(BarcodeStyle.ANSICodabar);
4847
if (original != null)
4948
{
5049
this.checkDigitEnabled = original.checkDigitEnabled;
@@ -54,6 +53,9 @@ protected CBarcodeAnsiCodabar(final CBarcodeAnsiCodabar original, final boolean
5453
}
5554
}
5655

56+
@Override
57+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.ANSICodabar; }
58+
5759
@Override
5860
public AComponent clone() { return clone(false); }
5961
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,16 @@ public class CBarcodeCode11 extends ALinearBarcode implements IBarcodeWithCheckD
4040
protected CBarcodeCode11(final CBarcodeCode11 original, final boolean cloneData)
4141
{
4242
super(original, cloneData);
43-
setBarcodeStyle(BarcodeStyle.Code11);
4443
if (original != null)
4544
{
4645
this.checkDigitEnabled = original.checkDigitEnabled;
4746
this.wideToNarrowRatio = original.wideToNarrowRatio;
4847
}
4948
}
5049

50+
@Override
51+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Code11; }
52+
5153
@Override
5254
public AComponent clone() { return clone(false); }
5355
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ public class CBarcodeCode128 extends ALinearBarcode implements IBarcodeWithCheck
3939
protected CBarcodeCode128(final CBarcodeCode128 original, final boolean cloneData)
4040
{
4141
super(original, cloneData);
42-
setBarcodeStyle(BarcodeStyle.Code128);
4342
if (original != null)
4443
{
4544
this.checkDigitEnabled = original.checkDigitEnabled;
4645
this.uccCaseMode = original.uccCaseMode;
4746
}
4847
}
4948

49+
@Override
50+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Code128; }
51+
5052
@Override
5153
public AComponent clone() { return clone(false); }
5254
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,16 @@ public class CBarcodeCode39 extends ALinearBarcode implements IBarcodeWithCheckD
4040
protected CBarcodeCode39(final CBarcodeCode39 original, final boolean cloneData)
4141
{
4242
super(original, cloneData);
43-
setBarcodeStyle(BarcodeStyle.Code39);
4443
if (original != null)
4544
{
4645
this.checkDigitEnabled = original.checkDigitEnabled;
4746
this.wideToNarrowRatio = original.wideToNarrowRatio;
4847
}
4948
}
5049

50+
@Override
51+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Code39; }
52+
5153
@Override
5254
public AComponent clone() { return clone(false); }
5355
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,15 @@ public class CBarcodeCode93 extends ALinearBarcode implements IBarcodeWithCheckD
3737
protected CBarcodeCode93(final CBarcodeCode93 original, final boolean cloneData)
3838
{
3939
super(original, cloneData);
40-
setBarcodeStyle(BarcodeStyle.Code93);
4140
if (original != null)
4241
{
4342
this.checkDigitEnabled = original.checkDigitEnabled;
4443
}
4544
}
4645

46+
@Override
47+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Code93; }
48+
4749
@Override
4850
public AComponent clone() { return clone(false); }
4951
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ public class CBarcodeEAN13 extends ALinearBarcode
3131
protected CBarcodeEAN13(final CBarcodeEAN13 original, final boolean cloneData)
3232
{
3333
super(original, cloneData);
34-
setBarcodeStyle(BarcodeStyle.EAN_13);
3534
}
3635

36+
@Override
37+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.EAN_13; }
38+
3739
@Override
3840
public AComponent clone() { return clone(false); }
3941
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ public class CBarcodeEAN8 extends ALinearBarcode
3131
protected CBarcodeEAN8(final CBarcodeEAN8 original, final boolean cloneData)
3232
{
3333
super(original, cloneData);
34-
setBarcodeStyle(BarcodeStyle.EAN_8);
3534
}
3635

36+
@Override
37+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.EAN_8; }
38+
3739
@Override
3840
public AComponent clone() { return clone(false); }
3941
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,15 @@ public class CBarcodeIndustrial2of5 extends ALinearBarcode implements IBarcodeWi
3737
protected CBarcodeIndustrial2of5(final CBarcodeIndustrial2of5 original, final boolean cloneData)
3838
{
3939
super(original, cloneData);
40-
setBarcodeStyle(BarcodeStyle.Industrial2of5);
4140
if (original != null)
4241
{
4342
this.wideToNarrowRatio = original.wideToNarrowRatio;
4443
}
4544
}
4645

46+
@Override
47+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Industrial2of5; }
48+
4749
@Override
4850
public AComponent clone() { return clone(false); }
4951
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,16 @@ public class CBarcodeInterleaved2of5 extends ALinearBarcode implements IBarcodeW
4040
protected CBarcodeInterleaved2of5(final CBarcodeInterleaved2of5 original, final boolean cloneData)
4141
{
4242
super(original, cloneData);
43-
setBarcodeStyle(BarcodeStyle.Interleaved2of5);
4443
if (original != null)
4544
{
4645
this.checkDigitEnabled = original.checkDigitEnabled;
4746
this.wideToNarrowRatio = original.wideToNarrowRatio;
4847
}
4948
}
5049

50+
@Override
51+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Interleaved2of5; }
52+
5153
@Override
5254
public AComponent clone() { return clone(false); }
5355
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,15 @@ public class CBarcodeLogmars extends ALinearBarcode implements IBarcodeWithWideT
3737
protected CBarcodeLogmars(final CBarcodeLogmars original, final boolean cloneData)
3838
{
3939
super(original, cloneData);
40-
setBarcodeStyle(BarcodeStyle.LOGMARS);
4140
if (original != null)
4241
{
4342
this.wideToNarrowRatio = original.wideToNarrowRatio;
4443
}
4544
}
4645

46+
@Override
47+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.LOGMARS; }
48+
4749
@Override
4850
public void setHumanReadableEnabled(boolean value) {}
4951
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class CBarcodeMsi extends ALinearBarcode implements IBarcodeWithWideToNar
4141
protected CBarcodeMsi(final CBarcodeMsi original, final boolean cloneData)
4242
{
4343
super(original, cloneData);
44-
setBarcodeStyle(BarcodeStyle.MSI);
4544
if (original != null)
4645
{
4746
this.checkDigit = original.checkDigit;
@@ -50,6 +49,9 @@ protected CBarcodeMsi(final CBarcodeMsi original, final boolean cloneData)
5049
}
5150
}
5251

52+
@Override
53+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.MSI; }
54+
5355
@Override
5456
public AComponent clone() { return clone(false); }
5557
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ public class CBarcodePlanetCode extends ALinearBarcode
3131
protected CBarcodePlanetCode(final CBarcodePlanetCode original, final boolean cloneData)
3232
{
3333
super(original, cloneData);
34-
setBarcodeStyle(BarcodeStyle.PlanetCode);
3534
}
3635

36+
@Override
37+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.PlanetCode; }
38+
3739
@Override
3840
public AComponent clone() { return clone(false); }
3941
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,16 @@ public class CBarcodePlessey extends ALinearBarcode implements IBarcodeWithCheck
4040
protected CBarcodePlessey(final CBarcodePlessey original, final boolean cloneData)
4141
{
4242
super(original, cloneData);
43-
setBarcodeStyle(BarcodeStyle.Plessey);
4443
if (original != null)
4544
{
4645
this.checkDigitEnabled = original.checkDigitEnabled;
4746
this.wideToNarrowRatio = original.wideToNarrowRatio;
4847
}
4948
}
5049

50+
@Override
51+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Plessey; }
52+
5153
@Override
5254
public AComponent clone() { return clone(false); }
5355
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ public class CBarcodePostal extends ALinearBarcode implements IBarcodeWithWideTo
3939
protected CBarcodePostal(final CBarcodePostal original, final boolean cloneData)
4040
{
4141
super(original, cloneData);
42-
setBarcodeStyle(BarcodeStyle.PostNet);
4342
if (original != null)
4443
{
4544
this.postalCodeType = original.postalCodeType;
4645
this.wideToNarrowRatio = original.wideToNarrowRatio;
4746
}
4847
}
4948

49+
@Override
50+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.PostNet; }
51+
5052
@Override
5153
public AComponent clone() { return clone(false); }
5254
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ public class CBarcodeStandard2of5 extends ALinearBarcode
3636
protected CBarcodeStandard2of5(final CBarcodeStandard2of5 original, final boolean cloneData)
3737
{
3838
super(original, cloneData);
39-
setBarcodeStyle(BarcodeStyle.Standard2of5);
4039
if (original != null)
4140
{
4241
this.wideToNarrowRatio = original.wideToNarrowRatio;
4342
}
4443
}
4544

45+
@Override
46+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Standard2of5; }
47+
4648
@Override
4749
public AComponent clone() { return clone(false); }
4850
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ public class CBarcodeUPCA extends ALinearBarcode implements IBarcodeWithCheckDig
3636
protected CBarcodeUPCA(final CBarcodeUPCA original, final boolean cloneData)
3737
{
3838
super(original, cloneData);
39-
setBarcodeStyle(BarcodeStyle.UPC_A);
4039
if (original != null)
4140
{
4241
this.checkDigitEnabled = original.checkDigitEnabled;
4342
}
4443
}
4544

45+
@Override
46+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.UPC_A; }
47+
4648
@Override
4749
public AComponent clone() { return clone(false); }
4850
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ public class CBarcodeUPCE extends ALinearBarcode implements IBarcodeWithCheckDig
3636
protected CBarcodeUPCE(final CBarcodeUPCE original, final boolean cloneData)
3737
{
3838
super(original, cloneData);
39-
setBarcodeStyle(BarcodeStyle.UPC_E);
4039
if (original != null)
4140
{
4241
this.checkDigitEnabled = original.checkDigitEnabled;
4342
}
4443
}
4544

45+
@Override
46+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.UPC_E; }
47+
4648
@Override
4749
public AComponent clone() { return clone(false); }
4850
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ public class CBarcodeUpcEanExtensions extends ALinearBarcode
3232
protected CBarcodeUpcEanExtensions(final CBarcodeUpcEanExtensions original, final boolean cloneData)
3333
{
3434
super(original, cloneData);
35-
setBarcodeStyle(BarcodeStyle.UPC_EAN);
3635
}
3736

37+
@Override
38+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.UPC_EAN; }
39+
3840
@Override
3941
public AComponent clone() { return clone(false); }
4042
@Override

src/main/java/com/labelzoom/api/model/components/barcodes/twod/CBarcodeAztec.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public class CBarcodeAztec extends A2DBarcode
3939
protected CBarcodeAztec(final CBarcodeAztec original, final boolean cloneData)
4040
{
4141
super(original, cloneData);
42-
setBarcodeStyle(BarcodeStyle.Aztec);
4342
if (original != null)
4443
{
4544
magnificationFactor = original.magnificationFactor;
@@ -51,6 +50,9 @@ protected CBarcodeAztec(final CBarcodeAztec original, final boolean cloneData)
5150
}
5251
}
5352

53+
@Override
54+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.Aztec; }
55+
5456
@Override
5557
public AComponent clone() { return clone(false); }
5658
@Override

src/main/java/com/labelzoom/api/model/components/barcodes/twod/CBarcodeDataMatrix.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public class CBarcodeDataMatrix extends A2DBarcode
4242
protected CBarcodeDataMatrix(final CBarcodeDataMatrix original, final boolean cloneData)
4343
{
4444
super(original, cloneData);
45-
setBarcodeStyle(ABarcode.BarcodeStyle.DataMatrix);
4645
if (original != null)
4746
{
4847
symbolHeight = original.symbolHeight;
@@ -55,6 +54,9 @@ protected CBarcodeDataMatrix(final CBarcodeDataMatrix original, final boolean cl
5554
}
5655
}
5756

57+
@Override
58+
public BarcodeStyle getBarcodeStyle() { return BarcodeStyle.DataMatrix; }
59+
5860
@Override
5961
public AComponent clone() { return clone(false); }
6062
@Override

0 commit comments

Comments
 (0)