Order Klasse angepasst, sowie readOrder angepasst

src/Data.java

@@ -184,18 +184,10 @@ public class Data {
             String[] parts = row.split(";");
 
             String date = parts[0];
-            String meat = parts[1];
+            String user = parts[1];
-            int meatCount = Integer.parseInt(parts[2]);
+            String mealtyp = parts[3];
-            String vegi = parts[3];
+            String deserttyp = parts[5];
-            int vegiCount = Integer.parseInt(parts[4]);
+            orderList.add(new Order(date, user, mealtyp, deserttyp));
-            String vegan = parts[5];
-            int veganCount = Integer.parseInt(parts[6]);
-            String desertV = parts[7];
-            int desertVCount = Integer.parseInt(parts[8]);
-            String desert = parts[9];
-            int desertCount = Integer.parseInt(parts[10]);
-            orderList.add(new Order(date, meat, meatCount,vegi, vegiCount, vegan, veganCount, desertV,
-                              desertVCount, desert, desertCount));
         }
         return null;//orderList
 

src/Order.java

@@ -1,29 +1,14 @@
 public class Order {
     String date;
-    String meat;
+    String user;
-    int meatCount;
+    String mealtyp;
-    String vegi;
+    String deserttyp;
-    int vegiCount;
-    String vegan;
-    int veganCount;
-    String desertV;
-    int desertVCount;
-    String desert;
-    int desertCount;
 
-    Order (String date, String meat, int meatCount, String vegi, int vegiCount, String vegan, int veganCount,
+    Order (String date, String user, String mealtyp, String deserttyp)
-           String desertV, int desertVCount, String desert, int desertCount)
     {
         this.date = date;
-        this.meat = meat;
+        this.user = user;
-        this.meatCount = meatCount;
+        this.mealtyp = mealtyp;
-        this.vegi = vegi;
+        this.deserttyp = deserttyp;
-        this.vegiCount = vegiCount;
-        this.vegan = vegan;
-        this.veganCount = veganCount;
-        this.desertV = desertV;
-        this.desertVCount = desertVCount;
-        this.desert = desert;
-        this.desertCount = desertCount;
     }
 }