From 24e025c4d441ba046d55e6b2f4d803e359522414 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Tue, 18 Apr 2017 20:10:19 +0200 Subject: [PATCH] Fixed wrongly used identity comparisons == checks identity NOT the desired equality Signed-off-by: Jim Martens --- 02/src/de/dis2017/Main.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/02/src/de/dis2017/Main.java b/02/src/de/dis2017/Main.java index 8e5b205..607f354 100644 --- a/02/src/de/dis2017/Main.java +++ b/02/src/de/dis2017/Main.java @@ -116,7 +116,7 @@ public class Main { */ private static void newEstate() { String input = FormUtil.readString("Apartmnet(A)/House(H)"); - boolean apartment = input=="A"||input=="a"; + boolean apartment = input.equals("A") || input.equals("a"); if(apartment){ Apartment estate = new Apartment(); @@ -130,9 +130,9 @@ public class Main { estate.setRent(FormUtil.readInt("Rent")); estate.setRooms(FormUtil.readInt("Rooms")); input = FormUtil.readString("Balcony(Y/N)"); - estate.setBalcony(input=="Y"||input=="y"); + estate.setBalcony(input.equals("Y") || input.equals("y")); input = FormUtil.readString("Built-in Kitchen(Y/N)"); - estate.setBuiltinKitchen(input=="Y"||input=="y"); + estate.setBuiltinKitchen(input.equals("Y") || input.equals("y")); //_orm.persist(estate); @@ -159,7 +159,7 @@ public class Main { } /** - * TODO Change an estate agent after the usesr has entered the necessary data. + * TODO Change an estate agent after the user has entered the necessary data. */ private static void changeEstate() { //Choose Estate from List @@ -179,9 +179,9 @@ public class Main { apartment.setRent(FormUtil.readInt("Rent")); apartment.setRooms(FormUtil.readInt("Rooms")); String input = FormUtil.readString("Balcony(Y/N)"); - apartment.setBalcony(input=="Y"||input=="y"); + apartment.setBalcony(input.equals("Y") || input.equals("y")); input = FormUtil.readString("Built-in Kitchen(Y/N)"); - apartment.setBuiltinKitchen(input=="Y"||input=="y"); + apartment.setBuiltinKitchen(input.equals("Y") || input.equals("y")); //_orm.persist(apartment); @@ -199,7 +199,7 @@ public class Main { house.setFloors(FormUtil.readInt("Floors")); house.setPrice(FormUtil.readInt("Price")); String input = FormUtil.readString("Garden(Y/N)"); - house.setGarden(input=="Y"||input=="y"); + house.setGarden(input.equals("Y") || input.equals("y")); //_orm.persist(house);