2martens/dis
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Unified order of form items

Browse Source 
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens
2017-04-19 15:28:42 +02:00
parent 2b92772f04
commit cc50f64d86
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
02/src/de/dis2017/Main.java
View File

@ -138,8 +138,8 @@ public class Main {
if(isApartment){ if(isApartment){
Apartment apartment = (Apartment) estate; Apartment apartment = (Apartment) estate;
apartment.setFloor(FormUtil.readInt("Floor")); apartment.setFloor(FormUtil.readInt("Floor"));
apartment.setRent(FormUtil.readInt("Rent"));
apartment.setRooms(FormUtil.readInt("Rooms")); apartment.setRooms(FormUtil.readInt("Rooms"));
apartment.setRent(FormUtil.readInt("Rent"));
input = FormUtil.readString("Balcony(Y/N)"); input = FormUtil.readString("Balcony(Y/N)");
apartment.setBalcony(input.equals("Y") || input.equals("y")); apartment.setBalcony(input.equals("Y") || input.equals("y"));
input = FormUtil.readString("Built-in Kitchen(Y/N)"); input = FormUtil.readString("Built-in Kitchen(Y/N)");
@ -147,8 +147,8 @@ public class Main {
} }
else{ else{
House house = (House) estate; House house = (House) estate;
house.setFloors(FormUtil.readInt("Floors"));
house.setPrice(FormUtil.readInt("Price")); house.setPrice(FormUtil.readInt("Price"));
house.setFloors(FormUtil.readInt("Floors"));
input = FormUtil.readString("Garden(Y/N)"); input = FormUtil.readString("Garden(Y/N)");
house.setGarden(input.equals("Y") || input.equals("y")); house.setGarden(input.equals("Y") || input.equals("y"));
} }
@ -292,8 +292,8 @@ public class Main {
if (estate instanceof Apartment) { if (estate instanceof Apartment) {
Apartment apartment = (Apartment) estate; Apartment apartment = (Apartment) estate;
apartment.setFloor(FormUtil.readInt("Floor")); apartment.setFloor(FormUtil.readInt("Floor"));
apartment.setRent(FormUtil.readInt("Rent"));
apartment.setRooms(FormUtil.readInt("Rooms")); apartment.setRooms(FormUtil.readInt("Rooms"));
apartment.setRent(FormUtil.readInt("Rent"));
String input = FormUtil.readString("Balcony(Y/N)"); String input = FormUtil.readString("Balcony(Y/N)");
apartment.setBalcony(input.equals("Y") || input.equals("y")); apartment.setBalcony(input.equals("Y") || input.equals("y"));
input = FormUtil.readString("Built-in Kitchen(Y/N)"); input = FormUtil.readString("Built-in Kitchen(Y/N)");
@ -301,8 +301,8 @@ public class Main {
} }
else if (estate instanceof House){ else if (estate instanceof House){
House house = (House) estate; House house = (House) estate;
house.setFloors(FormUtil.readInt("Floors"));
house.setPrice(FormUtil.readInt("Price")); house.setPrice(FormUtil.readInt("Price"));
house.setFloors(FormUtil.readInt("Floors"));
String input = FormUtil.readString("Garden(Y/N)"); String input = FormUtil.readString("Garden(Y/N)");
house.setGarden(input.equals("Y") || input.equals("y")); house.setGarden(input.equals("Y") || input.equals("y"));
} }