package terminal;

public class Card {
	int id;
	int customerID; 
	String customerName;
	int kilometers;
	String expiration;
	int revocation;
	String cardPublicKey;
	
	public Card(){
		
	}
	
	public Card(int ID, int custID, String custName, int km, String exp, 
			int revoke, String cardPK){
		this.id = ID;
		this.customerID = custID;
		this.customerName = custName;
		this.kilometers = km;
		this.expiration = exp;
		this.revocation = revoke;
		this.cardPublicKey = cardPK;
	}
	
	public void setKilometers(int kmNew){
		this.kilometers = kmNew;
	}
	
	public void setExpiration(String expNew){
		this.expiration = expNew;
	}
	
	public int getID(){
		return this.id;
	}
	
	public int getCustomerID(){
		return this.customerID;
	}
	
	public String getCustomerName(){
		return this.customerName;
	}
	
	public int getKilometers(){
		return this.kilometers;
	}
	
	public String getExpDate(){
		return this.expiration;
	}
	
	public int getRevocationStates(){
		return this.revocation;
	}
	public String getCardPublicKey(){
		return this.cardPublicKey;
	}
	

}

@@ -106,20 +106,18 @@
 ters;%0D%0A%09
-Stri
+lo
 ng expir
@@ -124,16 +124,36 @@
 ation;%0D%0A
+%09String expString;%0D%0A
 %09int rev
@@ -275,20 +275,18 @@
 int km, 
-Stri
+lo
 ng exp, 
@@ -619,20 +619,18 @@
 iration(
-Stri
+lo
 ng expNe
@@ -659,32 +659,120 @@
  = expNew;%0D%0A%09%7D%0D%0A
+%09public void setStringExpiration(String strExpNew)%7B%0D%0A%09%09this.expString = strExpNew;%0D%0A%09%7D%0D%0A
 %09%0D%0A%09public int g
@@ -1020,16 +1020,86 @@
  String 
+getStringKilometers()%7B%0D%0A%09%09return this.expString;%0D%0A%09%7D%0D%0A%09%0D%0A%09public long 
 getExpDa

add stringexp