From aaeb77f8f58ebc01fd241139439a8d290765e5fc Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:56:59 +0200 Subject: Draft of the new DOSIPAS included --- src/org/uic/ticket/api/spec/IBerth.java | 13 +++-- .../ticket/api/spec/ICarCarriageReservation.java | 20 ++++---- .../uic/ticket/api/spec/ICompartmentDetails.java | 6 +-- src/org/uic/ticket/api/spec/ICounterMark.java | 11 ++--- src/org/uic/ticket/api/spec/ICustomerCard.java | 7 ++- .../uic/ticket/api/spec/IDelayConfirmation.java | 7 +-- src/org/uic/ticket/api/spec/IFipTicket.java | 6 +-- src/org/uic/ticket/api/spec/IGeoCoordinate.java | 25 +++++----- .../uic/ticket/api/spec/IIncludedOpenTicket.java | 51 +++++++++++++++++--- src/org/uic/ticket/api/spec/IIssuingDetail.java | 2 +- src/org/uic/ticket/api/spec/ILine.java | 7 ++- src/org/uic/ticket/api/spec/IOpenTicket.java | 55 +++++++++++++++++++--- src/org/uic/ticket/api/spec/IParkingGround.java | 5 +- src/org/uic/ticket/api/spec/IPass.java | 7 +-- src/org/uic/ticket/api/spec/IReservation.java | 21 ++++----- src/org/uic/ticket/api/spec/IRouteSection.java | 5 +- src/org/uic/ticket/api/spec/IStationPassage.java | 6 +-- src/org/uic/ticket/api/spec/ITariff.java | 7 +-- src/org/uic/ticket/api/spec/ITicketLink.java | 10 ++-- src/org/uic/ticket/api/spec/ITraveler.java | 11 ++--- src/org/uic/ticket/api/spec/IViaStation.java | 6 +-- src/org/uic/ticket/api/spec/IZone.java | 7 +-- 22 files changed, 166 insertions(+), 129 deletions(-) (limited to 'src/org/uic/ticket/api/spec') diff --git a/src/org/uic/ticket/api/spec/IBerth.java b/src/org/uic/ticket/api/spec/IBerth.java index 78a9780..a1051b7 100644 --- a/src/org/uic/ticket/api/spec/IBerth.java +++ b/src/org/uic/ticket/api/spec/IBerth.java @@ -3,9 +3,8 @@ */ package org.uic.ticket.api.spec; -import org.uic.ticket.api.EncodingFormatException; -import org.uic.ticket.api.asn.omv1.BerthTypeType; -import org.uic.ticket.api.asn.omv1.CompartmentGenderType; +import org.uic.ticket.EncodingFormatException; + /** @@ -19,7 +18,7 @@ public interface IBerth { * * @return the type */ - public BerthTypeType getType() ; + public IBerthTypeType getType() ; /** * Sets the type of the Berth. @@ -27,7 +26,7 @@ public interface IBerth { * * @param type the new berth type */ - public void setType(BerthTypeType type); + public void setType(IBerthTypeType type); /** * Gets the number of berths. @@ -49,13 +48,13 @@ public interface IBerth { * * @return the gender */ - public CompartmentGenderType getGender(); + public ICompartmentGenderType getGender(); /** * Sets the gender information of the compartment reserved (family, male, female, mixed,..). * * @param gender the new gender */ - public void setGender(CompartmentGenderType gender) ; + public void setGender(ICompartmentGenderType gender) ; } diff --git a/src/org/uic/ticket/api/spec/ICarCarriageReservation.java b/src/org/uic/ticket/api/spec/ICarCarriageReservation.java index 6465e29..c77b3aa 100644 --- a/src/org/uic/ticket/api/spec/ICarCarriageReservation.java +++ b/src/org/uic/ticket/api/spec/ICarCarriageReservation.java @@ -6,10 +6,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.CodeTableType; -import org.uic.ticket.api.asn.omv1.LoadingDeckType; -import org.uic.ticket.api.asn.omv1.PriceTypeType; -import org.uic.ticket.api.asn.omv1.RoofRackType; /** * The Interface ICarCarriageReservation. @@ -111,7 +107,7 @@ public interface ICarCarriageReservation extends IDocumentData { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. @@ -121,7 +117,7 @@ public interface ICarCarriageReservation extends IDocumentData { * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the from station code @@ -246,7 +242,7 @@ public interface ICarCarriageReservation extends IDocumentData { * * @return the price type */ - public PriceTypeType getPriceType(); + public IPriceTypeType getPriceType(); /** * Sets the price type. @@ -255,7 +251,7 @@ public interface ICarCarriageReservation extends IDocumentData { * * @param priceType the new price type */ - public void setPriceType(PriceTypeType priceType) ; + public void setPriceType(IPriceTypeType priceType) ; /** * Gets the info text for the control staff @@ -412,7 +408,7 @@ public interface ICarCarriageReservation extends IDocumentData { * * @return the roof rack type */ - public RoofRackType getRoofRackType(); + public IRoofRackType getRoofRackType(); /** * Sets the roof rack type. @@ -421,7 +417,7 @@ public interface ICarCarriageReservation extends IDocumentData { * * @param roofRackType the new roof rack type */ - public void setRoofRackType(RoofRackType roofRackType); + public void setRoofRackType(IRoofRackType roofRackType); /** * Gets the roof rack height in cm @@ -526,14 +522,14 @@ public interface ICarCarriageReservation extends IDocumentData { * * @return the loading deck */ - public LoadingDeckType getLoadingDeck(); + public ILoadingDeckType getLoadingDeck(); /** * Sets the loading deck. * * @param loadingDeck the new loading deck */ - public void setLoadingDeck(LoadingDeckType loadingDeck); + public void setLoadingDeck(ILoadingDeckType loadingDeck); /** diff --git a/src/org/uic/ticket/api/spec/ICompartmentDetails.java b/src/org/uic/ticket/api/spec/ICompartmentDetails.java index 4e05801..b46bdcb 100644 --- a/src/org/uic/ticket/api/spec/ICompartmentDetails.java +++ b/src/org/uic/ticket/api/spec/ICompartmentDetails.java @@ -3,8 +3,6 @@ */ package org.uic.ticket.api.spec; -import org.uic.ticket.api.asn.omv1.CompartmentPositionType; - /** * The Interface ICompartmentDetails. * @@ -116,13 +114,13 @@ public interface ICompartmentDetails { * * @return the position */ - public CompartmentPositionType getPosition(); + public ICompartmentPositionType getPosition(); /** * Sets the position of the compartment in trains with different decks * * @param position the new position */ - public void setPosition(CompartmentPositionType position); + public void setPosition(ICompartmentPositionType position); } diff --git a/src/org/uic/ticket/api/spec/ICounterMark.java b/src/org/uic/ticket/api/spec/ICounterMark.java index c6b5744..9ccf920 100644 --- a/src/org/uic/ticket/api/spec/ICounterMark.java +++ b/src/org/uic/ticket/api/spec/ICounterMark.java @@ -6,9 +6,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.CodeTableType; -import org.uic.ticket.api.asn.omv1.TravelClassType; - /** * The Interface ICounterMark. * @@ -98,7 +95,7 @@ public interface ICounterMark extends IDocumentData { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. @@ -109,7 +106,7 @@ public interface ICounterMark extends IDocumentData { * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the from station. @@ -242,14 +239,14 @@ public interface ICounterMark extends IDocumentData { * * @return the class code */ - public TravelClassType getClassCode(); + public ITravelClassType getClassCode(); /** * Sets the class code. * * @param classCode the new class code */ - public void setClassCode(TravelClassType classCode); + public void setClassCode(ITravelClassType classCode); /** * Gets the included carriers. diff --git a/src/org/uic/ticket/api/spec/ICustomerCard.java b/src/org/uic/ticket/api/spec/ICustomerCard.java index a5be24a..5aaad4b 100644 --- a/src/org/uic/ticket/api/spec/ICustomerCard.java +++ b/src/org/uic/ticket/api/spec/ICustomerCard.java @@ -6,9 +6,8 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.TravelClassType; -// TODO: Auto-generated Javadoc + /** * The Interface ICustomerCard. */ @@ -76,14 +75,14 @@ public interface ICustomerCard extends IDocumentData { * * @return the class code */ - public TravelClassType getClassCode(); + public ITravelClassType getClassCode(); /** * Sets the class code. * * @param classCode the new class code */ - public void setClassCode(TravelClassType classCode); + public void setClassCode(ITravelClassType classCode); /** * Gets the card type. diff --git a/src/org/uic/ticket/api/spec/IDelayConfirmation.java b/src/org/uic/ticket/api/spec/IDelayConfirmation.java index aa9b418..bbf46f9 100644 --- a/src/org/uic/ticket/api/spec/IDelayConfirmation.java +++ b/src/org/uic/ticket/api/spec/IDelayConfirmation.java @@ -6,10 +6,7 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.CodeTableType; - -// TODO: Auto-generated Javadoc /** * The Interface IDelayConfirmation implements * a confirmation of delay given to a traveler to prove to another carrier he want tu use to continue the journey @@ -55,7 +52,7 @@ public interface IDelayConfirmation extends IDocumentData { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. @@ -66,7 +63,7 @@ public interface IDelayConfirmation extends IDocumentData { * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the from station code where the delay was final (usually the station where the traveler left the train). diff --git a/src/org/uic/ticket/api/spec/IFipTicket.java b/src/org/uic/ticket/api/spec/IFipTicket.java index 73cbc0e..a63c1d1 100644 --- a/src/org/uic/ticket/api/spec/IFipTicket.java +++ b/src/org/uic/ticket/api/spec/IFipTicket.java @@ -6,9 +6,7 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.TravelClassType; -// TODO: Auto-generated Javadoc /** * The Interface IFipTicket. * @@ -66,14 +64,14 @@ public interface IFipTicket extends IDocumentData { * * @return the travel class code */ - public TravelClassType getClassCode(); + public ITravelClassType getClassCode(); /** * Sets the class code. * * @param classCode the new class code */ - public void setClassCode(TravelClassType classCode); + public void setClassCode(ITravelClassType classCode); /** * Gets the valid from date. diff --git a/src/org/uic/ticket/api/spec/IGeoCoordinate.java b/src/org/uic/ticket/api/spec/IGeoCoordinate.java index 9fa1ba5..1bcfb90 100644 --- a/src/org/uic/ticket/api/spec/IGeoCoordinate.java +++ b/src/org/uic/ticket/api/spec/IGeoCoordinate.java @@ -3,10 +3,7 @@ */ package org.uic.ticket.api.spec; -import org.uic.ticket.api.asn.omv1.GeoCoordinateSystemType; -import org.uic.ticket.api.asn.omv1.GeoUnitType; -import org.uic.ticket.api.asn.omv1.HemisphereLatitudeType; -import org.uic.ticket.api.asn.omv1.HemisphereLongitudeType; + /** * The Interface IGeoCoordinate. @@ -23,7 +20,7 @@ public interface IGeoCoordinate { * * @return the unit */ - public GeoUnitType getUnit(); + public IGeoUnitType getUnit(); /** * Sets the unit. @@ -32,21 +29,21 @@ public interface IGeoCoordinate { * * @param unit the new unit */ - public void setUnit(GeoUnitType unit); + public void setUnit(IGeoUnitType unit); /** * Gets the accuracy. * * @return the accuracy */ - public GeoUnitType getAccuracy(); + public IGeoUnitType getAccuracy(); /** * Sets the accuracy. * * @param accuracy the new accuracy */ - public void setAccuracy(GeoUnitType accuracy); + public void setAccuracy(IGeoUnitType accuracy); /** * Gets the geo coordinate system. @@ -55,7 +52,7 @@ public interface IGeoCoordinate { * * @return the geo coordinate */ - public GeoCoordinateSystemType getSystem(); + public IGeoCoordinateSystemType getSystem(); /** * Sets the geo coordinate @@ -64,14 +61,14 @@ public interface IGeoCoordinate { * * @param system the new geo coordinate */ - public void setSystem(GeoCoordinateSystemType system); + public void setSystem(IGeoCoordinateSystemType system); /** * Gets the longitude hemisphere. * * @return the longitude hemisphere */ - public HemisphereLongitudeType getHemisphereLongitude() ; + public IHemisphereLongitudeType getHemisphereLongitude() ; /** * Sets the longitude hemisphere. @@ -80,7 +77,7 @@ public interface IGeoCoordinate { * * @param hemispherLongiture the new longitude hemisphere. */ - public void setHemisphereLongitude(HemisphereLongitudeType hemispherLongiture); + public void setHemisphereLongitude(IHemisphereLongitudeType hemispherLongiture); /** * Gets the latitude hemisphere. @@ -89,7 +86,7 @@ public interface IGeoCoordinate { * * @return the latitude hemisphere. */ - public HemisphereLatitudeType getHemisphereLatitude(); + public IHemisphereLatitudeType getHemisphereLatitude(); /** * Sets the latitude hemisphere. @@ -98,7 +95,7 @@ public interface IGeoCoordinate { * * @param hemisphereLatitude the new latitude hemisphere. */ - public void setHemisphereLatitude(HemisphereLatitudeType hemisphereLatitude); + public void setHemisphereLatitude(IHemisphereLatitudeType hemisphereLatitude); /** * Gets the longitude. diff --git a/src/org/uic/ticket/api/spec/IIncludedOpenTicket.java b/src/org/uic/ticket/api/spec/IIncludedOpenTicket.java index ab9ee81..359a7e7 100644 --- a/src/org/uic/ticket/api/spec/IIncludedOpenTicket.java +++ b/src/org/uic/ticket/api/spec/IIncludedOpenTicket.java @@ -6,8 +6,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.CodeTableType; -import org.uic.ticket.api.asn.omv1.TravelClassType; /** * The Interface IIncludedOpenTicket. @@ -118,7 +116,7 @@ public interface IIncludedOpenTicket { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. @@ -129,7 +127,7 @@ public interface IIncludedOpenTicket { * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the from station code. @@ -248,14 +246,14 @@ public interface IIncludedOpenTicket { * * @return the travel class code */ - public TravelClassType getClassCode(); + public ITravelClassType getClassCode(); /** * Sets the travel class code. * * @param classCode the new travel class code */ - public void setClassCode(TravelClassType classCode); + public void setClassCode(ITravelClassType classCode); /** * Gets the carriers included in the transport contract. @@ -311,6 +309,47 @@ public interface IIncludedOpenTicket { */ public void addExcludedServiceBrand(Integer excludedServiceBrand); + + /** + * Gets the list of excluded Transport Types. + * + * The list should be omitted in case a complete + * list of included transport types is provided. + * + * @return the list of excluded transport types + */ + public Collection getExcludedTransportTypes(); + + /** + * Adds an excluded service brand. + * + * The list should be omitted in case a complete + * list of included TransportTypes is provided. + * + * @param excluded TransportType the excluded TransportTypes + */ + public void addExcludedTransportType(Integer excludedTransportType); + + + /** + * Gets the list of excluded Transport Types. + * + * The list should be omitted in case a complete + * list of included transport types is provided. + * + * @return the list of included transport types + */ + public Collection getIncludedTransportTypes(); + + /** + * Adds an excluded service brand. + * + * The list should be omitted in case a complete + * list of included TransportTypes is provided. + * + * @param excluded TransportType the excluded TransportTypes + */ + public void addInludedTransportType(Integer includedTransportType); /** * Gets the tariffs. diff --git a/src/org/uic/ticket/api/spec/IIssuingDetail.java b/src/org/uic/ticket/api/spec/IIssuingDetail.java index afe309d..1baaaae 100644 --- a/src/org/uic/ticket/api/spec/IIssuingDetail.java +++ b/src/org/uic/ticket/api/spec/IIssuingDetail.java @@ -5,7 +5,7 @@ package org.uic.ticket.api.spec; import java.util.Date; -// TODO: Auto-generated Javadoc + /** * The Interface IIssuerDetails. */ diff --git a/src/org/uic/ticket/api/spec/ILine.java b/src/org/uic/ticket/api/spec/ILine.java index f1066f2..266d781 100644 --- a/src/org/uic/ticket/api/spec/ILine.java +++ b/src/org/uic/ticket/api/spec/ILine.java @@ -5,9 +5,8 @@ package org.uic.ticket.api.spec; import java.util.HashSet; -import org.uic.ticket.api.asn.omv1.CodeTableType; -// TODO: Auto-generated Javadoc + /** * The Interface ILine. */ @@ -46,14 +45,14 @@ public interface ILine extends IRegionalValidity{ * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable( IStationCodeTable stationCodeTable); /** * Gets the entry station. diff --git a/src/org/uic/ticket/api/spec/IOpenTicket.java b/src/org/uic/ticket/api/spec/IOpenTicket.java index f5bb7d2..ea16dce 100644 --- a/src/org/uic/ticket/api/spec/IOpenTicket.java +++ b/src/org/uic/ticket/api/spec/IOpenTicket.java @@ -6,8 +6,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.CodeTableType; -import org.uic.ticket.api.asn.omv1.TravelClassType; // TODO: Auto-generated Javadoc /** @@ -123,7 +121,7 @@ public interface IOpenTicket extends IDocumentData { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. @@ -134,7 +132,7 @@ public interface IOpenTicket extends IDocumentData { * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable( IStationCodeTable stationCodeTable); /** * Gets the from station code. @@ -287,14 +285,14 @@ public interface IOpenTicket extends IDocumentData { * * @return the travel class code */ - public TravelClassType getClassCode(); + public ITravelClassType getClassCode(); /** * Sets the travel class code. * * @param classCode the new travel class code */ - public void setClassCode(TravelClassType classCode); + public void setClassCode(ITravelClassType classCode); /** * Gets the carriers included in the transport contract. @@ -350,6 +348,51 @@ public interface IOpenTicket extends IDocumentData { */ public void addExcludedServiceBrand(Integer excludedServiceBrand); + + + + /** + * Gets the list of excluded Transport Types. + * + * The list should be omitted in case a complete + * list of included transport types is provided. + * + * @return the list of excluded transport types + */ + public Collection getExcludedTransportTypes(); + + /** + * Adds an excluded service brand. + * + * The list should be omitted in case a complete + * list of included TransportTypes is provided. + * + * @param excluded TransportType the excluded TransportTypes + */ + public void addExcludedTransportType(Integer excludedTransportType); + + + /** + * Gets the list of excluded Transport Types. + * + * The list should be omitted in case a complete + * list of included transport types is provided. + * + * @return the list of included transport types + */ + public Collection getIncludedTransportTypes(); + + /** + * Adds an excluded service brand. + * + * The list should be omitted in case a complete + * list of included TransportTypes is provided. + * + * @param excluded TransportType the excluded TransportTypes + */ + public void addInludedTransportType(Integer includedTransportType); + + /** * Gets the tariffs. * diff --git a/src/org/uic/ticket/api/spec/IParkingGround.java b/src/org/uic/ticket/api/spec/IParkingGround.java index 55cd55b..ae5c8cf 100644 --- a/src/org/uic/ticket/api/spec/IParkingGround.java +++ b/src/org/uic/ticket/api/spec/IParkingGround.java @@ -6,7 +6,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.CodeTableType; /** @@ -175,14 +174,14 @@ public interface IParkingGround extends IDocumentData { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable( IStationCodeTable stationCodeTable); /** * Gets the product owner. diff --git a/src/org/uic/ticket/api/spec/IPass.java b/src/org/uic/ticket/api/spec/IPass.java index 339b842..bcbcda7 100644 --- a/src/org/uic/ticket/api/spec/IPass.java +++ b/src/org/uic/ticket/api/spec/IPass.java @@ -6,9 +6,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.TravelClassType; - -// TODO: Auto-generated Javadoc /** * The Interface IPass. * @@ -100,14 +97,14 @@ public interface IPass extends IDocumentData { * * @return the class code */ - public TravelClassType getClassCode(); + public ITravelClassType getClassCode(); /** * Sets the travel class code. * * @param classCode the new travel class code */ - public void setClassCode(TravelClassType classCode); + public void setClassCode(ITravelClassType classCode); /** * Gets the valid from date and time. diff --git a/src/org/uic/ticket/api/spec/IReservation.java b/src/org/uic/ticket/api/spec/IReservation.java index 3ec90da..ae68051 100644 --- a/src/org/uic/ticket/api/spec/IReservation.java +++ b/src/org/uic/ticket/api/spec/IReservation.java @@ -6,11 +6,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.CodeTableType; -import org.uic.ticket.api.asn.omv1.PriceTypeType; -import org.uic.ticket.api.asn.omv1.ServiceType; -import org.uic.ticket.api.asn.omv1.TravelClassType; - /** * The Interface IReservation. @@ -136,7 +131,7 @@ public interface IReservation extends IDocumentData { * * @return the service */ - public ServiceType getService(); + public IServiceType getService(); /** * Sets the service. @@ -145,7 +140,7 @@ public interface IReservation extends IDocumentData { * * @param service the new service */ - public void setService(ServiceType service); + public void setService(IServiceType service); /** @@ -153,7 +148,7 @@ public interface IReservation extends IDocumentData { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Gets the station code table. @@ -163,7 +158,7 @@ public interface IReservation extends IDocumentData { * * @return the station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the from station code. @@ -240,14 +235,14 @@ public interface IReservation extends IDocumentData { * * @return the travel class code */ - public TravelClassType getClassCode(); + public ITravelClassType getClassCode(); /** * Sets the travel class code. * * @param classCode the new travel class code */ - public void setClassCode(TravelClassType classCode); + public void setClassCode(ITravelClassType classCode); /** * Gets the service level. @@ -371,14 +366,14 @@ public interface IReservation extends IDocumentData { * * @return the price type */ - public PriceTypeType getPriceType(); + public IPriceTypeType getPriceType(); /** * Sets the price type. * * @param priceType the new price type */ - public void setPriceType(PriceTypeType priceType) ; + public void setPriceType(IPriceTypeType priceType) ; /** * Gets the type of supplement. diff --git a/src/org/uic/ticket/api/spec/IRouteSection.java b/src/org/uic/ticket/api/spec/IRouteSection.java index ef93426..2768072 100644 --- a/src/org/uic/ticket/api/spec/IRouteSection.java +++ b/src/org/uic/ticket/api/spec/IRouteSection.java @@ -3,7 +3,6 @@ */ package org.uic.ticket.api.spec; -import org.uic.ticket.api.asn.omv1.CodeTableType; /** * The Interface IRouteSection. @@ -17,14 +16,14 @@ public interface IRouteSection { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the from station code. diff --git a/src/org/uic/ticket/api/spec/IStationPassage.java b/src/org/uic/ticket/api/spec/IStationPassage.java index c98b83d..21113a9 100644 --- a/src/org/uic/ticket/api/spec/IStationPassage.java +++ b/src/org/uic/ticket/api/spec/IStationPassage.java @@ -6,9 +6,7 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.CodeTableType; -// TODO: Auto-generated Javadoc /** * The Interface IStationPassage. * @@ -92,14 +90,14 @@ public interface IStationPassage extends IDocumentData { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the list of station codes of all stations where the passage is allowed. diff --git a/src/org/uic/ticket/api/spec/ITariff.java b/src/org/uic/ticket/api/spec/ITariff.java index 5bd4a15..fa69624 100644 --- a/src/org/uic/ticket/api/spec/ITariff.java +++ b/src/org/uic/ticket/api/spec/ITariff.java @@ -5,9 +5,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; -import org.uic.ticket.api.asn.omv1.PassengerType; - -// TODO: Auto-generated Javadoc /** * The Interface ITariff. * @@ -38,7 +35,7 @@ public interface ITariff { * * @return the passenger type */ - public PassengerType getPassengerType(); + public IPassengerType getPassengerType(); /** @@ -46,7 +43,7 @@ public interface ITariff { * * @param passengerType the new passenger type */ - public void setPassengerType(PassengerType passengerType); + public void setPassengerType(IPassengerType passengerType); /** * Gets the upper limit of the age of the passenger to qualify for that tariff. diff --git a/src/org/uic/ticket/api/spec/ITicketLink.java b/src/org/uic/ticket/api/spec/ITicketLink.java index 2c180c4..563f189 100644 --- a/src/org/uic/ticket/api/spec/ITicketLink.java +++ b/src/org/uic/ticket/api/spec/ITicketLink.java @@ -3,8 +3,6 @@ */ package org.uic.ticket.api.spec; -import org.uic.ticket.api.asn.omv1.LinkMode; -import org.uic.ticket.api.asn.omv1.TicketType; /** * The Interface ITicketLink. @@ -60,28 +58,28 @@ public interface ITicketLink { * * @return the ticket type */ - public TicketType getTicketType(); + public ITicketType getTicketType(); /** * Sets the ticket type. * * @param ticketType the new ticket type */ - public void setTicketType(TicketType ticketType); + public void setTicketType(ITicketType ticketType); /** * Gets the link mode. * * @return the link mode */ - public LinkMode getLinkMode(); + public ILinkMode getLinkMode(); /** * Sets the link mode. * * @param linkMode the new link mode */ - public void setLinkMode(LinkMode linkMode); + public void setLinkMode(ILinkMode linkMode); /** * Gets the issuer PNR. diff --git a/src/org/uic/ticket/api/spec/ITraveler.java b/src/org/uic/ticket/api/spec/ITraveler.java index b3d6480..498a7e3 100644 --- a/src/org/uic/ticket/api/spec/ITraveler.java +++ b/src/org/uic/ticket/api/spec/ITraveler.java @@ -6,10 +6,7 @@ package org.uic.ticket.api.spec; import java.util.Collection; import java.util.Date; -import org.uic.ticket.api.asn.omv1.GenderType; -import org.uic.ticket.api.asn.omv1.PassengerType; -// TODO: Auto-generated Javadoc /** * The Interface ITravelerData. * @@ -107,14 +104,14 @@ public interface ITraveler { * * @return the gender */ - public GenderType getGender(); + public IGenderType getGender(); /** * Sets the gender. * * @param gender the new gender */ - public void setGender(GenderType gender); + public void setGender(IGenderType gender); /** * Gets the customer id. @@ -163,14 +160,14 @@ public interface ITraveler { * * @return the passenger type */ - public PassengerType getPassengerType(); + public IPassengerType getPassengerType(); /** * Sets the passenger type. * * @param passengerType the new passenger type */ - public void setPassengerType(PassengerType passengerType); + public void setPassengerType(IPassengerType passengerType); /** * Checks if is passenger with reduced mobility. diff --git a/src/org/uic/ticket/api/spec/IViaStation.java b/src/org/uic/ticket/api/spec/IViaStation.java index 71ffbbc..aa10a01 100644 --- a/src/org/uic/ticket/api/spec/IViaStation.java +++ b/src/org/uic/ticket/api/spec/IViaStation.java @@ -5,9 +5,7 @@ package org.uic.ticket.api.spec; import java.util.Collection; -import org.uic.ticket.api.asn.omv1.CodeTableType; -// TODO: Auto-generated Javadoc /** * The Interface IViaStation. * @@ -42,7 +40,7 @@ public interface IViaStation extends IRegionalValidity { * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. @@ -56,7 +54,7 @@ public interface IViaStation extends IRegionalValidity { * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the station code. diff --git a/src/org/uic/ticket/api/spec/IZone.java b/src/org/uic/ticket/api/spec/IZone.java index 296ecbb..3da96c4 100644 --- a/src/org/uic/ticket/api/spec/IZone.java +++ b/src/org/uic/ticket/api/spec/IZone.java @@ -5,9 +5,6 @@ package org.uic.ticket.api.spec; import java.util.Collection; -import org.uic.ticket.api.asn.omv1.CodeTableType; - -// TODO: Auto-generated Javadoc /** * The Interface IZone. * @@ -36,14 +33,14 @@ public interface IZone extends IRegionalValidity{ * * @return the station code table */ - public CodeTableType getStationCodeTable(); + public IStationCodeTable getStationCodeTable(); /** * Sets the station code table. * * @param stationCodeTable the new station code table */ - public void setStationCodeTable(CodeTableType stationCodeTable); + public void setStationCodeTable(IStationCodeTable stationCodeTable); /** * Gets the entry station in case the journey in the zone has to start at a specific station in the zone -- cgit v1.2.3