From f27a600db14d745cb7f13f8dc839863078b7f1c7 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:37:32 +0200
Subject: - bug fix on travel date in train link in version 1.3

- bug fix on travel date in train link in version 1.3
- replaced out-dated java functions
- switched all tests to non-deprecated functions
---
 src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java     | 4 ----
 .../java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java   | 5 -----
 src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java   | 6 +++---
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/main/java/org/uic/barcode/dynamicFrame/v2')

diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
index cb5c37a..7237110 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrame.java
@@ -7,10 +7,6 @@ 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.dynamicContent.api.DynamicContentCoder;
-import org.uic.barcode.dynamicContent.api.IUicDynamicContent;
-import org.uic.barcode.dynamicContent.fdc1.UicDynamicContentDataFDC1;
-import org.uic.barcode.ticket.EncodingFormatException;
 
 
 /**
diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java
index 5d980dd..c6ff7c7 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java
@@ -2,7 +2,6 @@ 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;
@@ -10,10 +9,6 @@ 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 {
diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java
index b42e9dc..a7d4b01 100644
--- a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java
+++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java
@@ -323,11 +323,11 @@ public class Level1DataType {
 		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));
+		this.endOfValidityYear = Long.valueOf( cal.get(Calendar.YEAR));
+		this.endOfValidityDay = Long.valueOf (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 );
+			this.endOfValidityTime = Long.valueOf (time );
 		}
 		TimeZone.setDefault(local);
 		
-- 
cgit v1.2.3