21 files changed, 218 insertions, 170 deletions

diff --git a/src/org/uic/ticket/api/impl/SimpleBerth.java b/src/org/uic/ticket/api/impl/SimpleBerth.java
index 7bae1d3..f70a8b6 100644
--- a/src/org/uic/ticket/api/impl/SimpleBerth.java
+++ b/src/org/uic/ticket/api/impl/SimpleBerth.java
@@ -3,11 +3,10 @@
  */

 package org.uic.ticket.api.impl;

 

-import org.uic.ticket.api.asn.omv1.BerthTypeType;

-import org.uic.ticket.api.asn.omv1.CompartmentGenderType;

+import org.uic.ticket.api.spec.IBerthTypeType;

+import org.uic.ticket.api.spec.ICompartmentGenderType;

 import org.uic.ticket.api.spec.IBerth;

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleBerth.

  */

@@ -15,25 +14,25 @@ public class SimpleBerth implements IBerth {
 	

 	

 	/** The type. */

-	protected BerthTypeType type;

+	protected IBerthTypeType type;

 	

 	/** The number of berths. */

 	protected int numberOfBerths;

 	

 	/** The gender. */

-	protected CompartmentGenderType	gender = CompartmentGenderType.family;

+	protected ICompartmentGenderType	gender = ICompartmentGenderType.family;

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IBerth#getType()

 	 */

-	public BerthTypeType getType() {

+	public IBerthTypeType getType() {

 		return type;

 	}

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IBerth#setType(org.uic.ticket.api.asn.om.BerthTypeType)

 	 */

-	public void setType(BerthTypeType type) {

+	public void setType(IBerthTypeType type) {

 		this.type = type;

 	}

 	

@@ -54,14 +53,14 @@ public class SimpleBerth implements IBerth {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IBerth#getGender()

 	 */

-	public CompartmentGenderType getGender() {

+	public ICompartmentGenderType getGender() {

 		return gender;

 	}

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IBerth#setGender(org.uic.ticket.api.asn.om.CompartmentGenderType)

 	 */

-	public void setGender(CompartmentGenderType gender) {

+	public void setGender(ICompartmentGenderType gender) {

 		this.gender = gender;

 	}

 	

diff --git a/src/org/uic/ticket/api/impl/SimpleCarCarriageReservation.java b/src/org/uic/ticket/api/impl/SimpleCarCarriageReservation.java
index 9fff600..a0f84cd 100644
--- a/src/org/uic/ticket/api/impl/SimpleCarCarriageReservation.java
+++ b/src/org/uic/ticket/api/impl/SimpleCarCarriageReservation.java
@@ -7,18 +7,18 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-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;

+

 import org.uic.ticket.api.spec.ICarCarriageReservation;

 import org.uic.ticket.api.spec.ICompartmentDetails;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.IServiceBrand;

 import org.uic.ticket.api.spec.ITariff;

 import org.uic.ticket.api.spec.IVatDetail;

+import org.uic.ticket.api.spec.ILoadingDeckType;

+import org.uic.ticket.api.spec.IPriceTypeType;

+import org.uic.ticket.api.spec.IRoofRackType;

+import org.uic.ticket.api.spec.IStationCodeTable;

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleCarCarriageReservation.

  */

@@ -42,7 +42,7 @@ public class SimpleCarCarriageReservation extends SimpleDocumentData implements
 

 	    

     /** The station code table. */

-    protected CodeTableType stationCodeTable = CodeTableType.stationUICReservation;

+    protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUICReservation;

     

     /** The from station. */

     protected String fromStation;

@@ -91,7 +91,7 @@ public class SimpleCarCarriageReservation extends SimpleDocumentData implements
 	protected boolean textileRoof	= false;

 	

 	/** The roof rack type. */

-	protected RoofRackType roofRackType	= RoofRackType.norack;

+	protected IRoofRackType roofRackType	= IRoofRackType.norack;

 										 		  

 	/** The roof rack height. */

 	protected int roofRackHeight;

@@ -116,10 +116,10 @@ public class SimpleCarCarriageReservation extends SimpleDocumentData implements
 	protected int loadingListEntry;

 	

 	/** The loading deck. */

-	protected LoadingDeckType loadingDeck = LoadingDeckType.upper; 	

+	protected ILoadingDeckType loadingDeck = ILoadingDeckType.upper; 	

 

     /** The price type. */

-    protected PriceTypeType priceType = PriceTypeType.travelPrice;

+    protected IPriceTypeType priceType = IPriceTypeType.travelPrice;

     

     /** The VAT details. */

     protected Collection<IVatDetail>vatDetails = new LinkedHashSet<IVatDetail>();

@@ -198,14 +198,14 @@ public class SimpleCarCarriageReservation extends SimpleDocumentData implements
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICarCarriageReservation#getStationCodeTable()

 	 */

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICarCarriageReservation#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 	 */

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}

 

@@ -312,14 +312,14 @@ public class SimpleCarCarriageReservation extends SimpleDocumentData implements
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICarCarriageReservation#getPriceType()

 	 */

-	public PriceTypeType getPriceType() {

+	public IPriceTypeType getPriceType() {

 		return priceType;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICarCarriageReservation#setPriceType(org.uic.ticket.api.asn.om.PriceTypeType)

 	 */

-	public void setPriceType(PriceTypeType priceType) {

+	public void setPriceType(IPriceTypeType priceType) {

 		this.priceType = priceType;

 	}

 

@@ -467,14 +467,14 @@ public class SimpleCarCarriageReservation extends SimpleDocumentData implements
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICarCarriageReservation#getRoofRackType()

 	 */

-	public RoofRackType getRoofRackType() {

+	public IRoofRackType getRoofRackType() {

 		return roofRackType;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICarCarriageReservation#setRoofRackType(org.uic.ticket.api.asn.om.RoofRackType)

 	 */

-	public void setRoofRackType(RoofRackType roofRackType) {

+	public void setRoofRackType(IRoofRackType roofRackType) {

 		this.roofRackType = roofRackType;

 	}

 

@@ -579,14 +579,14 @@ public class SimpleCarCarriageReservation extends SimpleDocumentData implements
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICarCarriageReservation#getLoadingDeck()

 	 */

-	public LoadingDeckType getLoadingDeck() {

+	public ILoadingDeckType getLoadingDeck() {

 		return loadingDeck;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICarCarriageReservation#setLoadingDeck(org.uic.ticket.api.asn.om.LoadingDeckType)

 	 */

-	public void setLoadingDeck(LoadingDeckType loadingDeck) {

+	public void setLoadingDeck(ILoadingDeckType loadingDeck) {

 		this.loadingDeck = loadingDeck;

 	}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleCompartmentDetails.java b/src/org/uic/ticket/api/impl/SimpleCompartmentDetails.java
index 35a2add..bf59055 100644
--- a/src/org/uic/ticket/api/impl/SimpleCompartmentDetails.java
+++ b/src/org/uic/ticket/api/impl/SimpleCompartmentDetails.java
@@ -3,10 +3,9 @@
  */

 package org.uic.ticket.api.impl;

 

-import org.uic.ticket.api.asn.omv1.CompartmentPositionType;

 import org.uic.ticket.api.spec.ICompartmentDetails;

+import org.uic.ticket.api.spec.ICompartmentPositionType;

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleCompartmentDetails.

  */

@@ -32,7 +31,7 @@ public class SimpleCompartmentDetails implements ICompartmentDetails {
 	protected String specialAllocationDescr;

 	

 	/** The position. */

-	protected CompartmentPositionType position        = CompartmentPositionType.unspecified;

+	protected ICompartmentPositionType position        = ICompartmentPositionType.unspecified;

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICompartmentDetails#getCoachType()

@@ -121,14 +120,14 @@ public class SimpleCompartmentDetails implements ICompartmentDetails {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICompartmentDetails#getPosition()

 	 */

-	public CompartmentPositionType getPosition() {

+	public ICompartmentPositionType getPosition() {

 		return position;

 	}

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICompartmentDetails#setPosition(org.uic.ticket.api.asn.om.CompartmentPositionType)

 	 */

-	public void setPosition(CompartmentPositionType position) {

+	public void setPosition(ICompartmentPositionType position) {

 		this.position = position;

 	}

 	

diff --git a/src/org/uic/ticket/api/impl/SimpleCounterMark.java b/src/org/uic/ticket/api/impl/SimpleCounterMark.java
index ce0ecd5..219a505 100644
--- a/src/org/uic/ticket/api/impl/SimpleCounterMark.java
+++ b/src/org/uic/ticket/api/impl/SimpleCounterMark.java
@@ -7,14 +7,14 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

-import org.uic.ticket.api.asn.omv1.TravelClassType;

 import org.uic.ticket.api.spec.ICounterMark;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.IRegionalValidity;

 import org.uic.ticket.api.spec.IReturnRouteDescription;

+import org.uic.ticket.api.spec.IStationCodeTable;

+import org.uic.ticket.api.spec.ITravelClassType;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleCounterMark.

  */

@@ -49,7 +49,7 @@ public class SimpleCounterMark extends SimpleDocumentData implements ICounterMar
 	protected boolean returnIncluded = false;

 

 	/** The station code table. */

-	protected CodeTableType stationCodeTable = CodeTableType.stationUIC;

+	protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;

 	

 	/** The from station. */

 	protected String fromStation;

@@ -79,7 +79,7 @@ public class SimpleCounterMark extends SimpleDocumentData implements ICounterMar
 	protected Date  validUntil;

 	  

 	/** The class code. */

-	protected TravelClassType	classCode = TravelClassType.second;       

+	protected ITravelClassType	classCode = ITravelClassType.second;       

    

 	/** The included carriers. */

 	protected Collection<String>includedCarriers = new LinkedHashSet<String>();	  

@@ -133,14 +133,14 @@ public class SimpleCounterMark extends SimpleDocumentData implements ICounterMar
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICounterMark#getStationCodeTable()

 	 */

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICounterMark#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 	 */

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}

 

@@ -273,14 +273,14 @@ public class SimpleCounterMark extends SimpleDocumentData implements ICounterMar
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICounterMark#getClassCode()

 	 */

-	public TravelClassType getClassCode() {

+	public ITravelClassType getClassCode() {

 		return classCode;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICounterMark#setClassCode(org.uic.ticket.api.asn.om.TravelClassType)

 	 */

-	public void setClassCode(TravelClassType classCode) {

+	public void setClassCode(ITravelClassType classCode) {

 		this.classCode = classCode;

 	}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleCustomerCard.java b/src/org/uic/ticket/api/impl/SimpleCustomerCard.java
index 9d6db3d..2e948bf 100644
--- a/src/org/uic/ticket/api/impl/SimpleCustomerCard.java
+++ b/src/org/uic/ticket/api/impl/SimpleCustomerCard.java
@@ -7,10 +7,10 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.TravelClassType;

 import org.uic.ticket.api.spec.ICustomerCard;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.ITraveler;

+import org.uic.ticket.api.spec.ITravelClassType;

 

 // TODO: Auto-generated Javadoc

 /**

@@ -31,7 +31,7 @@ public class SimpleCustomerCard  extends SimpleDocumentData implements ICustomer
 	protected Date  	validUntil;

 	

 	/** The class code. */

-	protected TravelClassType	classCode;     

+	protected ITravelClassType	classCode;     

 	

 	/** The extension. */

 	protected IExtension extension;

@@ -111,14 +111,14 @@ public class SimpleCustomerCard  extends SimpleDocumentData implements ICustomer
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICustomerCard#getClassCode()

 	 */

-	public TravelClassType getClassCode() {

+	public ITravelClassType getClassCode() {

 		return classCode;

 	}

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ICustomerCard#setClassCode(org.uic.ticket.api.asn.om.TravelClassType)

 	 */

-	public void setClassCode(TravelClassType classCode) {

+	public void setClassCode(ITravelClassType classCode) {

 		this.classCode = classCode;

 	}

 	

diff --git a/src/org/uic/ticket/api/impl/SimpleDelayConfirmation.java b/src/org/uic/ticket/api/impl/SimpleDelayConfirmation.java
index 3171072..9763d15 100644
--- a/src/org/uic/ticket/api/impl/SimpleDelayConfirmation.java
+++ b/src/org/uic/ticket/api/impl/SimpleDelayConfirmation.java
@@ -4,12 +4,11 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.HashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

 import org.uic.ticket.api.spec.IDelayConfirmation;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.ITicketLink;

+import org.uic.ticket.api.spec.IStationCodeTable;

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleDelayConfirmation.

  */

@@ -22,7 +21,7 @@ public class SimpleDelayConfirmation extends SimpleDocumentData  implements IDel
 	protected String    reference;

 	

     /** The station code table. */

-    protected CodeTableType stationCodeTable = CodeTableType.stationUICReservation;

+    protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUICReservation;

     

     /** The station. */

     protected String station;	

@@ -94,7 +93,7 @@ public class SimpleDelayConfirmation extends SimpleDocumentData  implements IDel
 	 * @see org.uic.ticket.api.spec.IDelayConfirmation#getStationCodeTable()

 	 */

 	@Override

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 

@@ -102,7 +101,7 @@ public class SimpleDelayConfirmation extends SimpleDocumentData  implements IDel
 	 * @see org.uic.ticket.api.spec.IDelayConfirmation#setStationCodeTable(org.uic.ticket.api.asn.omv1.CodeTableType)

 	 */

 	@Override

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleFipTicket.java b/src/org/uic/ticket/api/impl/SimpleFipTicket.java
index 6bd5f99..42cb25b 100644
--- a/src/org/uic/ticket/api/impl/SimpleFipTicket.java
+++ b/src/org/uic/ticket/api/impl/SimpleFipTicket.java
@@ -8,9 +8,9 @@ import java.util.Date;
 

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.TravelClassType;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.IFipTicket;

+import org.uic.ticket.api.spec.ITravelClassType;

 

 

 // TODO: Auto-generated Javadoc

@@ -30,7 +30,7 @@ public class SimpleFipTicket extends SimpleDocumentData implements IFipTicket {
 	protected String productOwner;

 	

 	/** The class code. */

-	protected TravelClassType	classCode = TravelClassType.second;      

+	protected ITravelClassType	classCode = ITravelClassType.second;      

 	

 	/** The valid from. */

 	protected Date validFrom;

@@ -140,14 +140,14 @@ public class SimpleFipTicket extends SimpleDocumentData implements IFipTicket {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IFipTicket#getClassCode()

 	 */

-	public TravelClassType getClassCode() {

+	public ITravelClassType getClassCode() {

 		return classCode;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IFipTicket#setClassCode(org.uic.ticket.api.asn.om.TravelClassType)

 	 */

-	public void setClassCode(TravelClassType classCode) {

+	public void setClassCode(ITravelClassType classCode) {

 		this.classCode = classCode;

 	}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleGeoCoordinate.java b/src/org/uic/ticket/api/impl/SimpleGeoCoordinate.java
index a591e29..4bec5a1 100644
--- a/src/org/uic/ticket/api/impl/SimpleGeoCoordinate.java
+++ b/src/org/uic/ticket/api/impl/SimpleGeoCoordinate.java
@@ -3,32 +3,33 @@
  */

 package org.uic.ticket.api.impl;

 

-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;

+

+import org.uic.ticket.api.spec.IGeoCoordinateSystemType;

+import org.uic.ticket.api.spec.IGeoUnitType;

+import org.uic.ticket.api.spec.IHemisphereLatitudeType;

+import org.uic.ticket.api.spec.IHemisphereLongitudeType;

 import org.uic.ticket.api.spec.IGeoCoordinate;

 

-// TODO: Auto-generated Javadoc

+

 /**

  * The Class SimpleGeoCoordinate.

  */

 public class SimpleGeoCoordinate implements IGeoCoordinate {

 	

 	/** The unit. */

-	protected GeoUnitType unit = GeoUnitType.milliDegree;

+	protected IGeoUnitType unit = IGeoUnitType.milliDegree;

 

 	/** The accuracy. */

-	protected GeoUnitType accuracy;

+	protected IGeoUnitType accuracy;

 	

 	/** The system. */

-	protected GeoCoordinateSystemType system = GeoCoordinateSystemType.wgs84;

+	protected IGeoCoordinateSystemType system = IGeoCoordinateSystemType.wgs84;

 	

 	/** The hemispher longiture. */

-	protected HemisphereLongitudeType hemispherLongiture = HemisphereLongitudeType.north;

+	protected IHemisphereLongitudeType hemispherLongiture = IHemisphereLongitudeType.north;

 	

 	/** The hemisphere latitude. */

-	protected HemisphereLatitudeType hemisphereLatitude = HemisphereLatitudeType.east;

+	protected IHemisphereLatitudeType hemisphereLatitude = IHemisphereLatitudeType.east;

 	

 	/** The longitude. */

 	protected Long longitude;

@@ -39,70 +40,70 @@ public class SimpleGeoCoordinate implements IGeoCoordinate {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#getUnit()

 	 */

-	public GeoUnitType getUnit() {

+	public IGeoUnitType getUnit() {

 		return unit;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#setUnit(org.uic.ticket.api.asn.om.GeoUnitType)

 	 */

-	public void setUnit(GeoUnitType unit) {

+	public void setUnit(IGeoUnitType unit) {

 		this.unit = unit;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#getAccuracy()

 	 */

-	public GeoUnitType getAccuracy() {

+	public IGeoUnitType getAccuracy() {

 		return accuracy;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#setAccuracy(org.uic.ticket.api.asn.om.GeoUnitType)

 	 */

-	public void setAccuracy(GeoUnitType accuracy) {

+	public void setAccuracy(IGeoUnitType accuracy) {

 		this.accuracy = accuracy;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#getSystem()

 	 */

-	public GeoCoordinateSystemType getSystem() {

+	public IGeoCoordinateSystemType getSystem() {

 		return system;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#setSystem(org.uic.ticket.api.asn.om.GeoCoordinateSystemType)

 	 */

-	public void setSystem(GeoCoordinateSystemType system) {

+	public void setSystem(IGeoCoordinateSystemType system) {

 		this.system = system;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#getHemispherLongitude()

 	 */

-	public HemisphereLongitudeType getHemisphereLongitude() {

+	public IHemisphereLongitudeType getHemisphereLongitude() {

 		return hemispherLongiture;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#setHemispherLongitude(org.uic.ticket.api.asn.om.HemisphereLongitudeType)

 	 */

-	public void setHemisphereLongitude(HemisphereLongitudeType hemispherLongiture) {

+	public void setHemisphereLongitude(IHemisphereLongitudeType hemispherLongiture) {

 		this.hemispherLongiture = hemispherLongiture;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#getHemisphereLatitude()

 	 */

-	public HemisphereLatitudeType getHemisphereLatitude() {

+	public IHemisphereLatitudeType getHemisphereLatitude() {

 		return hemisphereLatitude;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IGeoCoordinate#setHemisphereLatitude(org.uic.ticket.api.asn.om.HemisphereLatitudeType)

 	 */

-	public void setHemisphereLatitude(HemisphereLatitudeType hemisphereLatitude) {

+	public void setHemisphereLatitude(IHemisphereLatitudeType hemisphereLatitude) {

 		this.hemisphereLatitude = hemisphereLatitude;

 	}

 

@@ -146,15 +147,15 @@ public class SimpleGeoCoordinate implements IGeoCoordinate {
 	}

 	

 	public long getFullCircle(){

-		if (unit == GeoUnitType.centiDegree) {

+		if (unit == IGeoUnitType.centiDegree) {

 			return 100 * 360;

-		} else if (unit == GeoUnitType.deciDegree) {

+		} else if (unit == IGeoUnitType.deciDegree) {

 			return 10 * 360;

-		} else if (unit == GeoUnitType.milliDegree) {

+		} else if (unit == IGeoUnitType.milliDegree) {

 			return 1000 * 360;

-		} else if (unit == GeoUnitType.tenthmilliDegree) {

+		} else if (unit == IGeoUnitType.tenthmilliDegree) {

 			return 10000 * 360;

-		} else if (unit == GeoUnitType.milliDegree) {

+		} else if (unit == IGeoUnitType.milliDegree) {

 			return 100000 * 360;

 		} else {

 			return 360;

diff --git a/src/org/uic/ticket/api/impl/SimpleIncludedOpenTicket.java b/src/org/uic/ticket/api/impl/SimpleIncludedOpenTicket.java
index 601e818..c0b2680 100644
--- a/src/org/uic/ticket/api/impl/SimpleIncludedOpenTicket.java
+++ b/src/org/uic/ticket/api/impl/SimpleIncludedOpenTicket.java
@@ -7,14 +7,13 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

-import org.uic.ticket.api.asn.omv1.TravelClassType;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.IIncludedOpenTicket;

 import org.uic.ticket.api.spec.IRegionalValidity;

 import org.uic.ticket.api.spec.ITariff;

+import org.uic.ticket.api.spec.IStationCodeTable;

+import org.uic.ticket.api.spec.ITravelClassType;

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleIncludedOpenTicket.

  */

@@ -39,7 +38,7 @@ public class SimpleIncludedOpenTicket implements IIncludedOpenTicket {
 	protected int authorizationCode;	

 

 	/** The station code table. */

-	protected CodeTableType stationCodeTable = CodeTableType.stationUIC;

+	protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;

 	

 	/** The from station. */

 	protected String fromStation;

@@ -66,7 +65,7 @@ public class SimpleIncludedOpenTicket implements IIncludedOpenTicket {
 	protected Date validUntil;    

     

 	/** The class code. */

-	protected TravelClassType	classCode = TravelClassType.second;       

+	protected ITravelClassType	classCode = ITravelClassType.second;       

    

 	/** The included carriers. */

 	protected Collection<String>includedCarriers = new LinkedHashSet<String>();	  

@@ -175,14 +174,14 @@ public class SimpleIncludedOpenTicket implements IIncludedOpenTicket {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IIncludedOpenTicket#getStationCodeTable()

 	 */

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IIncludedOpenTicket#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 	 */

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}

 

@@ -301,14 +300,14 @@ public class SimpleIncludedOpenTicket implements IIncludedOpenTicket {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IIncludedOpenTicket#getClassCode()

 	 */

-	public TravelClassType getClassCode() {

+	public ITravelClassType getClassCode() {

 		return classCode;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IIncludedOpenTicket#setClassCode(org.uic.ticket.api.asn.om.TravelClassType)

 	 */

-	public void setClassCode(TravelClassType classCode) {

+	public void setClassCode(ITravelClassType classCode) {

 		this.classCode = classCode;

 	}

 

@@ -436,4 +435,28 @@ public class SimpleIncludedOpenTicket implements IIncludedOpenTicket {
 		this.validUntil = date;

 	}

 

+	@Override

+	public Collection<Integer> getExcludedTransportTypes() {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+	@Override

+	public void addExcludedTransportType(Integer excludedTransportType) {

+		// TODO Auto-generated method stub

+		

+	}

+

+	@Override

+	public Collection<Integer> getIncludedTransportTypes() {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+	@Override

+	public void addInludedTransportType(Integer includedTransportType) {

+		// TODO Auto-generated method stub

+		

+	}

+

 }

diff --git a/src/org/uic/ticket/api/impl/SimpleLine.java b/src/org/uic/ticket/api/impl/SimpleLine.java
index 620dc65..f460c3f 100644
--- a/src/org/uic/ticket/api/impl/SimpleLine.java
+++ b/src/org/uic/ticket/api/impl/SimpleLine.java
@@ -5,10 +5,9 @@ package org.uic.ticket.api.impl;
 

 import java.util.HashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

 import org.uic.ticket.api.spec.ILine;

+import org.uic.ticket.api.spec.IStationCodeTable;

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleLine.

  */

@@ -21,7 +20,7 @@ public class SimpleLine implements ILine {
 	protected HashSet<Integer> lineIds = new HashSet<Integer>();

 	

 	/** The station code table. */

-	protected CodeTableType stationCodeTable = CodeTableType.stationUIC;

+	protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;

 	

 	/** The entry station. */

 	protected String entryStation;

@@ -66,14 +65,14 @@ public class SimpleLine implements ILine {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ILine#getStationCodeTable()

 	 */

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ILine#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 	 */

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleOpenTicket.java b/src/org/uic/ticket/api/impl/SimpleOpenTicket.java
index 24b887b..5e2a7ed 100644
--- a/src/org/uic/ticket/api/impl/SimpleOpenTicket.java
+++ b/src/org/uic/ticket/api/impl/SimpleOpenTicket.java
@@ -7,8 +7,6 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

-import org.uic.ticket.api.asn.omv1.TravelClassType;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.IIncludedOpenTicket;

 import org.uic.ticket.api.spec.ILuggageRestriction;

@@ -17,8 +15,10 @@ import org.uic.ticket.api.spec.IRegionalValidity;
 import org.uic.ticket.api.spec.IReturnRouteDescription;

 import org.uic.ticket.api.spec.ITariff;

 import org.uic.ticket.api.spec.IVatDetail;

+import org.uic.ticket.api.spec.IStationCodeTable;

+import org.uic.ticket.api.spec.ITravelClassType;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleOpenTicket.

  */

@@ -63,7 +63,7 @@ public class SimpleOpenTicket  extends SimpleDocumentData implements IOpenTicket
 		protected boolean returnIncluded = false;

 	

 		/** The station code table. */

-		protected CodeTableType stationCodeTable = CodeTableType.stationUIC;

+		protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;

 		

 		/** The from station. */

 		protected String fromStation;

@@ -91,7 +91,7 @@ public class SimpleOpenTicket  extends SimpleDocumentData implements IOpenTicket
         protected Collection<Date> activatedDays = new LinkedHashSet<Date>();      

 	    

 		/** The class code. */

-		protected TravelClassType	classCode = TravelClassType.second;       

+		protected ITravelClassType	classCode = ITravelClassType.second;       

 		

 		

 		/** The service level. */

@@ -106,6 +106,12 @@ public class SimpleOpenTicket  extends SimpleDocumentData implements IOpenTicket
 	    /** The excluded service brands. */

 	    protected Collection<Integer>excludedServiceBrands = new LinkedHashSet<Integer>();	    	

 

+	    /** The included service brands. */

+	    protected Collection<Integer>includedTransportTypes = new LinkedHashSet<Integer>();	

+    	

+	    /** The excluded service brands. */

+	    protected Collection<Integer>excludedTransportTypes = new LinkedHashSet<Integer>();	   

+	    

         /** The tariffs. */

         protected Collection<ITariff> tariffs = new LinkedHashSet<ITariff>();	   

         

@@ -169,14 +175,14 @@ public class SimpleOpenTicket  extends SimpleDocumentData implements IOpenTicket
 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IOpenTicket#getStationCodeTable()

 		 */

-		public CodeTableType getStationCodeTable() {

+		public IStationCodeTable getStationCodeTable() {

 			return stationCodeTable;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IOpenTicket#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 		 */

-		public void setStationCodeTable(CodeTableType stationCodeTable) {

+		public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 			this.stationCodeTable = stationCodeTable;

 		}

 

@@ -479,14 +485,14 @@ public class SimpleOpenTicket  extends SimpleDocumentData implements IOpenTicket
 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IOpenTicket#getClassCode()

 		 */

-		public TravelClassType getClassCode() {

+		public ITravelClassType getClassCode() {

 			return classCode;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IOpenTicket#setClassCode(org.uic.ticket.api.asn.om.TravelClassType)

 		 */

-		public void setClassCode(TravelClassType classCode) {

+		public void setClassCode(ITravelClassType classCode) {

 			this.classCode = classCode;

 		}

 

@@ -574,4 +580,24 @@ public class SimpleOpenTicket  extends SimpleDocumentData implements IOpenTicket
 			this.validUntilUTCoffset = validUntilUTCoffset;

 		}

 

+		@Override

+		public Collection<Integer> getExcludedTransportTypes() {

+			return excludedTransportTypes;

+		}

+

+		@Override

+		public void addExcludedTransportType(Integer excludedTransportType) {

+			excludedTransportTypes.add(excludedTransportType);

+		}

+

+		@Override

+		public Collection<Integer> getIncludedTransportTypes() {

+			return includedTransportTypes;

+		}

+

+		@Override

+		public void addInludedTransportType(Integer includedTransportType) {

+			includedTransportTypes.add(includedTransportType);		

+		}

+

 }

diff --git a/src/org/uic/ticket/api/impl/SimpleParkingGround.java b/src/org/uic/ticket/api/impl/SimpleParkingGround.java
index 9e77989..2ded400 100644
--- a/src/org/uic/ticket/api/impl/SimpleParkingGround.java
+++ b/src/org/uic/ticket/api/impl/SimpleParkingGround.java
@@ -7,10 +7,10 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.IParkingGround;

 import org.uic.ticket.api.spec.IVatDetail;

+import org.uic.ticket.api.spec.IStationCodeTable;

 

 

 /**

@@ -55,7 +55,7 @@ public class SimpleParkingGround extends SimpleDocumentData implements IParkingG
 		protected String 	numberPlate;

 			                				        	

         /** The station code table. */

-        protected CodeTableType stationCodeTable = CodeTableType.stationUIC;		

+        protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;		

 		

 		/** The extension data. */

 		protected IExtension   	extensionData;

@@ -227,14 +227,14 @@ public class SimpleParkingGround extends SimpleDocumentData implements IParkingG
 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IParkingGround#getStationCodeTable()

 		 */

-		public CodeTableType getStationCodeTable() {

+		public IStationCodeTable getStationCodeTable() {

 			return stationCodeTable;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IParkingGround#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 		 */

-		public void setStationCodeTable(CodeTableType stationCodeTable) {

+		public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 			this.stationCodeTable = stationCodeTable;

 		}

 

diff --git a/src/org/uic/ticket/api/impl/SimplePass.java b/src/org/uic/ticket/api/impl/SimplePass.java
index d1704ac..9b00e2d 100644
--- a/src/org/uic/ticket/api/impl/SimplePass.java
+++ b/src/org/uic/ticket/api/impl/SimplePass.java
@@ -7,16 +7,15 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.*;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.IPass;

 import org.uic.ticket.api.spec.IRegionalValidity;

 import org.uic.ticket.api.spec.ITariff;

 import org.uic.ticket.api.spec.IValidityDetails;

 import org.uic.ticket.api.spec.IVatDetail;

+import org.uic.ticket.api.spec.ITravelClassType;

 

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimplePass.

  */

@@ -32,7 +31,7 @@ public class SimplePass extends SimpleDocumentData implements IPass {
 	protected String productOwner;

 	

 	/** The class code. */

-	protected TravelClassType	classCode = TravelClassType.second;      

+	protected ITravelClassType	classCode = ITravelClassType.second;      

 	

 	/** The valid from. */

 	protected Date validFrom;

@@ -329,14 +328,14 @@ public class SimplePass extends SimpleDocumentData implements IPass {
 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IPass#getClassCode()

 		 */

-		public TravelClassType getClassCode() {

+		public ITravelClassType getClassCode() {

 			return classCode;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IPass#setClassCode(org.uic.ticket.api.asn.om.TravelClassType)

 		 */

-		public void setClassCode(TravelClassType classCode) {

+		public void setClassCode(ITravelClassType classCode) {

 			this.classCode = classCode;

 		}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleReservation.java b/src/org/uic/ticket/api/impl/SimpleReservation.java
index 2aa22de..aff30dc 100644
--- a/src/org/uic/ticket/api/impl/SimpleReservation.java
+++ b/src/org/uic/ticket/api/impl/SimpleReservation.java
@@ -7,10 +7,7 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-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;

+

 import org.uic.ticket.api.spec.IBerth;

 import org.uic.ticket.api.spec.ICompartmentDetails;

 import org.uic.ticket.api.spec.IExtension;

@@ -20,8 +17,12 @@ import org.uic.ticket.api.spec.IReservation;
 import org.uic.ticket.api.spec.IServiceBrand;

 import org.uic.ticket.api.spec.ITariff;

 import org.uic.ticket.api.spec.IVatDetail;

+import org.uic.ticket.api.spec.IPriceTypeType;

+import org.uic.ticket.api.spec.IServiceType;

+import org.uic.ticket.api.spec.IStationCodeTable;

+import org.uic.ticket.api.spec.ITravelClassType;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleReservation.

  */

@@ -49,7 +50,7 @@ public class SimpleReservation extends SimpleDocumentData implements IReservatio
     	protected IServiceBrand serviceBrand;

 	    

 		/** The service. */

-		protected ServiceType 	service = ServiceType.seat;		

+		protected IServiceType 	service = IServiceType.seat;		

 		   	

 		/** The service brand description. */

 		protected String serviceBrandDescription;

@@ -59,7 +60,7 @@ public class SimpleReservation extends SimpleDocumentData implements IReservatio
 

 		    

         /** The station code table. */

-        protected CodeTableType stationCodeTable = CodeTableType.stationUICReservation;

+        protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUICReservation;

         

         /** The from station. */

         protected String fromStation;

@@ -83,7 +84,7 @@ public class SimpleReservation extends SimpleDocumentData implements IReservatio
         protected Collection<ITariff> tariffs = new LinkedHashSet<ITariff>();	        

 		    

 		/** The class code. */

-		protected TravelClassType	classCode = TravelClassType.second;

+		protected ITravelClassType	classCode = ITravelClassType.second;

 

 		/** The service level. */

 		protected String   serviceLevel;

@@ -106,7 +107,7 @@ public class SimpleReservation extends SimpleDocumentData implements IReservatio
 	

 		

         /** The price type. */

-        protected PriceTypeType priceType = PriceTypeType.travelPrice;

+        protected IPriceTypeType priceType = IPriceTypeType.travelPrice;

         

         /** The type of supplement. */

         protected int typeOfSupplement;				

@@ -222,28 +223,28 @@ public class SimpleReservation extends SimpleDocumentData implements IReservatio
 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IReservation#getService()

 		 */

-		public ServiceType getService() {

+		public IServiceType getService() {

 			return service;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IReservation#setService(org.uic.ticket.api.asn.om.ServiceType)

 		 */

-		public void setService(ServiceType service) {

+		public void setService(IServiceType service) {

 			this.service = service;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IReservation#getStationCodeTable()

 		 */

-		public CodeTableType getStationCodeTable() {

+		public IStationCodeTable getStationCodeTable() {

 			return stationCodeTable;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IReservation#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 		 */

-		public void setStationCodeTable(CodeTableType stationCodeTable) {

+		public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 			this.stationCodeTable = stationCodeTable;

 		}

 

@@ -320,14 +321,14 @@ public class SimpleReservation extends SimpleDocumentData implements IReservatio
 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IReservation#getClassCode()

 		 */

-		public TravelClassType getClassCode() {

+		public ITravelClassType getClassCode() {

 			return classCode;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IReservation#setClassCode(org.uic.ticket.api.asn.om.TravelClassType)

 		 */

-		public void setClassCode(TravelClassType classCode) {

+		public void setClassCode(ITravelClassType classCode) {

 			this.classCode = classCode;

 		}

 

@@ -449,14 +450,14 @@ public class SimpleReservation extends SimpleDocumentData implements IReservatio
 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IReservation#getPriceType()

 		 */

-		public PriceTypeType getPriceType() {

+		public IPriceTypeType getPriceType() {

 			return priceType;

 		}

 

 		/* (nicht-Javadoc)

 		 * @see org.uic.ticket.api.spec.IReservation#setPriceType(org.uic.ticket.api.asn.om.PriceTypeType)

 		 */

-		public void setPriceType(PriceTypeType priceType) {

+		public void setPriceType(IPriceTypeType priceType) {

 			this.priceType = priceType;

 		}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleRouteSection.java b/src/org/uic/ticket/api/impl/SimpleRouteSection.java
index 079ae61..0354e4c 100644
--- a/src/org/uic/ticket/api/impl/SimpleRouteSection.java
+++ b/src/org/uic/ticket/api/impl/SimpleRouteSection.java
@@ -3,10 +3,11 @@
  */

 package org.uic.ticket.api.impl;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

+

 import org.uic.ticket.api.spec.IRouteSection;

+import org.uic.ticket.api.spec.IStationCodeTable;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleRouteSection.

  */

@@ -14,7 +15,7 @@ public class SimpleRouteSection implements IRouteSection {
 	

 	

 	/** The station code table. */

-	protected CodeTableType stationCodeTable = CodeTableType.stationUIC;

+	protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;

 	

 	/** The from station. */

 	protected String fromStation;

@@ -31,14 +32,14 @@ public class SimpleRouteSection implements IRouteSection {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IRouteSection#getStationCodeTable()

 	 */

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IRouteSection#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 	 */

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}

 	

diff --git a/src/org/uic/ticket/api/impl/SimpleStationPassage.java b/src/org/uic/ticket/api/impl/SimpleStationPassage.java
index 334d528..7624086 100644
--- a/src/org/uic/ticket/api/impl/SimpleStationPassage.java
+++ b/src/org/uic/ticket/api/impl/SimpleStationPassage.java
@@ -7,11 +7,11 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

 import org.uic.ticket.api.spec.IExtension;

 import org.uic.ticket.api.spec.IStationPassage;

+import org.uic.ticket.api.spec.IStationCodeTable;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleStationPassage.

  */

@@ -36,7 +36,7 @@ public class SimpleStationPassage extends SimpleDocumentData implements IStation
 	protected Date  validUntil;	

 	

 	/** The station code table. */

-	protected CodeTableType stationCodeTable = CodeTableType.stationUIC;

+	protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;

        

 	/** The station name. */

 	protected String stationName;

@@ -148,14 +148,14 @@ public class SimpleStationPassage extends SimpleDocumentData implements IStation
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IStationPassage#getStationCodeTable()

 	 */

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IStationPassage#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 	 */

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleTariff.java b/src/org/uic/ticket/api/impl/SimpleTariff.java
index e7fe371..c051a70 100644
--- a/src/org/uic/ticket/api/impl/SimpleTariff.java
+++ b/src/org/uic/ticket/api/impl/SimpleTariff.java
@@ -6,13 +6,13 @@ package org.uic.ticket.api.impl;
 import java.util.Collection;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.PassengerType;

 import org.uic.ticket.api.spec.ICardReference;

 import org.uic.ticket.api.spec.IRouteSection;

 import org.uic.ticket.api.spec.ISeriesDataDetails;

 import org.uic.ticket.api.spec.ITariff;

+import org.uic.ticket.api.spec.IPassengerType;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleTariff.

  */

@@ -22,7 +22,7 @@ public class SimpleTariff implements ITariff {
     protected int numberOfPassengers = 1;

     

 	/** The passenger type. */

-	protected PassengerType  passengerType ;

+	protected IPassengerType  passengerType ;

     

 

 	/** The age below. */

@@ -77,7 +77,7 @@ public class SimpleTariff implements ITariff {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITariff#getPassengerType()

 	 */

-	public PassengerType getPassengerType() {

+	public IPassengerType getPassengerType() {

 		return passengerType;

 	}

 

@@ -85,7 +85,7 @@ public class SimpleTariff implements ITariff {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITariff#setPassengerType(org.uic.ticket.api.asn.om.PassengerType)

 	 */

-	public void setPassengerType(PassengerType passengerType) {

+	public void setPassengerType(IPassengerType passengerType) {

 		this.passengerType = passengerType;

 	}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleTicketLink.java b/src/org/uic/ticket/api/impl/SimpleTicketLink.java
index 3262caa..b28d8d5 100644
--- a/src/org/uic/ticket/api/impl/SimpleTicketLink.java
+++ b/src/org/uic/ticket/api/impl/SimpleTicketLink.java
@@ -3,11 +3,12 @@
  */

 package org.uic.ticket.api.impl;

 

-import org.uic.ticket.api.asn.omv1.LinkMode;

-import org.uic.ticket.api.asn.omv1.TicketType;

+

 import org.uic.ticket.api.spec.ITicketLink;

+import org.uic.ticket.api.spec.ILinkMode;

+import org.uic.ticket.api.spec.ITicketType;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleTicketLink.

  */

@@ -26,10 +27,10 @@ public class SimpleTicketLink implements ITicketLink {
 	protected String productOwner;

 	

 	/** The ticket type. */

-	protected TicketType ticketType = TicketType.openTicket;

+	protected ITicketType ticketType = ITicketType.openTicket;

 	

 	/** The link mode. */

-	protected LinkMode linkMode = LinkMode.issuedTogether;

+	protected ILinkMode linkMode = ILinkMode.issuedTogether;

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITicketLink#getReference()

@@ -76,28 +77,28 @@ public class SimpleTicketLink implements ITicketLink {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITicketLink#getTicketType()

 	 */

-	public TicketType getTicketType() {

+	public ITicketType getTicketType() {

 		return ticketType;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITicketLink#setTicketType(org.uic.ticket.api.asn.om.TicketType)

 	 */

-	public void setTicketType(TicketType ticketType) {

+	public void setTicketType(ITicketType ticketType) {

 		this.ticketType = ticketType;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITicketLink#getLinkMode()

 	 */

-	public LinkMode getLinkMode() {

+	public ILinkMode getLinkMode() {

 		return linkMode;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITicketLink#setLinkMode(org.uic.ticket.api.asn.om.LinkMode)

 	 */

-	public void setLinkMode(LinkMode linkMode) {

+	public void setLinkMode(ILinkMode linkMode) {

 		this.linkMode = linkMode;

 	}

 

diff --git a/src/org/uic/ticket/api/impl/SimpleTraveler.java b/src/org/uic/ticket/api/impl/SimpleTraveler.java
index 50c322c..ef60dd7 100644
--- a/src/org/uic/ticket/api/impl/SimpleTraveler.java
+++ b/src/org/uic/ticket/api/impl/SimpleTraveler.java
@@ -7,13 +7,12 @@ import java.util.Collection;
 import java.util.Date;

 import java.util.HashSet;

 

-import org.uic.ticket.api.asn.omv1.GenderType;

-import org.uic.ticket.api.asn.omv1.PassengerType;

+import org.uic.ticket.api.spec.IGenderType;

 import org.uic.ticket.api.spec.ICustomerStatusDescription;

 import org.uic.ticket.api.spec.ITraveler;

+import org.uic.ticket.api.spec.IPassengerType;

 

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleTraveler.

  */

@@ -39,7 +38,7 @@ public class SimpleTraveler implements ITraveler {
 	protected String 	title;

 	

 	/** The gender. */

-	protected GenderType 	gender;									

+	protected IGenderType 	gender;									

 	

 	/** The customer id. */

 	protected String 	customerId;		

@@ -51,7 +50,7 @@ public class SimpleTraveler implements ITraveler {
 	protected boolean	ticketHolder = true;								

 	

 	/** The passenger type. */

-	protected PassengerType passengerType;

+	protected IPassengerType passengerType;

 	

 	/** The passenger with reduced mobility. */

 	protected boolean 	passengerWithReducedMobility = false;

@@ -156,14 +155,14 @@ public class SimpleTraveler implements ITraveler {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITraveler#getGender()

 	 */

-	public GenderType getGender() {

+	public IGenderType getGender() {

 		return gender;

 	}

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITraveler#setGender(org.uic.ticket.api.asn.om.GenderType)

 	 */

-	public void setGender(GenderType gender) {

+	public void setGender(IGenderType gender) {

 		this.gender = gender;

 	}

 	

@@ -212,14 +211,14 @@ public class SimpleTraveler implements ITraveler {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITraveler#getPassengerType()

 	 */

-	public PassengerType getPassengerType() {

+	public IPassengerType getPassengerType() {

 		return passengerType;

 	}

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.ITraveler#setPassengerType(org.uic.ticket.api.asn.om.PassengerType)

 	 */

-	public void setPassengerType(PassengerType passengerType) {

+	public void setPassengerType(IPassengerType passengerType) {

 		this.passengerType = passengerType;

 	}

 	

diff --git a/src/org/uic/ticket/api/impl/SimpleViaStation.java b/src/org/uic/ticket/api/impl/SimpleViaStation.java
index a60ff8b..8af7c30 100644
--- a/src/org/uic/ticket/api/impl/SimpleViaStation.java
+++ b/src/org/uic/ticket/api/impl/SimpleViaStation.java
@@ -6,17 +6,18 @@ package org.uic.ticket.api.impl;
 import java.util.Collection;

 import java.util.LinkedHashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

+

 import org.uic.ticket.api.spec.IViaStation;

+import org.uic.ticket.api.spec.IStationCodeTable;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleViaStation.

  */

 public class SimpleViaStation implements IViaStation {

 	

 	/** The station code table. */

-	protected CodeTableType stationCodeTable = CodeTableType.stationUIC;

+	protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;

 	

 	/** The station. */

 	protected String station;

@@ -42,14 +43,14 @@ public class SimpleViaStation implements IViaStation {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IViaStation#getStationCodeTable()

 	 */

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 	

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IViaStation#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 	 */

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}

 	

diff --git a/src/org/uic/ticket/api/impl/SimpleZone.java b/src/org/uic/ticket/api/impl/SimpleZone.java
index d48a5d9..68d6b72 100644
--- a/src/org/uic/ticket/api/impl/SimpleZone.java
+++ b/src/org/uic/ticket/api/impl/SimpleZone.java
@@ -6,10 +6,10 @@ package org.uic.ticket.api.impl;
 import java.util.Collection;

 import java.util.HashSet;

 

-import org.uic.ticket.api.asn.omv1.CodeTableType;

 import org.uic.ticket.api.spec.IZone;

+import org.uic.ticket.api.spec.IStationCodeTable;

+

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class SimpleZone.

  */

@@ -20,7 +20,7 @@ public class SimpleZone implements IZone {
 	

 	

 	/** The station code table. */

-	protected CodeTableType stationCodeTable = CodeTableType.stationUIC;

+	protected IStationCodeTable stationCodeTable = IStationCodeTable.stationUIC;

 	

 	/** The entry station. */

 	protected String entryStation;

@@ -58,14 +58,14 @@ public class SimpleZone implements IZone {
 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IZone#getStationCodeTable()

 	 */

-	public CodeTableType getStationCodeTable() {

+	public IStationCodeTable getStationCodeTable() {

 		return stationCodeTable;

 	}

 

 	/* (nicht-Javadoc)

 	 * @see org.uic.ticket.api.spec.IZone#setStationCodeTable(org.uic.ticket.api.asn.om.CodeTableType)

 	 */

-	public void setStationCodeTable(CodeTableType stationCodeTable) {

+	public void setStationCodeTable(IStationCodeTable stationCodeTable) {

 		this.stationCodeTable = stationCodeTable;

 	}