summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCGantert345 <57003061+CGantert345@users.noreply.github.com>2020-11-16 14:13:16 +0100
committerCGantert345 <57003061+CGantert345@users.noreply.github.com>2020-11-16 14:13:16 +0100
commit91118d7e2a848a903895b55adfdec0d12618b504 (patch)
tree4945f6a3816806ce94429660dbece882513e346d
parentfix for the Android Java SDK bug in getDeclaredFields nor providing the (diff)
downloadUIC-barcode-91118d7e2a848a903895b55adfdec0d12618b504.tar
UIC-barcode-91118d7e2a848a903895b55adfdec0d12618b504.tar.gz
UIC-barcode-91118d7e2a848a903895b55adfdec0d12618b504.tar.bz2
UIC-barcode-91118d7e2a848a903895b55adfdec0d12618b504.tar.lz
UIC-barcode-91118d7e2a848a903895b55adfdec0d12618b504.tar.xz
UIC-barcode-91118d7e2a848a903895b55adfdec0d12618b504.tar.zst
UIC-barcode-91118d7e2a848a903895b55adfdec0d12618b504.zip
Diffstat
-rw-r--r--src/org/uic/barcode/Decoder.java2
-rw-r--r--src/org/uic/barcode/Encoder.java2
-rw-r--r--src/org/uic/barcode/staticFrame/UTLAYDataRecord.java6
-rw-r--r--src/org/uic/barcode/staticFrame/ticketLayoutBarcode/FormatType.java (renamed from src/org/uic/barcode/staticHeader/ticketLayoutBarcode/FormatType.java)2
-rw-r--r--src/org/uic/barcode/staticFrame/ticketLayoutBarcode/LayoutElement.java (renamed from src/org/uic/barcode/staticHeader/ticketLayoutBarcode/LayoutElement.java)2
-rw-r--r--src/org/uic/barcode/staticFrame/ticketLayoutBarcode/TicketLayout.java (renamed from src/org/uic/barcode/staticHeader/ticketLayoutBarcode/TicketLayout.java)2
-rw-r--r--src/org/uic/barcode/test/StaticFrameBarcodeTest.java2
-rw-r--r--src/org/uic/barcode/test/TicketLayoutTest.java2
-rw-r--r--src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java4
-rw-r--r--src/org/uic/ticket/api/asn/omv1/OpenTicketData.java8
-rw-r--r--src/org/uic/ticket/api/asn/omv2/OpenTicketData.java6
11 files changed, 19 insertions, 19 deletions
diff --git a/src/org/uic/barcode/Decoder.java b/src/org/uic/barcode/Decoder.java
index 2ce417c..b7fec33 100644
--- a/src/org/uic/barcode/Decoder.java
+++ b/src/org/uic/barcode/Decoder.java
@@ -16,7 +16,7 @@ import org.uic.barcode.dynamicFrame.SequenceOfDataType;
import org.uic.barcode.staticFrame.StaticFrame;
import org.uic.barcode.staticFrame.UFLEXDataRecord;
import org.uic.barcode.staticFrame.UTLAYDataRecord;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.TicketLayout;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout;
import org.uic.ticket.EncodingFormatException;
import org.uic.ticket.UicRailTicketCoder;
import org.uic.ticket.api.spec.IUicRailTicket;
diff --git a/src/org/uic/barcode/Encoder.java b/src/org/uic/barcode/Encoder.java
index 301b7c5..cd6004e 100644
--- a/src/org/uic/barcode/Encoder.java
+++ b/src/org/uic/barcode/Encoder.java
@@ -14,7 +14,7 @@ import org.uic.barcode.staticFrame.StaticFrame;
import org.uic.barcode.staticFrame.UFLEXDataRecord;
import org.uic.barcode.staticFrame.UHEADDataRecord;
import org.uic.barcode.staticFrame.UTLAYDataRecord;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.TicketLayout;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout;
import org.uic.ticket.EncodingFormatException;
import org.uic.ticket.UicRailTicketCoder;
import org.uic.ticket.api.spec.IUicRailTicket;
diff --git a/src/org/uic/barcode/staticFrame/UTLAYDataRecord.java b/src/org/uic/barcode/staticFrame/UTLAYDataRecord.java
index 2e9a2dc..68211ad 100644
--- a/src/org/uic/barcode/staticFrame/UTLAYDataRecord.java
+++ b/src/org/uic/barcode/staticFrame/UTLAYDataRecord.java
@@ -9,9 +9,9 @@ import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.FormatType;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.LayoutElement;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.TicketLayout;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.FormatType;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.LayoutElement;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout;
import org.uic.ticket.EncodingFormatException;
/**
diff --git a/src/org/uic/barcode/staticHeader/ticketLayoutBarcode/FormatType.java b/src/org/uic/barcode/staticFrame/ticketLayoutBarcode/FormatType.java
index c5cc39e..e6b9414 100644
--- a/src/org/uic/barcode/staticHeader/ticketLayoutBarcode/FormatType.java
+++ b/src/org/uic/barcode/staticFrame/ticketLayoutBarcode/FormatType.java
@@ -1,4 +1,4 @@
-package org.uic.barcode.staticHeader.ticketLayoutBarcode;
+package org.uic.barcode.staticFrame.ticketLayoutBarcode;
public enum FormatType {
diff --git a/src/org/uic/barcode/staticHeader/ticketLayoutBarcode/LayoutElement.java b/src/org/uic/barcode/staticFrame/ticketLayoutBarcode/LayoutElement.java
index 04593f2..861629d 100644
--- a/src/org/uic/barcode/staticHeader/ticketLayoutBarcode/LayoutElement.java
+++ b/src/org/uic/barcode/staticFrame/ticketLayoutBarcode/LayoutElement.java
@@ -1,4 +1,4 @@
-package org.uic.barcode.staticHeader.ticketLayoutBarcode;
+package org.uic.barcode.staticFrame.ticketLayoutBarcode;
public class LayoutElement {
diff --git a/src/org/uic/barcode/staticHeader/ticketLayoutBarcode/TicketLayout.java b/src/org/uic/barcode/staticFrame/ticketLayoutBarcode/TicketLayout.java
index e788f9a..8ca8083 100644
--- a/src/org/uic/barcode/staticHeader/ticketLayoutBarcode/TicketLayout.java
+++ b/src/org/uic/barcode/staticFrame/ticketLayoutBarcode/TicketLayout.java
@@ -1,4 +1,4 @@
-package org.uic.barcode.staticHeader.ticketLayoutBarcode;
+package org.uic.barcode.staticFrame.ticketLayoutBarcode;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/org/uic/barcode/test/StaticFrameBarcodeTest.java b/src/org/uic/barcode/test/StaticFrameBarcodeTest.java
index a0855de..4c176ca 100644
--- a/src/org/uic/barcode/test/StaticFrameBarcodeTest.java
+++ b/src/org/uic/barcode/test/StaticFrameBarcodeTest.java
@@ -18,7 +18,7 @@ import org.junit.Test;
import org.uic.barcode.Decoder;
import org.uic.barcode.Encoder;
import org.uic.barcode.dynamicFrame.Constants;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.TicketLayout;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout;
import org.uic.barcode.test.utils.SimpleTestTicketLayout;
import org.uic.barcode.test.utils.SimpleUICTestTicket;
import org.uic.ticket.EncodingFormatException;
diff --git a/src/org/uic/barcode/test/TicketLayoutTest.java b/src/org/uic/barcode/test/TicketLayoutTest.java
index 0210896..3cf143e 100644
--- a/src/org/uic/barcode/test/TicketLayoutTest.java
+++ b/src/org/uic/barcode/test/TicketLayoutTest.java
@@ -6,7 +6,7 @@ import java.io.IOException;
import org.junit.Test;
import org.uic.barcode.staticFrame.UTLAYDataRecord;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.TicketLayout;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout;
import org.uic.barcode.test.utils.SimpleTestTicketLayout;
import org.uic.barcode.test.utils.TestUtils;
import org.uic.ticket.EncodingFormatException;
diff --git a/src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java b/src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java
index 24cbf50..ca888e7 100644
--- a/src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java
+++ b/src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java
@@ -1,7 +1,7 @@
package org.uic.barcode.test.utils;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.LayoutElement;
-import org.uic.barcode.staticHeader.ticketLayoutBarcode.TicketLayout;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.LayoutElement;
+import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout;
public class SimpleTestTicketLayout {
diff --git a/src/org/uic/ticket/api/asn/omv1/OpenTicketData.java b/src/org/uic/ticket/api/asn/omv1/OpenTicketData.java
index 67bf1ac..8c759db 100644
--- a/src/org/uic/ticket/api/asn/omv1/OpenTicketData.java
+++ b/src/org/uic/ticket/api/asn/omv1/OpenTicketData.java
@@ -40,13 +40,13 @@ import net.gcdc.asn1.datatypesimpl.SequenceOfStringIA5;
public class OpenTicketData extends Object {
public OpenTicketData() {
}
-
+
@FieldOrder(order = 0)
- @RestrictedString(CharacterRestriction.IA5String)
- @Asn1Optional public String referenceIA5;
+ @Asn1Optional public Asn1BigInteger referenceNum;
@FieldOrder(order = 1)
- @Asn1Optional public Asn1BigInteger referenceNum;
+ @RestrictedString(CharacterRestriction.IA5String)
+ @Asn1Optional public String referenceIA5;
@FieldOrder(order = 2)
@IntRange(minValue=1,maxValue=32000)
diff --git a/src/org/uic/ticket/api/asn/omv2/OpenTicketData.java b/src/org/uic/ticket/api/asn/omv2/OpenTicketData.java
index a2e126b..ac817b4 100644
--- a/src/org/uic/ticket/api/asn/omv2/OpenTicketData.java
+++ b/src/org/uic/ticket/api/asn/omv2/OpenTicketData.java
@@ -42,11 +42,11 @@ public class OpenTicketData extends Object {
}
@FieldOrder(order = 0)
- @RestrictedString(CharacterRestriction.IA5String)
- @Asn1Optional public String referenceIA5;
+ @Asn1Optional public Asn1BigInteger referenceNum;
@FieldOrder(order = 1)
- @Asn1Optional public Asn1BigInteger referenceNum;
+ @RestrictedString(CharacterRestriction.IA5String)
+ @Asn1Optional public String referenceIA5;
@FieldOrder(order = 2)
@IntRange(minValue=1,maxValue=32000)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 00:21:28 +0200