Methoden angelegt/angepasst
This commit is contained in:
parent
81f1cac657
commit
6e583b939f
318
src/Data.java
318
src/Data.java
@ -8,7 +8,7 @@ import java.util.List;
|
||||
/**
|
||||
* Data is a class to edit files.
|
||||
* @author Madeleine Vigier
|
||||
* @version 1.1
|
||||
* @version 1.3
|
||||
*/
|
||||
public class Data {
|
||||
private String pathRead;
|
||||
@ -16,141 +16,18 @@ public class Data {
|
||||
public Data(String pathRead) {
|
||||
this.pathRead = pathRead;
|
||||
}
|
||||
|
||||
/**
|
||||
* readData() is a method to split a file into lines and save them in an arraylist
|
||||
* @return Arraylist userlist
|
||||
* readUser() is a method to split user.txt into lines and save them in an arraylist
|
||||
* @return Arraylist userList
|
||||
* @author Madeleine Vigier, Sabine Gubitz
|
||||
* @version 1.1
|
||||
* @version 1.3
|
||||
*/
|
||||
public ArrayList<User> readData() {
|
||||
Path path = Paths.get(pathRead);
|
||||
|
||||
try {
|
||||
List<String> rows = Files.readAllLines(path);
|
||||
//Object class Meal is still missing and needs to be added
|
||||
if (pathRead.equals("menue.csv")) {
|
||||
ArrayList<String> menueList = new ArrayList<>();
|
||||
|
||||
//Booleans for allergens
|
||||
boolean eggs = false, peanuts = false, fish = false, grains = false, crustaceans = false,
|
||||
lupines = false, milk = false, nuts = false, sulfurDioxideAndSulfite = false, celeriac = false,
|
||||
mustards = false, sesame = false, soy = false, molluscs = false;
|
||||
|
||||
//Booleans for additives
|
||||
boolean antioxidant = false, artificialColours = false, flavourEnhancer = false, preservatives = false,
|
||||
nitrate = false, picklingSalt = false, phosphate = false, artificialSweetener = false;
|
||||
|
||||
for (String row : rows) {
|
||||
String[] parts = row.split(":");
|
||||
|
||||
String date = parts[1];
|
||||
String dish = parts[2];
|
||||
String sideDish = parts[3];
|
||||
String typ = parts[4];
|
||||
String desertV = parts[5];
|
||||
String desert = parts[6];
|
||||
String allergens = parts[7];
|
||||
if ( allergens != "") {
|
||||
eggs = true;
|
||||
}
|
||||
allergens = parts[8];
|
||||
if ( allergens != "") {
|
||||
peanuts = true;
|
||||
}
|
||||
allergens = parts[9];
|
||||
if ( allergens != "") {
|
||||
fish = true;
|
||||
}
|
||||
allergens = parts[10];
|
||||
if ( allergens != "") {
|
||||
grains = true;
|
||||
}
|
||||
allergens = parts[11];
|
||||
if ( allergens != "") {
|
||||
crustaceans = true;
|
||||
}
|
||||
allergens = parts[12];
|
||||
if ( allergens != "") {
|
||||
lupines = true;
|
||||
}
|
||||
allergens = parts[13];
|
||||
if ( allergens != "") {
|
||||
milk = true;
|
||||
}
|
||||
allergens = parts[14];
|
||||
if ( allergens != "") {
|
||||
nuts = true;
|
||||
}
|
||||
allergens = parts[15];
|
||||
if ( allergens != "") {
|
||||
sulfurDioxideAndSulfite = true;
|
||||
}
|
||||
allergens = parts[16];
|
||||
if ( allergens != "") {
|
||||
celeriac = true;
|
||||
}
|
||||
allergens = parts[17];
|
||||
if ( allergens != "") {
|
||||
mustards = true;
|
||||
}
|
||||
allergens = parts[18];
|
||||
if ( allergens != "") {
|
||||
sesame = true;
|
||||
}
|
||||
allergens = parts[19];
|
||||
if ( allergens != "") {
|
||||
soy = true;
|
||||
}
|
||||
allergens = parts[20];
|
||||
if ( allergens != "") {
|
||||
molluscs = true;
|
||||
}
|
||||
String additives = parts[21];
|
||||
if ( additives != "") {
|
||||
antioxidant = true;
|
||||
}
|
||||
additives = parts[22];
|
||||
if ( additives != "") {
|
||||
artificialColours = true;
|
||||
}
|
||||
additives = parts[23];
|
||||
if ( additives != "") {
|
||||
flavourEnhancer = true;
|
||||
}
|
||||
additives = parts[24];
|
||||
if ( additives != "") {
|
||||
preservatives = true;
|
||||
}
|
||||
additives = parts[25];
|
||||
if ( additives != "") {
|
||||
nitrate = true;
|
||||
}
|
||||
additives = parts[26];
|
||||
if ( additives != "") {
|
||||
picklingSalt = true;
|
||||
}
|
||||
additives = parts[27];
|
||||
if ( additives != "") {
|
||||
phosphate = true;
|
||||
}
|
||||
additives = parts[28];
|
||||
if ( additives != "") {
|
||||
artificialSweetener = true;
|
||||
}
|
||||
|
||||
//menueList.add(new Meal(date, dish, sideDish, typ, desertV, desert, eggs, peanuts, fish, grains,
|
||||
// crustaceans, lupines, milk, nuts, sulfurDioxideAndSulfite, celeriac, mustards, sesame,
|
||||
// soy, molluscs, antioxidant, artificialColours, flavourEnhancer, preservatives, nitrate,
|
||||
// picklingSalt, phosphate, artificialSweetener));
|
||||
}
|
||||
return null;//menueList;
|
||||
|
||||
} else if (pathRead.equals("users.txt")){
|
||||
public ArrayList<User> readUser(){
|
||||
List<String> rows = getRows();
|
||||
ArrayList<User> userList = new ArrayList<>();
|
||||
|
||||
for (String row : rows) {
|
||||
String[] parts = row.split(":");
|
||||
String[] parts = row.split(";");
|
||||
|
||||
String nameParent1 = parts[0];
|
||||
String nameParent2 = parts[1];
|
||||
@ -161,12 +38,162 @@ public class Data {
|
||||
userList.add(new User(nameParent1,nameParent2,billAddress,phonenumber,nameChildren,password));
|
||||
}
|
||||
return userList;
|
||||
//Object class Order is still missing and needs to be added
|
||||
} else if (pathRead.equals("orders.txt")) {
|
||||
ArrayList<String> orderList = new ArrayList<>();
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* readMenue() is a method to split menue.txt into lines and save them in an arraylist
|
||||
* @return Arraylist menuelist
|
||||
* @author Madeleine Vigier, Sabine Gubitz
|
||||
* @version 1.3
|
||||
*/
|
||||
public ArrayList<Menue> readMenue(){
|
||||
ArrayList<Menue> menueList = new ArrayList<>();
|
||||
List<String> rows = getRows();
|
||||
|
||||
for (String row : rows) {
|
||||
String[] parts = row.split(":");
|
||||
String[] parts = row.split(";");
|
||||
|
||||
String date = parts[1];
|
||||
String dish = parts[2];
|
||||
String sideDish = parts[3];
|
||||
String typ = parts[4];
|
||||
String desertV = parts[5];
|
||||
String desert = parts[6];
|
||||
String allergens = parts[7];
|
||||
|
||||
|
||||
boolean eggs = false;
|
||||
if (allergens != "") {
|
||||
eggs = true;
|
||||
}
|
||||
allergens = parts[8];
|
||||
boolean peanuts = false;
|
||||
if (allergens != "") {
|
||||
peanuts = true;
|
||||
}
|
||||
allergens = parts[9];
|
||||
boolean fish = false;
|
||||
if (allergens != "") {
|
||||
fish = true;
|
||||
}
|
||||
allergens = parts[10];
|
||||
boolean grains = false;
|
||||
if (allergens != "") {
|
||||
grains = true;
|
||||
}
|
||||
allergens = parts[11];
|
||||
boolean crustaceans = false;
|
||||
if (allergens != "") {
|
||||
crustaceans = true;
|
||||
}
|
||||
allergens = parts[12];
|
||||
boolean lupines = false;
|
||||
if (allergens != "") {
|
||||
lupines = true;
|
||||
}
|
||||
allergens = parts[13];
|
||||
boolean milk = false;
|
||||
if (allergens != "") {
|
||||
milk = true;
|
||||
}
|
||||
allergens = parts[14];
|
||||
boolean nuts = false;
|
||||
if (allergens != "") {
|
||||
nuts = true;
|
||||
}
|
||||
allergens = parts[15];
|
||||
boolean sulfurDioxideAndSulfite = false;
|
||||
if (allergens != "") {
|
||||
sulfurDioxideAndSulfite = true;
|
||||
}
|
||||
allergens = parts[16];
|
||||
boolean celeriac = false;
|
||||
if (allergens != "") {
|
||||
celeriac = true;
|
||||
}
|
||||
allergens = parts[17];
|
||||
boolean mustards = false;
|
||||
if (allergens != "") {
|
||||
mustards = true;
|
||||
}
|
||||
allergens = parts[18];
|
||||
boolean sesame = false;
|
||||
if (allergens != "") {
|
||||
sesame = true;
|
||||
}
|
||||
allergens = parts[19];
|
||||
boolean soy = false;
|
||||
if (allergens != "") {
|
||||
soy = true;
|
||||
}
|
||||
allergens = parts[20];
|
||||
boolean molluscs = false;
|
||||
if (allergens != "") {
|
||||
molluscs = true;
|
||||
}
|
||||
String additives = parts[21];
|
||||
boolean antioxidant = false;
|
||||
if (additives != "") {
|
||||
antioxidant = true;
|
||||
}
|
||||
additives = parts[22];
|
||||
boolean artificialColours = false;
|
||||
if (additives != "") {
|
||||
artificialColours = true;
|
||||
}
|
||||
additives = parts[23];
|
||||
boolean flavourEnhancer = false;
|
||||
if (additives != "") {
|
||||
flavourEnhancer = true;
|
||||
}
|
||||
additives = parts[24];
|
||||
boolean preservatives = false;
|
||||
if (additives != "") {
|
||||
preservatives = true;
|
||||
}
|
||||
additives = parts[25];
|
||||
boolean nitrate = false;
|
||||
if (additives != "") {
|
||||
nitrate = true;
|
||||
}
|
||||
additives = parts[26];
|
||||
boolean picklingSalt = false;
|
||||
if (additives != "") {
|
||||
picklingSalt = true;
|
||||
}
|
||||
additives = parts[27];
|
||||
boolean phosphate = false;
|
||||
if (additives != "") {
|
||||
phosphate = true;
|
||||
}
|
||||
additives = parts[28];
|
||||
boolean artificialSweetener = false;
|
||||
if (additives != "") {
|
||||
artificialSweetener = true;
|
||||
}
|
||||
|
||||
menueList.add(new Menue(date, dish, sideDish, typ, desertV, desert, eggs, peanuts, fish, grains,
|
||||
crustaceans, lupines, milk, nuts, sulfurDioxideAndSulfite, celeriac, mustards, sesame,
|
||||
soy, molluscs, antioxidant, artificialColours, flavourEnhancer, preservatives, nitrate,
|
||||
picklingSalt, phosphate, artificialSweetener));
|
||||
}
|
||||
return menueList;
|
||||
}
|
||||
/**
|
||||
* readOrder() is a method to split a order.txt into lines and save them in an arraylist
|
||||
* @return Arraylist orderlist
|
||||
* @author Madeleine Vigier, Sabine Gubitz
|
||||
* @version 1.2
|
||||
*/
|
||||
public ArrayList<Order> readOrder(){
|
||||
|
||||
ArrayList<String> orderList = new ArrayList<>();
|
||||
List<String> rows = getRows();
|
||||
|
||||
for (String row : rows) {
|
||||
String[] parts = row.split(";");
|
||||
|
||||
String date = parts[0];
|
||||
String meat = parts[1];
|
||||
@ -185,12 +212,6 @@ public class Data {
|
||||
return null;//orderList
|
||||
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The method writeData writes the data of a List into a txt file.
|
||||
@ -205,4 +226,21 @@ public class Data {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The method gets the rows by reading all lines of the path
|
||||
* @return ArrayList rows
|
||||
* @author Madeleine Vigier
|
||||
* @version 1.0
|
||||
*/
|
||||
private List<String> getRows() {
|
||||
Path path = Paths.get(pathRead);
|
||||
List<String> rows = new ArrayList<>();
|
||||
try {
|
||||
rows = Files.readAllLines(path);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user