From 425bd35c736b7e1c0dbe5b3f9162e195b3be6018 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Thu, 25 Feb 2021 11:02:26 +0100
Subject: - bug fix on TicketType Enum - duplicate function getDocument removed
 - issuedOnLine null value allowed - maven install added (required renaming of
 some packages)

---
 src/org/uic/barcode/dynamicFrame/DataType.java      | 12 ++++++------
 src/org/uic/barcode/dynamicFrame/DynamicFrame.java  | 17 ++++++++---------
 .../uic/barcode/dynamicFrame/Level1DataType.java    | 21 ++++++++++-----------
 .../uic/barcode/dynamicFrame/Level2DataType.java    | 11 +++++------
 .../barcode/dynamicFrame/SequenceOfDataType.java    |  2 +-
 5 files changed, 30 insertions(+), 33 deletions(-)

(limited to 'src/org/uic/barcode/dynamicFrame')

diff --git a/src/org/uic/barcode/dynamicFrame/DataType.java b/src/org/uic/barcode/dynamicFrame/DataType.java
index fb84db6..2d6d984 100644
--- a/src/org/uic/barcode/dynamicFrame/DataType.java
+++ b/src/org/uic/barcode/dynamicFrame/DataType.java
@@ -1,11 +1,11 @@
 package org.uic.barcode.dynamicFrame;
 
-import net.gcdc.asn1.datatypes.Asn1Default;
-import net.gcdc.asn1.datatypes.CharacterRestriction;
-import net.gcdc.asn1.datatypes.RestrictedString;
-import net.gcdc.asn1.datatypes.Sequence;
-import net.gcdc.asn1.datatypesimpl.OctetString;
-import net.gcdc.asn1.uper.UperEncoder;
+import org.uic.barcode.asn1.datatypes.Asn1Default;
+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.
diff --git a/src/org/uic/barcode/dynamicFrame/DynamicFrame.java b/src/org/uic/barcode/dynamicFrame/DynamicFrame.java
index 69a67b2..9605a0d 100644
--- a/src/org/uic/barcode/dynamicFrame/DynamicFrame.java
+++ b/src/org/uic/barcode/dynamicFrame/DynamicFrame.java
@@ -10,17 +10,16 @@ import java.security.SignatureException;
 import java.security.spec.InvalidKeySpecException;
 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;
+import org.uic.barcode.asn1.uper.UperEncoder;
 import org.uic.barcode.utils.AlgorithmNameResolver;
 
-import net.gcdc.asn1.datatypes.Asn1Optional;
-import net.gcdc.asn1.datatypes.CharacterRestriction;
-import net.gcdc.asn1.datatypes.FieldOrder;
-import net.gcdc.asn1.datatypes.HasExtensionMarker;
-import net.gcdc.asn1.datatypes.RestrictedString;
-import net.gcdc.asn1.datatypes.Sequence;
-import net.gcdc.asn1.datatypesimpl.OctetString;
-import net.gcdc.asn1.uper.UperEncoder;
-
 
 /**
  * The DynamicHeader for bar codes 
diff --git a/src/org/uic/barcode/dynamicFrame/Level1DataType.java b/src/org/uic/barcode/dynamicFrame/Level1DataType.java
index 796c44f..1f4d476 100644
--- a/src/org/uic/barcode/dynamicFrame/Level1DataType.java
+++ b/src/org/uic/barcode/dynamicFrame/Level1DataType.java
@@ -1,16 +1,15 @@
 package org.uic.barcode.dynamicFrame;
 
-import org.uic.ticket.EncodingFormatException;
-import org.uic.ticket.api.utils.UicEncoderUtils;
-
-import net.gcdc.asn1.datatypes.Asn1Optional;
-import net.gcdc.asn1.datatypes.CharacterRestriction;
-import net.gcdc.asn1.datatypes.FieldOrder;
-import net.gcdc.asn1.datatypes.IntRange;
-import net.gcdc.asn1.datatypes.RestrictedString;
-import net.gcdc.asn1.datatypes.Sequence;
-import net.gcdc.asn1.datatypesimpl.OctetString;
-import net.gcdc.asn1.uper.UperEncoder;
+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.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;
 
 /**
  * The Class SignedDataType.
diff --git a/src/org/uic/barcode/dynamicFrame/Level2DataType.java b/src/org/uic/barcode/dynamicFrame/Level2DataType.java
index b2aceab..dbd25ce 100644
--- a/src/org/uic/barcode/dynamicFrame/Level2DataType.java
+++ b/src/org/uic/barcode/dynamicFrame/Level2DataType.java
@@ -3,14 +3,13 @@ package org.uic.barcode.dynamicFrame;
 import java.security.PrivateKey;
 import java.security.Signature;
 
+import org.uic.barcode.asn1.datatypes.Asn1Optional;
+import org.uic.barcode.asn1.datatypes.FieldOrder;
+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.utils.AlgorithmNameResolver;
 
-import net.gcdc.asn1.datatypes.Asn1Optional;
-import net.gcdc.asn1.datatypes.FieldOrder;
-import net.gcdc.asn1.datatypes.Sequence;
-import net.gcdc.asn1.datatypesimpl.OctetString;
-import net.gcdc.asn1.uper.UperEncoder;
-
 /**
  * The Class DataType.
  */
diff --git a/src/org/uic/barcode/dynamicFrame/SequenceOfDataType.java b/src/org/uic/barcode/dynamicFrame/SequenceOfDataType.java
index 93b9d78..b5c130e 100644
--- a/src/org/uic/barcode/dynamicFrame/SequenceOfDataType.java
+++ b/src/org/uic/barcode/dynamicFrame/SequenceOfDataType.java
@@ -3,7 +3,7 @@ package org.uic.barcode.dynamicFrame;
 
 import java.util.Collection;
 
-import net.gcdc.asn1.datatypes.Asn1SequenceOf;
+import org.uic.barcode.asn1.datatypes.Asn1SequenceOf;
 
 /**
  * The Class SequenceOfDataType.
-- 
cgit v1.2.3