From 119a99ff49d314cf33b94d1c922f5091a26489d6 Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Mon, 28 Jun 2021 16:54:11 +0200 Subject: - initial implementation of FCB version 3.0.0 - !!Tests still missing!! --- .../ticket/api/spec/IBoardingOrArrivalType.java | 39 ++++++ .../org/uic/barcode/ticket/api/spec/IPass.java | 26 +++- .../barcode/ticket/api/spec/ITrainValidity.java | 146 +++++++++++++++++++++ .../ticket/api/spec/IUicTicketObjectFactory.java | 2 + .../uic/barcode/ticket/api/spec/IViaStation.java | 30 +++++ 5 files changed, 238 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/uic/barcode/ticket/api/spec/IBoardingOrArrivalType.java create mode 100644 src/main/java/org/uic/barcode/ticket/api/spec/ITrainValidity.java (limited to 'src/main/java/org/uic/barcode/ticket/api/spec') diff --git a/src/main/java/org/uic/barcode/ticket/api/spec/IBoardingOrArrivalType.java b/src/main/java/org/uic/barcode/ticket/api/spec/IBoardingOrArrivalType.java new file mode 100644 index 0000000..7f9b1f2 --- /dev/null +++ b/src/main/java/org/uic/barcode/ticket/api/spec/IBoardingOrArrivalType.java @@ -0,0 +1,39 @@ +/* + * This file was generated by openASN.1 - an open source ASN.1 toolkit for java + * + * openASN.1 is Copyright (C) 2007 Clayton Hoss, Marc Weyland + * + * openASN.1 is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * openASN.1 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with openASN.1. If not, see . + * + */ +package org.uic.barcode.ticket.api.spec; + +import org.uic.barcode.asn1.datatypes.HasExtensionMarker; + +@HasExtensionMarker +public enum IBoardingOrArrivalType { + boarding("boarding"), + arrival("arrival"); + + public String text; + + IBoardingOrArrivalType(String text) { + this.text = text; + } + + public String toString(){ + return text; + } +} + diff --git a/src/main/java/org/uic/barcode/ticket/api/spec/IPass.java b/src/main/java/org/uic/barcode/ticket/api/spec/IPass.java index 5968b03..440bd9b 100644 --- a/src/main/java/org/uic/barcode/ticket/api/spec/IPass.java +++ b/src/main/java/org/uic/barcode/ticket/api/spec/IPass.java @@ -6,6 +6,7 @@ package org.uic.barcode.ticket.api.spec; import java.util.Collection; import java.util.Date; +// TODO: Auto-generated Javadoc /** * The Interface IPass. * @@ -339,8 +340,7 @@ public interface IPass extends IDocumentData { /** * Sets the price. * - * - * @param price + * @param price the new price */ public void setPrice(Long price); @@ -369,7 +369,7 @@ public interface IPass extends IDocumentData { * * E.g. an included local transport ticket at the beginning or end of the route. * - * @param includedAddOn the included add on + * @param vatDetail the vat detail */ public void addVatDetail(IVatDetail vatDetail) ; @@ -391,7 +391,7 @@ public interface IPass extends IDocumentData { /** * Sets the validFrom date time. * - * @param validFromDateTime the new validFrom date time + * @param validFromUTCoffset the new valid from UT coffset */ public void setValidFromUTCoffset(Long validFromUTCoffset) ; @@ -405,8 +405,24 @@ public interface IPass extends IDocumentData { /** * Sets the validUntil date time. * - * @param validUntilDateTime the new validUntil date time + * @param validUntilUTCoffset the new valid until UT coffset */ public void setValidUntilUTCoffset(Long validUntilUTCoffset) ; + + /** + * Sets the train validity. + * + * @param trainValidity the new train validity + */ + public void setTrainValidity(ITrainValidity trainValidity); + + /** + * Gets the train validity. + * + * @return the train validity + */ + public ITrainValidity getTrainValidity(); + + } diff --git a/src/main/java/org/uic/barcode/ticket/api/spec/ITrainValidity.java b/src/main/java/org/uic/barcode/ticket/api/spec/ITrainValidity.java new file mode 100644 index 0000000..3fdf8a1 --- /dev/null +++ b/src/main/java/org/uic/barcode/ticket/api/spec/ITrainValidity.java @@ -0,0 +1,146 @@ +package org.uic.barcode.ticket.api.spec; + +import java.util.Collection; +import java.util.Date; + +/** + * The Interface IValidityRange. + * + * IValidityRange describes a validity range by from / until date and time + */ +public interface ITrainValidity { + + + /** + * Gets the from date and time. + * + * @return the from date and time + */ + public Date getFromDate(); + + /** + * Gets the until date and time. + * + * @return the until date and time + */ + public Date getUntilDate(); + + + /** + * Sets the from date and time. + * + * @param date the new from date and time + */ + public void setFromDate(Date date); + + /** + * Sets the until date and time. + * + * @param date the new until date and time + */ + public void setUntilDate(Date date); + + + /** + * Gets the validFrom date time offset to UTC in units of 15 minutes. + * + * @return the validFrom date time UTC offset + */ + public Long getValidFromUTCoffset(); + + /** + * Sets the validFrom date time. + * + * @param validFromDateTime the new validFrom date time + */ + public void setValidFromUTCoffset(Long validFromUTCoffset) ; + + /** + * Gets the validUntil date time offset to UTC in units of 15 minutes. + * + * @return the validUntil date time UTC offset + */ + public Long getValidUntilUTCoffset(); + + /** + * Sets the validUntil date time. + * + * @param validUntilDateTime the new validUntil date time + */ + public void setValidUntilUTCoffset(Long validUntilUTCoffset) ; + + + /** + * Gets the included carriers. + * + * @return the included carriers + */ + public Collection getIncludedCarriers(); + + /** + * Adds the included carrier. + * + * @param carrier the carrier + */ + public void addIncludedCarrier(String carrier); + + /** + * Gets the excluded carriers. + * + * @return the excluded carriers + */ + public Collection getExcludedCarriers(); + + /** + * Adds the excluded carrier. + * + * @param carrier the carrier + */ + public void addExcludedCarrier(String carrier); + + /** + * Gets the included service brands. + * + * @return the included service brands + */ + public Collection getIncludedServiceBrands(); + + /** + * Adds the included service brand. + * + * @param includedServiceBrand the included service brand + */ + public void addIncludedServiceBrand(Integer includedServiceBrand); + + /** + * Gets the excluded service brands. + * + * @return the excluded service brands + */ + public Collection getExcludedServiceBrands(); + + /** + * Adds the excluded service brand. + * + * @param excludedServiceBrand the excluded service brand + */ + public void addExcludedServiceBrand(Integer excludedServiceBrand); + + + /** + * Gets the class code. + * + * @return the class code + */ + public IBoardingOrArrivalType getBoardingOrArrival(); + + /** + * Sets the travel class code. + * + * @param classCode the new travel class code + */ + public void setBoardingOrArrival(IBoardingOrArrivalType boardingOrArrival); + + + +} diff --git a/src/main/java/org/uic/barcode/ticket/api/spec/IUicTicketObjectFactory.java b/src/main/java/org/uic/barcode/ticket/api/spec/IUicTicketObjectFactory.java index 075ee81..d785a4b 100644 --- a/src/main/java/org/uic/barcode/ticket/api/spec/IUicTicketObjectFactory.java +++ b/src/main/java/org/uic/barcode/ticket/api/spec/IUicTicketObjectFactory.java @@ -46,6 +46,8 @@ public interface IUicTicketObjectFactory { public abstract IDocumentExtension createDocumentExtension(); public abstract IServiceBrand createServiceBrand(); public abstract IVatDetail createVatDetail(); + public abstract ITrainValidity createTrainValidity(); + } diff --git a/src/main/java/org/uic/barcode/ticket/api/spec/IViaStation.java b/src/main/java/org/uic/barcode/ticket/api/spec/IViaStation.java index 34900a8..3590aa0 100644 --- a/src/main/java/org/uic/barcode/ticket/api/spec/IViaStation.java +++ b/src/main/java/org/uic/barcode/ticket/api/spec/IViaStation.java @@ -166,5 +166,35 @@ public interface IViaStation extends IRegionalValidity { */ public void setSeriesId(int seriesId); + + /** + * Gets the included service brands. + * + * @return the included service brands + */ + public Collection getIncludedServiceBrands(); + + /** + * Adds the included service brand. + * + * @param includedServiceBrand the included service brand + */ + public void addIncludedServiceBrand(Integer includedServiceBrand); + + /** + * Gets the excluded service brands. + * + * @return the excluded service brands + */ + public Collection getExcludedServiceBrands(); + + /** + * Adds the excluded service brand. + * + * @param excludedServiceBrand the excluded service brand + */ + public void addExcludedServiceBrand(Integer excludedServiceBrand); + + } -- cgit v1.2.3