6 files changed, 708 insertions, 4 deletions

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/DataType.java
new file mode 100644
index 0000000..f94b622
--- /dev/null
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/DataType.java
@@ -0,0 +1,95 @@
+package org.uic.barcode.dynamicFrame.v2;

+

+import org.uic.barcode.asn1.datatypes.CharacterRestriction;

+import org.uic.barcode.asn1.datatypes.HasExtensionMarker;

+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

+@HasExtensionMarker

+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);

+	}

+

+}

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/DynamicFrame.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
index eb26729..2986f75 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/DynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
@@ -1,4 +1,4 @@
-package org.uic.barcode.dynamicFrame;

+package org.uic.barcode.dynamicFrame.v2;

 

 import java.security.InvalidKeyException;

 import java.security.KeyFactory;

@@ -14,6 +14,7 @@ import java.security.spec.X509EncodedKeySpec;
 import org.uic.barcode.asn1.datatypes.Asn1Optional;

 import org.uic.barcode.asn1.datatypes.CharacterRestriction;

 import org.uic.barcode.asn1.datatypes.FieldOrder;

+import org.uic.barcode.asn1.datatypes.HasExtensionMarker;

 import org.uic.barcode.asn1.datatypes.RestrictedString;

 import org.uic.barcode.asn1.datatypes.Sequence;

 import org.uic.barcode.asn1.datatypesimpl.OctetString;

@@ -21,17 +22,18 @@ import org.uic.barcode.asn1.uper.UperEncoder;
 import org.uic.barcode.dynamicContent.api.DynamicContentCoder;

 import org.uic.barcode.dynamicContent.api.IUicDynamicContent;

 import org.uic.barcode.dynamicContent.fdc1.UicDynamicContentDataFDC1;

+import org.uic.barcode.dynamicFrame.Constants;

 import org.uic.barcode.ticket.EncodingFormatException;

 import org.uic.barcode.utils.AlgorithmNameResolver;

 

 

-// TODO: Auto-generated Javadoc

 /**

  * The DynamicHeader for bar codes 

  * 

  * Implementation of the Draft under discussion, not final.

  */

 @Sequence

+@HasExtensionMarker

 public class DynamicFrame extends Object{

 	

 	/**

@@ -387,7 +389,10 @@ public class DynamicFrame extends Object{
 	 * @param dynamicData the dynamic data

 	 */

 	public void addLevel2DynamicData(UicDynamicContentDataFDC1 dynamicData) {

-		this.getLevel2SignedData().setLevel2Data( dynamicData.getDataType());	

+		DataType dt = new DataType();

+		dt.setByteData(dynamicData.getDataType().getByteData());

+		dt.setFormat(dynamicData.getDataType().getFormat());	

+		level2SignedData.setLevel2Data(dt);	

 	}

 	

 	/**

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java
new file mode 100644
index 0000000..8987f59
--- /dev/null
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java
@@ -0,0 +1,203 @@
+package org.uic.barcode.dynamicFrame.v2;

+

+import org.uic.barcode.asn1.datatypesimpl.OctetString;

+import org.uic.barcode.asn1.uper.UperEncoder;

+import org.uic.barcode.dynamicFrame.v2.DynamicFrame;

+import org.uic.barcode.dynamicFrame.api.IData;

+import org.uic.barcode.dynamicFrame.api.IDynamicFrame;

+import org.uic.barcode.dynamicFrame.api.ILevel1Data;

+import org.uic.barcode.dynamicFrame.api.ILevel2Data;

+import org.uic.barcode.dynamicFrame.api.SimpleData;

+import org.uic.barcode.dynamicFrame.api.SimpleLevel1Data;

+import org.uic.barcode.dynamicFrame.api.SimpleLevel2Data;

+import org.uic.barcode.dynamicFrame.v2.Level2DataType;

+import org.uic.barcode.dynamicFrame.v2.DataType;

+import org.uic.barcode.dynamicFrame.v2.Level1DataType;

+import org.uic.barcode.dynamicFrame.v2.SequenceOfDataType;

+import org.uic.barcode.ticket.EncodingFormatException;

+

+public class DynamicFrameCoderV2 {

+	

+	public static void decode(IDynamicFrame frame, byte[] bytes) {

+		

+		DynamicFrame asnFrame = UperEncoder.decode(bytes,DynamicFrame.class);	

+		

+		frame.setFormat(asnFrame.getFormat());

+		

+		if (asnFrame.getLevel2Signature() != null) {

+			frame.setLevel2Signature(asnFrame.getLevel2Signature().toByteArray());

+		}

+					

+		if (asnFrame.getLevel2SignedData() != null) { 

+			frame.setLevel2Data(new SimpleLevel2Data());

+			populateApi(frame.getLevel2Data(), asnFrame.getLevel2SignedData());	

+		}

+		

+	}

+

+	private static void populateApi(ILevel2Data level2, Level2DataType asnLevel2) {

+		

+		if (asnLevel2 == null) return;

+		

+		level2.setLevel1Signature(asnLevel2.getLevel1SignatureBytes());

+		

+		if (asnLevel2.getLevel1Data() != null) {

+		    level2.setLevel1Data(new SimpleLevel1Data());

+			level2.setLevel1Data(populateApi(asnLevel2.getLevel1Data()));

+		}

+		

+		if (asnLevel2.getLevel2Data() != null) {

+			level2.setLevel2Data(new SimpleData());

+			level2.setLevel2Data(populateApi(asnLevel2.getLevel2Data()));

+		}	

+				

+	}

+

+	private static IData populateApi(DataType asnData) {

+		

+		IData data = new SimpleData();

+		data.setData(asnData.getByteData());

+		data.setFormat(asnData.getFormat());

+		return data;

+	}

+

+	private static ILevel1Data populateApi(Level1DataType asnLevel1) {

+		

+		ILevel1Data level1 = new SimpleLevel1Data();

+		

+		level1.setKeyId(asnLevel1.getKeyId());

+		level1.setSecurityProvider(asnLevel1.getSecurityProvider());

+		level1.setLevel1KeyAlg(asnLevel1.getLevel1KeyAlg());

+		level1.setLevel1SigningAlg(asnLevel1.getLevel1SigningAlg());

+		level1.setLevel2KeyAlg(asnLevel1.getLevel2KeyAlg());

+		level1.setLevel2SigningAlg(asnLevel1.getLevel2SigningAlg());

+		if (asnLevel1.getLevel2publicKey() != null) {

+			level1.setLevel2publicKey(asnLevel1.getLevel2publicKey().toByteArray());

+		}

+		

+		if (asnLevel1.getData() != null && !asnLevel1.getData().isEmpty()) {

+			

+			for (DataType asnData : asnLevel1.getData()) {

+				IData data = new SimpleData();

+				data.setData(asnData.getByteData());

+				data.setFormat(asnData.getFormat());

+		   	    level1.addData(data);

+			}

+		}

+		

+		if (asnLevel1.getEndOfValidityDate() != null) {

+			level1.setEndOfBarcodeValidity(asnLevel1.getEndOfValidityDate());

+		}

+		

+		return level1;

+	}

+	

+	public static byte[] encode(IDynamicFrame dynamicFrame) throws EncodingFormatException {

+		

+		DynamicFrame asnDynamicFrame = populateAsn(dynamicFrame);

+		

+		return UperEncoder.encode(asnDynamicFrame);	

+						

+	}

+

+

+

+	public static byte[] encode(ILevel1Data level1Data) throws EncodingFormatException {

+		

+		Level1DataType asn = populateAsn(level1Data);

+		

+		return UperEncoder.encode(asn);

+	}

+	

+	public static byte[] encode(ILevel2Data level2SignedData) throws EncodingFormatException {

+		

+       Level2DataType asn = populateAsn(level2SignedData);

+		

+		return UperEncoder.encode(asn);

+	}

+

+	private static DynamicFrame populateAsn(IDynamicFrame frame) throws EncodingFormatException {

+		

+		DynamicFrame asnFrame = new DynamicFrame();

+		

+		frame.setFormat(frame.getFormat());

+		

+		if (frame.getLevel2Signature() != null && frame.getLevel2Signature().length > 0) {

+			asnFrame.setLevel2Signature(new OctetString(frame.getLevel2Signature()));

+		}

+		

+		Level2DataType asnLevel2 = populateAsn(frame.getLevel2Data());

+		if (asnLevel2 != null) {

+			asnFrame.setLevel2SignedData(asnLevel2);

+		}

+

+		return asnFrame;

+	}

+

+

+	private static Level2DataType populateAsn(ILevel2Data level2) throws EncodingFormatException {

+		

+		Level2DataType asnLevel2 = new Level2DataType();

+		

+		asnLevel2.setLevel1Signature(level2.getLevel1Signature());

+		

+		Level1DataType asnLevel1 = populateAsn(level2.getLevel1Data());

+		

+		asnLevel2.setLevel1Data(asnLevel1);

+		

+		if (level2.getLevel2Data() != null) {

+			DataType data2 = new DataType();

+			data2.setFormat(level2.getLevel2Data().getFormat());

+			data2.setData(new OctetString(level2.getLevel2Data().getData()));

+			asnLevel2.setLevel2Data(data2);

+		}

+		

+		

+

+		return asnLevel2;

+	}

+

+	private static Level1DataType populateAsn(ILevel1Data level1) throws EncodingFormatException {

+		

+		Level1DataType asnLevel1 = new Level1DataType();

+				

+		asnLevel1.setSecurityProvider(level1.getSecurityProvider());

+		

+		asnLevel1.setKeyId(level1.getKeyId());

+		

+		asnLevel1.setLevel1KeyAlg(level1.getLevel1KeyAlg());

+		

+		asnLevel1.setLevel1SigningAlg(level1.getLevel1SigningAlg());

+

+		asnLevel1.setLevel2KeyAlg(level1.getLevel2KeyAlg());

+		

+		if (level1.getLevel2publicKey() != null && level1.getLevel2publicKey().length > 0) {

+			asnLevel1.setLevel2publicKey(new OctetString(level1.getLevel2publicKey()));

+		}

+		

+		asnLevel1.setLevel2SigningAlg(level1.getLevel2SigningAlg());

+		

+		if (level1.getData() != null && !level1.getData().isEmpty()) {

+			

+			asnLevel1.setData(new SequenceOfDataType());

+			

+			for (IData data : level1.getData()) {

+				

+				DataType asnData = new DataType();

+				asnData.setByteData(data.getData());

+				asnData.setFormat(data.getFormat());

+				asnLevel1.getData().add(asnData);

+				

+			}

+			

+		}

+		

+		asnLevel1.setEndOfValidityDate(level1.getEndOfBarcodeValidity());

+		

+		

+		return asnLevel1;

+	}

+	

+

+

+}

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java
new file mode 100644
index 0000000..1dff709
--- /dev/null
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java
@@ -0,0 +1,374 @@
+package org.uic.barcode.dynamicFrame.v2;

+

+import java.util.Calendar;

+import java.util.Date;

+import java.util.TimeZone;

+

+import org.uic.barcode.asn1.datatypes.Asn1Optional;

+import org.uic.barcode.asn1.datatypes.CharacterRestriction;

+import org.uic.barcode.asn1.datatypes.FieldOrder;

+import org.uic.barcode.asn1.datatypes.HasExtensionMarker;

+import org.uic.barcode.asn1.datatypes.IntRange;

+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;

+import org.uic.barcode.ticket.EncodingFormatException;

+import org.uic.barcode.ticket.api.utils.UicEncoderUtils;

+

+// TODO: Auto-generated Javadoc

+/**

+ * The Class SignedDataType.

+ */

+@Sequence

+@HasExtensionMarker

+public class Level1DataType {

+	

+	/** 

+	 * The security provider 

+	 * numeric codes 1 ...32000

+	 *  

+	 *   */

+	@FieldOrder(order = 0)

+	@IntRange(minValue=1,maxValue=32000)

+	@Asn1Optional public Long securityProviderNum;

+

+	/**  The security provider  alphanumeric codes. */

+	@FieldOrder(order = 1)

+	@RestrictedString(CharacterRestriction.IA5String)

+	@Asn1Optional public String securityProviderIA5;

+

+	

+	/** The key id. */

+	@FieldOrder(order = 2)

+	@IntRange(minValue=0,maxValue=99999)

+	@Asn1Optional public Long	keyId;

+	

+	

+	/** The data. */

+	@FieldOrder(order = 3)

+	public SequenceOfDataType data;

+	

+	/** 

+	 * The key generator algorithms

+	 * Object Identifier of the Algorithm

+	 * Number notation:

+	 * 

+	 *  e.g.:

+	 *        	--    DSA SHA224  2.16.840.1.101.3.4.3.1

+  	 *          --    DSA SHA256  2.16.840.1.101.3.4.3.2

+  	 *          --    ECC 256     1.2.840.10045.3.1.7

+	 *  

+	 *  

+	 */

+	@FieldOrder(order = 4)

+	@RestrictedString(CharacterRestriction.ObjectIdentifier)

+	@Asn1Optional public String level1KeyAlg;		

+		

+	/** The level 2 key alg. */

+	@FieldOrder(order = 5)

+	@RestrictedString(CharacterRestriction.ObjectIdentifier)

+	@Asn1Optional public String level2KeyAlg;		

+	

+	/** 

+	 * The signing algorithm

+	 * Object Identifier of the Algorithms

+	 * Number notation:

+	 * 

+	 *  e.g.:

+	 *        	--    DSA SHA224  2.16.840.1.101.3.4.3.1

+  	 *          --    DSA SHA256  2.16.840.1.101.3.4.3.2

+  	 *          --    ECC 256     1.2.840.10045.3.1.7

+	 *  

+	 *  

+	 */

+	@FieldOrder(order = 6)

+	@RestrictedString(CharacterRestriction.ObjectIdentifier)

+	@Asn1Optional public String level1SigningAlg;	

+	

+	/** The level 2 signing alg. */

+	@FieldOrder(order = 7)

+	@RestrictedString(CharacterRestriction.ObjectIdentifier)

+	@Asn1Optional public String level2SigningAlg;		

+	

+	

+	/**  The level 2 public key. */

+	@FieldOrder(order = 8)

+	@Asn1Optional public OctetString level2publicKey;

+	

+

+	/** The End of validity year. */

+	@FieldOrder(order = 9)

+	@IntRange(minValue=2016,maxValue=2269)

+	public Long EndOfValidityYear;

+

+	/** The End of validity day. */

+	@FieldOrder(order = 10)

+	@IntRange(minValue=1,maxValue=366)

+	public Long EndOfValidityDay;

+

+	/** The End of validity time. */

+	@FieldOrder(order = 11)

+	@IntRange(minValue=0,maxValue=1440)

+	@Asn1Optional public Long EndOfValidityTime;

+	

+	

+	

+	

+	

+	/**

+	 * Gets the security provider num.

+	 *

+	 * @return the security provider num

+	 */

+	public Long getSecurityProviderNum() {

+		return securityProviderNum;

+	}

+

+	/**

+	 * Sets the security provider num.

+	 * 

+	 * in case the security provider code is encoded in IA5 this will return null

+	 *

+	 * @param securityProviderNum the new security provider num

+	 */

+	public void setSecurityProviderNum(Long securityProviderNum) {

+		this.securityProviderNum = securityProviderNum;

+	}

+

+	/**

+	 * Gets the security provider IA5.

+	 * 

+	 * in case the security provider code is encoded numerically this will return null

+	 *

+	 * @return the security provider IA5

+	 */

+	public String getSecurityProviderIA5() {

+		return securityProviderIA5;

+	}

+	

+	/**

+	 * Sets the security provider

+	 * 

+	 * The security provider code must use the IA5 Alphabet .

+	 *

+	 * @param securityProvider the new security provider

+	 * @throws EncodingFormatException the encoding format exception

+	 */

+	public void setSecurityProvider(String securityProvider) throws EncodingFormatException {

+		this.securityProviderNum = UicEncoderUtils.getNum(securityProvider);

+		this.securityProviderIA5 = UicEncoderUtils.getIA5NonNum(securityProvider);

+	}

+	

+	

+	/**

+	 * Gets the security provider.

+	 *

+	 * @return the security provider

+	 */

+	public String getSecurityProvider() {

+		return UicEncoderUtils.mapToString(this.securityProviderNum, this.securityProviderIA5);

+	}

+	

+

+	/**

+	 * Sets the security provider IA 5.

+	 *

+	 * @param securityProviderIA5 the new security provider IA 5

+	 */

+	public void setSecurityProviderIA5(String securityProviderIA5) {

+		this.securityProviderIA5 = securityProviderIA5;

+	}

+	

+	/**

+	 * Gets the key id.

+	 *

+	 * @return the key id

+	 */

+	public Long getKeyId() {

+		return keyId;

+	}

+

+	/**

+	 * Sets the key id.

+	 *

+	 * @param keyId the new key id

+	 */

+	public void setKeyId(Long keyId) {

+		this.keyId = keyId;

+	}

+

+	/**

+	 * Gets the data.

+	 *

+	 * @return the data

+	 */

+	public SequenceOfDataType getData() {

+		return data;

+	}

+

+	/**

+	 * Sets the data.

+	 *

+	 * @param data the new data

+	 */

+	public void setData(SequenceOfDataType data) {

+		this.data = data;

+	}

+

+	/**

+	 * Gets the level 2 key alg.

+	 *

+	 * @return the level 2 key alg

+	 */

+	public String getLevel2KeyAlg() {

+		return level2KeyAlg;

+	}

+

+	/**

+	 * Sets the level 2 key alg.

+	 *

+	 * @param level2KeyAlg the new level 2 key alg

+	 */

+	public void setLevel2KeyAlg(String level2KeyAlg) {

+		this.level2KeyAlg = level2KeyAlg;

+	}

+

+	/**

+	 * Gets the level 1 signing alg.

+	 *

+	 * @return the level 1 signing alg

+	 */

+	public String getLevel1SigningAlg() {

+		return level1SigningAlg;

+	}

+

+	/**

+	 * Sets the level 1 signing alg.

+	 *

+	 * @param level1SigningAlg the new level 1 signing alg

+	 */

+	public void setLevel1SigningAlg(String level1SigningAlg) {

+		this.level1SigningAlg = level1SigningAlg;

+	}

+

+	/**

+	 * Gets the level 2 signing alg.

+	 *

+	 * @return the level 2 signing alg

+	 */

+	public String getLevel2SigningAlg() {

+		return level2SigningAlg;

+	}

+

+	/**

+	 * Sets the level 2 signing alg.

+	 *

+	 * @param level2SigningAlg the new level 2 signing alg

+	 */

+	public void setLevel2SigningAlg(String level2SigningAlg) {

+		this.level2SigningAlg = level2SigningAlg;

+	}

+

+	/**

+	 * Gets the level 2 public key.

+	 *

+	 * @return the level 2 public key

+	 */

+	public OctetString getLevel2publicKey() {

+		return level2publicKey;

+	}

+

+	/**

+	 * Sets the level 2 public key.

+	 *

+	 * @param level2publicKey the new level 2 public key

+	 */

+	public void setLevel2publicKey(OctetString level2publicKey) {

+		this.level2publicKey = level2publicKey;

+	}

+

+	

+	

+	/**

+	 * Gets the level 1 key alg.

+	 *

+	 * @return the level 1 key alg

+	 */

+	public String getLevel1KeyAlg() {

+		return level1KeyAlg;

+	}

+

+	/**

+	 * Sets the level 1 key alg.

+	 *

+	 * @param level1KeyAlg the new level 1 key alg

+	 */

+	public void setLevel1KeyAlg(String level1KeyAlg) {

+		this.level1KeyAlg = level1KeyAlg;

+	}

+	

+	/**

+	 * Sets the end of validity date. The validity date has to be provided in UTC.

+	 *

+	 * @param date the new end of validity date

+	 */

+	public void setEndOfValidityDate(Date date){

+		

+		if (date == null) {

+			date = Calendar.getInstance().getTime();

+		}

+		

+		Calendar cal = Calendar.getInstance();

+		cal.setTime(date);

+		

+		this.EndOfValidityYear = new Long( cal.get(Calendar.YEAR));

+		this.EndOfValidityDay = new Long (cal.get(Calendar.DAY_OF_YEAR));

+		int time =  cal.get(Calendar.HOUR_OF_DAY) * 60 + cal.get(Calendar.MINUTE);

+		if (time >= 0) {

+			this.EndOfValidityTime = new Long (time );

+		}

+		

+	}

+	

+	/**

+	 * Gets the end of validity date.

+	 *

+	 * @return the end of validity date

+	 */

+	public Date getEndOfValidityDate() {

+		

+		if (this.EndOfValidityYear == null || this.EndOfValidityDay == null) return null;

+		

+		Calendar cal = Calendar.getInstance();

+		cal.clear();

+		cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+		cal.set(Calendar.YEAR, this.EndOfValidityYear.intValue());

+		cal.set(Calendar.DAY_OF_YEAR, this.EndOfValidityDay.intValue());

+		

+		if (this.EndOfValidityTime != null) {

+		

+			int hours = this.EndOfValidityTime.intValue() / 60;

+			int minutes = this.EndOfValidityTime.intValue() % 60;

+			cal.set(Calendar.HOUR_OF_DAY, hours);

+			cal.set(Calendar.MINUTE,minutes);

+

+		}

+		

+		Date d = cal.getTime();

+		return d;

+	}

+

+	/**

+	 * Gets the data for signature.

+	 *

+	 * The byte array containing the ASN.1 PER UNALIGNED encoded data of the DataBlock

+	 *

+	 *

+	 * @return the data for signature

+	 */

+	public byte[] encode() {

+		return UperEncoder.encode(this);

+

+	}

+}

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/Level2DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
index 8c3cd60..6534c4d 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/Level2DataType.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level2DataType.java
@@ -1,4 +1,4 @@
-package org.uic.barcode.dynamicFrame;

+package org.uic.barcode.dynamicFrame.v2;

 

 import java.security.PrivateKey;

 import java.security.Provider;

@@ -6,6 +6,7 @@ import java.security.Signature;
 

 import org.uic.barcode.asn1.datatypes.Asn1Optional;

 import org.uic.barcode.asn1.datatypes.FieldOrder;

+import org.uic.barcode.asn1.datatypes.HasExtensionMarker;

 import org.uic.barcode.asn1.datatypes.Sequence;

 import org.uic.barcode.asn1.datatypesimpl.OctetString;

 import org.uic.barcode.asn1.uper.UperEncoder;

@@ -15,6 +16,7 @@ import org.uic.barcode.utils.AlgorithmNameResolver;
  * The Class DataType.

  */

 @Sequence

+@HasExtensionMarker

 public class Level2DataType {

 

 	@FieldOrder(order = 0)

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/SequenceOfDataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/SequenceOfDataType.java
new file mode 100644
index 0000000..fc76776
--- /dev/null
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/SequenceOfDataType.java
@@ -0,0 +1,25 @@
+package org.uic.barcode.dynamicFrame.v2;

+

+

+import java.util.Collection;

+

+import org.uic.barcode.asn1.datatypes.Asn1SequenceOf;

+

+/**

+ * The Class SequenceOfDataType.

+ */

+public class SequenceOfDataType extends Asn1SequenceOf<DataType>{

+

+	    /**

+    	 * Instantiates a new sequence of data type.

+    	 */

+    	public SequenceOfDataType() { super(); }

+	    

+    	/**

+    	 * Instantiates a new sequence of data type.

+    	 *

+    	 * @param coll the coll

+    	 */

+    	public SequenceOfDataType(Collection<DataType> coll) { super(coll); }

+

+}