diff --git a/Assignment2/.classpath b/Assignment2/.classpath
index 137510065ce8f746de57b1b1a8953e8c9d46b79b..9cd32459142abf4bbcc9ca3d3b51eb5df0dc5848 100644
--- a/Assignment2/.classpath
+++ b/Assignment2/.classpath
@@ -3,5 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/home/raku/Desktop/xstream-1.4.7.jar"/>
+ <classpathentry kind="lib" path="/home/raku/Desktop/xmlpull-1.1.3.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/Assignment2/src/assignment2/Address.java b/Assignment2/src/assignment2/Address.java
index f97edb113b5bbcb93bb0c79ac489078d01000011..72a74c45b9d5a9c5068e5aab44a5cd2f2233ce94 100644
--- a/Assignment2/src/assignment2/Address.java
+++ b/Assignment2/src/assignment2/Address.java
@@ -5,7 +5,7 @@ public class Address {
String city;
String state;
String zip;
- String country;
+ String country; //git sucks
Address(String street, String city, String state, String zip, String country) {
this.street = street;
diff --git a/Assignment2/src/assignment2/DataConvereter.java b/Assignment2/src/assignment2/DataConverter.java
similarity index 71%
rename from Assignment2/src/assignment2/DataConvereter.java
rename to Assignment2/src/assignment2/DataConverter.java
index d171492aae62577942aba70b6e52381786ae661b..aaa4388798c0af93b6566fdf752f5d162a3891b0 100644
--- a/Assignment2/src/assignment2/DataConvereter.java
+++ b/Assignment2/src/assignment2/DataConverter.java
@@ -3,11 +3,14 @@ package assignment2;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.Scanner;
+import com.thoughtworks.xstream.*;
-public class DataConvereter {
+public class DataConverter {
+
+ private Customer[] customerArray;
- public void readPerson (){
+ public void readPerson() {
String fileName = "data/Person.dat";
Scanner s = null;
try {
@@ -15,7 +18,11 @@ public class DataConvereter {
} catch (FileNotFoundException e) {
e.printStackTrace();
}
+
int size =Integer.parseInt(s.nextLine());
+ Person[] personArray;
+ personArray = new Person[size];
+
for(int i=0;i<size;i++){
String personTemp = s.nextLine();
String[] parts = personTemp.split(";");
@@ -23,12 +30,12 @@ public class DataConvereter {
String name = parts[1];
String address = parts[2];
String eMail = parts[3];
- new Person(personCode,name,address,eMail);
+ personArray[i] = new Person(personCode,name,address,eMail);
}
s.close();
}
- public void readVenues (){
+ public void readVenues() {
String fileName = "data/Venues.dat";
Scanner s = null;
try {
@@ -36,7 +43,11 @@ public class DataConvereter {
} catch (FileNotFoundException e) {
e.printStackTrace();
}
+
int size =Integer.parseInt(s.nextLine());
+ Venues[] venuesArray;
+ venuesArray = new Venues[size];
+
for(int i=0;i<size;i++){
String venueTemp = s.nextLine();
String[] parts = venueTemp.split(";");
@@ -44,12 +55,12 @@ public class DataConvereter {
String name = parts[1];
String address = parts[2];
int capacity = Integer.parseInt(parts[3]);
- new Venues(venueCode,name,address,capacity);
+ venuesArray[i] = new Venues(venueCode,name,address,capacity);
}
s.close();
}
- public void readCustomer(){
+ public void readCustomer() {
String fileName = "data/Customers.dat";
Scanner s = null;
try {
@@ -58,6 +69,8 @@ public class DataConvereter {
e.printStackTrace();
}
int size =Integer.parseInt(s.nextLine());
+ //up top for testing implementation
+ customerArray = new Customer[size];
for(int i=0;i<size;i++){
String customerTemp = s.nextLine();
String[] parts = customerTemp.split(";");
@@ -66,7 +79,7 @@ public class DataConvereter {
String primaryContact = parts[2];
String name = parts[3];
String address = parts[4];
- new Customer(customerCode,type, primaryContact, name, address);
+ customerArray[i] = new Customer(customerCode,type, primaryContact, name, address);
}
s.close();
}
@@ -79,23 +92,23 @@ public class DataConvereter {
e.printStackTrace();
}
int size =Integer.parseInt(s.nextLine());
- for(int i=0;i<size;i++){
+ for(int i=0;i<size;i++) {
String productTemp = s.nextLine();
String[] parts = productTemp.split(";");
String code = parts[0];
String type = parts[1];
- if(type.equals("SR")){
+ if(type.equals("SR")) {
String name = parts[2];
double cost = Double.parseDouble(parts[3]);
new Refreshments(code,type, name, cost);
}
- else if(type.equals("SP")){
+ else if(type.equals("SP")) {
String venueCode = parts[2];
double hourlyFee = Double.parseDouble(parts[3]);
new ParkingPass(code,type,venueCode,hourlyFee);
}
- else if(type.equals("TG")){
+ else if(type.equals("TG")) {
String venueCode = parts[2];
String dateTime = parts[3];
String team1 = parts[4];
@@ -103,14 +116,14 @@ public class DataConvereter {
double pricePerUnit = Double.parseDouble(parts[6]);
new GameTicket(code,type,venueCode, dateTime, team1, team2, pricePerUnit);
}
- else if(type.equals("TS")){
+ else if(type.equals("TS")) {
String team = parts[2];
String startDate = parts[3];
String endDate = parts[4];
double cost = Double.parseDouble(parts[5]);
new SeasonPass(code, type, team, startDate,endDate,cost);
}
- else if(type.equals("SL")){
+ else if(type.equals("SL")) {
String ticketCode = parts[2];
double licenseFee = Double.parseDouble(parts[3]);
new PSL(code, type, ticketCode, licenseFee);
@@ -121,6 +134,22 @@ public class DataConvereter {
s.close();
}
+ private String serializeObjects(Object obj) {
+ XStream xstream = new XStream();
+ String xml = null;
+ return xml;
+ }
+
+ private String serializeObjects(Person[] per[]) {
+ XStream xstream = new XStream();
+ String xml = null;
+ return xml;
+ }
+
+ public static void main(String args[]) {
+ serializeObjects(readProduct().)
+ }
+
}