From c9ec1aadc2000eae4794e15c094535f1072eb0e6 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 19 Apr 2017 12:59:26 +0200 Subject: [PATCH] Shortened newEstate method Signed-off-by: Jim Martens --- 02/src/de/dis2017/Main.java | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/02/src/de/dis2017/Main.java b/02/src/de/dis2017/Main.java index b01c1af..3b77599 100644 --- a/02/src/de/dis2017/Main.java +++ b/02/src/de/dis2017/Main.java @@ -126,16 +126,13 @@ public class Main { private static void newEstate() { String input = FormUtil.readString("Apartment(A)/House(H)"); boolean isApartment = input.equals("A") || input.equals("a"); - Estate estate; + Estate estate = new Estate(); + estate.setStreet(FormUtil.readString("Street")); + estate.setStreetNumber(FormUtil.readInt("Street Number")); + estate.setPostalCode(FormUtil.readString("Postal Code")); + estate.setCity(FormUtil.readString("City")); + estate.setSquareArea(FormUtil.readInt("Square Area")); if(isApartment){ - estate = new Apartment(); - - estate.setCity(FormUtil.readString("Name")); - estate.setPostalCode(FormUtil.readString("Postal Code")); - estate.setStreet(FormUtil.readString("Street")); - estate.setStreetNumber(FormUtil.readInt("Street Number")); - estate.setSquareArea(FormUtil.readInt("Square Area")); - Apartment apartment = (Apartment) estate; apartment.setFloor(FormUtil.readInt("Floor")); apartment.setRent(FormUtil.readInt("Rent")); @@ -144,20 +141,8 @@ public class Main { apartment.setBalcony(input.equals("Y") || input.equals("y")); input = FormUtil.readString("Built-in Kitchen(Y/N)"); apartment.setBuiltinKitchen(input.equals("Y") || input.equals("y")); - - //_orm.persist(estate); - - System.out.println("Estate with the ID " + estate.getId() + " was created."); } else{ - estate = new House(); - - estate.setCity(FormUtil.readString("Name")); - estate.setPostalCode(FormUtil.readString("Postal Code")); - estate.setStreet(FormUtil.readString("Street")); - estate.setStreetNumber(FormUtil.readInt("Street Number")); - estate.setSquareArea(FormUtil.readInt("Square Area")); - House house = (House) estate; house.setFloors(FormUtil.readInt("Floors")); house.setPrice(FormUtil.readInt("Price"));