From cc50f64d861f8727d34b8246fca5a73ca8b1dde0 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Wed, 19 Apr 2017 15:28:42 +0200
Subject: [PATCH] Unified order of form items

Signed-off-by: Jim Martens <github@2martens.de>
---
 02/src/de/dis2017/Main.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/02/src/de/dis2017/Main.java b/02/src/de/dis2017/Main.java
index 2c67875..6464f81 100644
--- a/02/src/de/dis2017/Main.java
+++ b/02/src/de/dis2017/Main.java
@@ -138,8 +138,8 @@ public class Main {
         if(isApartment){
             Apartment apartment = (Apartment) estate;
             apartment.setFloor(FormUtil.readInt("Floor"));
-            apartment.setRent(FormUtil.readInt("Rent"));
             apartment.setRooms(FormUtil.readInt("Rooms"));
+            apartment.setRent(FormUtil.readInt("Rent"));
             input = FormUtil.readString("Balcony(Y/N)");
             apartment.setBalcony(input.equals("Y") || input.equals("y"));
             input = FormUtil.readString("Built-in Kitchen(Y/N)");
@@ -147,8 +147,8 @@ public class Main {
         }
         else{
             House house = (House) estate;
-            house.setFloors(FormUtil.readInt("Floors"));
             house.setPrice(FormUtil.readInt("Price"));
+            house.setFloors(FormUtil.readInt("Floors"));
             input = FormUtil.readString("Garden(Y/N)");
             house.setGarden(input.equals("Y") || input.equals("y"));
         }
@@ -292,8 +292,8 @@ public class Main {
         if (estate instanceof Apartment) {
             Apartment apartment = (Apartment) estate;
             apartment.setFloor(FormUtil.readInt("Floor"));
-            apartment.setRent(FormUtil.readInt("Rent"));
             apartment.setRooms(FormUtil.readInt("Rooms"));
+            apartment.setRent(FormUtil.readInt("Rent"));
             String input = FormUtil.readString("Balcony(Y/N)");
             apartment.setBalcony(input.equals("Y") || input.equals("y"));
             input = FormUtil.readString("Built-in Kitchen(Y/N)");
@@ -301,8 +301,8 @@ public class Main {
         }
         else if (estate instanceof House){
             House house = (House) estate;
-            house.setFloors(FormUtil.readInt("Floors"));
             house.setPrice(FormUtil.readInt("Price"));
+            house.setFloors(FormUtil.readInt("Floors"));
             String input = FormUtil.readString("Garden(Y/N)");
             house.setGarden(input.equals("Y") || input.equals("y"));
         }