From 17f05b763d70f350bad482df9378c571c2ebddf6 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Fri, 21 Jan 2022 18:19:36 +0100
Subject: new dynamic header version 2.0.0

---
 .../org/uic/barcode/dynamicFrame/v1/DataType.java  | 93 ++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java

(limited to 'src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java')

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java
new file mode 100644
index 0000000..6195b3c
--- /dev/null
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java
@@ -0,0 +1,93 @@
+package org.uic.barcode.dynamicFrame.v1;
+
+import org.uic.barcode.asn1.datatypes.CharacterRestriction;
+import org.uic.barcode.asn1.datatypes.RestrictedString;
+import org.uic.barcode.asn1.datatypes.Sequence;
+import org.uic.barcode.asn1.datatypesimpl.OctetString;
+import org.uic.barcode.asn1.uper.UperEncoder;
+
+/**
+ * The Class DataType.
+ */
+@Sequence
+public class DataType {
+
+
+	/** The data format.
+	 * 
+	 *  -- FCB1  FCB version 1
+	 *  -- FCB2  FCB version 2
+	 *  -- RICS  company code + ...
+	 **/
+	@RestrictedString(CharacterRestriction.IA5String)
+	public String format;
+	
+	/** The data. */
+	public OctetString data;
+
+	/**
+	 * Gets the data format.
+	 *
+	 * @return the data format
+	 */
+	public String getFormat() {
+		return format;
+	}
+
+	/**
+	 * Sets the data format.
+	 *
+	 * @param dataFormat the new data format
+	 */
+	public void setFormat(String format) {
+		this.format = format;
+	}
+
+	/**
+	 * Gets the data.
+	 *
+	 * @return the data
+	 */
+	public OctetString getData() {
+		return data;
+	}
+
+	/**
+	 * Sets the data.
+	 *
+	 * @param data the new data
+	 */
+	public void setData(OctetString data) {
+		this.data = data;
+	}
+	
+	/**
+	 * Gets the data as byte array.
+	 *
+	 * @return the data
+	 */
+	public byte[] getByteData() {
+		return data.toByteArray();
+	}
+
+	/**
+	 * Sets the data from a byte array.
+	 *
+	 * @param data the new data
+	 */
+	public void setByteData(byte[] data) {
+		this.data = new OctetString(data);
+	}
+	
+	/**
+	 * Encode.
+	 * 
+	 * Encode the header as ASN.1 PER UNALIGNED byte array
+	 *
+	 * @return the byte[]
+	 */
+	public byte[] encode() {
+		return UperEncoder.encode(this);
+	}
+
+}
-- 
cgit v1.2.3


From 2f72a6419dd1e20acf6e77a9276a6055892e732a Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 1 Feb 2022 12:45:04 +0100
Subject: - missing fieldOrder added - validation of level1 when the signature
 algorithm is missing

---
 src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java')

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java
index 6195b3c..e8cfc50 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v1/DataType.java
@@ -1,6 +1,7 @@
 package org.uic.barcode.dynamicFrame.v1;
 
 import org.uic.barcode.asn1.datatypes.CharacterRestriction;
+import org.uic.barcode.asn1.datatypes.FieldOrder;
 import org.uic.barcode.asn1.datatypes.RestrictedString;
 import org.uic.barcode.asn1.datatypes.Sequence;
 import org.uic.barcode.asn1.datatypesimpl.OctetString;
@@ -19,10 +20,12 @@ public class DataType {
 	 *  -- FCB2  FCB version 2
 	 *  -- RICS  company code + ...
 	 **/
+	@FieldOrder(order = 0)
 	@RestrictedString(CharacterRestriction.IA5String)
 	public String format;
 	
 	/** The data. */
+	@FieldOrder(order = 1)
 	public OctetString data;
 
 	/**
-- 
cgit v1.2.3