diff --git a/.metadata/.lock b/.metadata/.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/.metadata/.log b/.metadata/.log
deleted file mode 100644
index 16358f8..0000000
--- a/.metadata/.log
+++ /dev/null
@@ -1,27 +0,0 @@
-!SESSION 2017-04-18 16:23:59.020 -----------------------------------------------
-eclipse.buildId=4.5.2.M20160212-1500
-java.version=1.8.0_77
-java.vendor=Oracle Corporation
-BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=de_DE
-Framework arguments: -product org.eclipse.epp.package.java.product -Xms256m -Xmx1024m -Declipse.p2.max.threads=10 -Doomph.update.url=http://download.eclipse.org/oomph/updates/milestone/latest -Doomph.redirection.index.redirection=index:/->http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/
-Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product -Xms256m -Xmx1024m -Declipse.p2.max.threads=10 -Doomph.update.url=http://download.eclipse.org/oomph/updates/milestone/latest -Doomph.redirection.index.redirection=index:/->http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/
-
-!ENTRY org.eclipse.ui 2 2 2017-04-18 16:25:12.247
-!MESSAGE Invalid property category path: org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build (bundle: org.eclipse.cdt.ui, propertyPage: org.eclipse.cdt.managedbuilder.ui.properties.BuildLogPreferencePage)
-!SESSION 2017-04-18 16:27:35.556 -----------------------------------------------
-eclipse.buildId=4.5.2.M20160212-1500
-java.version=1.8.0_77
-java.vendor=Oracle Corporation
-BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=de_DE
-Framework arguments: -product org.eclipse.epp.package.java.product -Xms256m -Xmx1024m -Declipse.p2.max.threads=10 -Doomph.update.url=http://download.eclipse.org/oomph/updates/milestone/latest -Doomph.redirection.index.redirection=index:/->http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/
-Command-line arguments: -data D:\Dokumente\GitHub\DIS\dis -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product -Xms256m -Xmx1024m -Declipse.p2.max.threads=10 -Doomph.update.url=http://download.eclipse.org/oomph/updates/milestone/latest -Doomph.redirection.index.redirection=index:/->http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/
-
-!ENTRY org.eclipse.egit.ui 2 0 2017-04-18 16:29:42.601
-!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
-user global configuration and to define the default location to store repositories: 'C:\Users\robin'. If this is
-not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
-EGit might behave differently since they see different configuration options.
-This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
-
-!ENTRY org.eclipse.ui 2 2 2017-04-18 16:45:09.630
-!MESSAGE Invalid property category path: org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build (bundle: org.eclipse.cdt.ui, propertyPage: org.eclipse.cdt.managedbuilder.ui.properties.BuildLogPreferencePage)
diff --git a/.metadata/.mylyn/.taskListIndex/segments.gen b/.metadata/.mylyn/.taskListIndex/segments.gen
deleted file mode 100644
index 63a7ec9..0000000
Binary files a/.metadata/.mylyn/.taskListIndex/segments.gen and /dev/null differ
diff --git a/.metadata/.mylyn/.taskListIndex/segments_1 b/.metadata/.mylyn/.taskListIndex/segments_1
deleted file mode 100644
index 3011547..0000000
Binary files a/.metadata/.mylyn/.taskListIndex/segments_1 and /dev/null differ
diff --git a/.metadata/.mylyn/.tasks.xml.zip b/.metadata/.mylyn/.tasks.xml.zip
deleted file mode 100644
index 391f8e6..0000000
Binary files a/.metadata/.mylyn/.tasks.xml.zip and /dev/null differ
diff --git a/.metadata/.mylyn/repositories.xml.zip b/.metadata/.mylyn/repositories.xml.zip
deleted file mode 100644
index a1bbeba..0000000
Binary files a/.metadata/.mylyn/repositories.xml.zip and /dev/null differ
diff --git a/.metadata/.mylyn/tasks.xml.zip b/.metadata/.mylyn/tasks.xml.zip
deleted file mode 100644
index 0dda69f..0000000
Binary files a/.metadata/.mylyn/tasks.xml.zip and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.cdt.core/.log b/.metadata/.plugins/org.eclipse.cdt.core/.log
deleted file mode 100644
index e69de29..0000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/11/0058403b472400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/11/0058403b472400171c12f364ff2ba386
deleted file mode 100644
index d7138ac..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/11/0058403b472400171c12f364ff2ba386
+++ /dev/null
@@ -1,124 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int QUIT = 1;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * Shows the estate management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Create EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Create EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/16/40241ee34b2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/16/40241ee34b2400171c12f364ff2ba386
deleted file mode 100644
index d411058..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/16/40241ee34b2400171c12f364ff2ba386
+++ /dev/null
@@ -1,227 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- boolean apartment = FormUtil.readString("Apartmnet(A)/House(H)")=="A"||FormUtil.readString("Apartmnet(A)/House(H)")=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloor(FormUtil.readInt("Floor"));
- estate.setRent(FormUtil.readInt("Rent"));
- estate.setRooms(FormUtil.readInt("Rooms"));
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
-
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1b/60a049af492400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/1b/60a049af492400171c12f364ff2ba386
deleted file mode 100644
index 7260eed..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1b/60a049af492400171c12f364ff2ba386
+++ /dev/null
@@ -1,53 +0,0 @@
-package de.dis2017.data;
-
-/**
- * EstateAgent data class
- */
-public class Estate {
- private int id = -1;
- private String city;
- private int postalcode;
- private String street;
- private int streetnumber;
- private int squarearea;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public int getPostalcode() {
- return postalcode;
- }
-
- public void setpostalcode(int postalcode) {
- this.postalcode = postalcode;
- }
-
- public String getStreet() {
- return street;
- }
-
- public void setStreet(String street) {
- this.street = street;
- }
-
- public int getStreetNumber() {
- return streetnumber;
- }
-
- public void setStreetnumber(String streetnumber) {
- this.streetnumber = streetnumber;
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1f/70a1a1d2492400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/1f/70a1a1d2492400171c12f364ff2ba386
deleted file mode 100644
index e69de29..0000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/34/e0866cfe482400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/34/e0866cfe482400171c12f364ff2ba386
deleted file mode 100644
index e69de29..0000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/38/709071424d2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/38/709071424d2400171c12f364ff2ba386
deleted file mode 100644
index f476368..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/38/709071424d2400171c12f364ff2ba386
+++ /dev/null
@@ -1,280 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.House;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- String input = FormUtil.readString("Apartmnet(A)/House(H)");
- boolean apartment = input=="A"||input=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloor(FormUtil.readInt("Floor"));
- estate.setRent(FormUtil.readInt("Rent"));
- estate.setRooms(FormUtil.readInt("Rooms"));
- input = FormUtil.readString("Balcony(Y/N)");
- estate.setBalcony(input=="Y"||input=="y");
- input = FormUtil.readString("Built-in Kitchen(Y/N)");
- estate.setBuiltinKitchen(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
- House estate = new House();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloors(FormUtil.readInt("Floors"));
- estate.setPrice(FormUtil.readInt("Price"));
- input = FormUtil.readString("Garden(Y/N)");
- estate.setGarden(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Apartment();//choosen Estate
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- if(estate instanceof Apartment){
- Apartment apartment = (Apartment) estate;
-
-
- apartment.setFloor(FormUtil.readInt("Floor"));
- apartment.setRent(FormUtil.readInt("Rent"));
- apartment.setRooms(FormUtil.readInt("Rooms"));
- String input = FormUtil.readString("Balcony(Y/N)");
- apartment.setBalcony(input=="Y"||input=="y");
- input = FormUtil.readString("Built-in Kitchen(Y/N)");
- apartment.setBuiltinKitchen(input=="Y"||input=="y");
-
- //_orm.persist(apartment);
-
- System.out.println("Estate with the ID " + estate.getId() + " was updated.");
- }
- else{
- House house = (House)estate;
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- house.setFloors(FormUtil.readInt("Floors"));
- house.setPrice(FormUtil.readInt("Price"));
- String input = FormUtil.readString("Garden(Y/N)");
- house.setGarden(input=="Y"||input=="y");
-
- //_orm.persist(house);
-
- System.out.println("Estate with the ID " + estate.getId() + " was updated.");
- }
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Apartment();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was updated.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3e/50701921482400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/3e/50701921482400171c12f364ff2ba386
deleted file mode 100644
index 2d31a53..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3e/50701921482400171c12f364ff2ba386
+++ /dev/null
@@ -1,124 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int QUIT = 1;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * Shows the estate management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/42/703cc5ef4a2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/42/703cc5ef4a2400171c12f364ff2ba386
deleted file mode 100644
index 0bd9f29..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/42/703cc5ef4a2400171c12f364ff2ba386
+++ /dev/null
@@ -1,223 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- boolean apartment = FormUtil.readString("Apartmnet(A)/House(H)")=="A"||FormUtil.readString("Apartmnet(A)/House(H)")=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- _orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
-
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/80b200a8492400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/4e/80b200a8492400171c12f364ff2ba386
deleted file mode 100644
index 5e5355e..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/80b200a8492400171c12f364ff2ba386
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.dis2017.data;
-
-public class Estate {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4f/80228a064c2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/4f/80228a064c2400171c12f364ff2ba386
deleted file mode 100644
index 8b50399..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4f/80228a064c2400171c12f364ff2ba386
+++ /dev/null
@@ -1,229 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- String input = FormUtil.readString("Apartmnet(A)/House(H)");
- boolean apartment = input=="A"||input=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloor(FormUtil.readInt("Floor"));
- estate.setRent(FormUtil.readInt("Rent"));
- estate.setRooms(FormUtil.readInt("Rooms"));
- estate.setBalcony(FormUtil.readString("Balcony(Y/N)")=="Y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
-
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/50/309c4baf492400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/50/309c4baf492400171c12f364ff2ba386
deleted file mode 100644
index 24c4e64..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/50/309c4baf492400171c12f364ff2ba386
+++ /dev/null
@@ -1,171 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/52/80b179c1492400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/52/80b179c1492400171c12f364ff2ba386
deleted file mode 100644
index 344eb6a..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/52/80b179c1492400171c12f364ff2ba386
+++ /dev/null
@@ -1,53 +0,0 @@
-package de.dis2017.data;
-
-/**
- * EstateAgent data class
- */
-public class Estate {
- private int id = -1;
- private String city;
- private int postalcode;
- private String street;
- private int streetnumber;
- private int squarearea;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public int getPostalcode() {
- return postalcode;
- }
-
- public void setpostalcode(int postalcode) {
- this.postalcode = postalcode;
- }
-
- public String getStreet() {
- return street;
- }
-
- public void setStreet(String street) {
- this.street = street;
- }
-
- public int getStreetNumber() {
- return streetnumber;
- }
-
- public void setStreetnumber(int streetnumber) {
- this.streetnumber = streetnumber;
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/56/b0801e42482400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/56/b0801e42482400171c12f364ff2ba386
deleted file mode 100644
index 3e644d2..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/56/b0801e42482400171c12f364ff2ba386
+++ /dev/null
@@ -1,171 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/71/50ecc576472400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/71/50ecc576472400171c12f364ff2ba386
deleted file mode 100644
index ac8ce4e..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/71/50ecc576472400171c12f364ff2ba386
+++ /dev/null
@@ -1,124 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int QUIT = 1;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * Shows the estate management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Create EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Create EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/74/605fb5364c2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/74/605fb5364c2400171c12f364ff2ba386
deleted file mode 100644
index 5adee18..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/74/605fb5364c2400171c12f364ff2ba386
+++ /dev/null
@@ -1,232 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- String input = FormUtil.readString("Apartmnet(A)/House(H)");
- boolean apartment = input=="A"||input=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloor(FormUtil.readInt("Floor"));
- estate.setRent(FormUtil.readInt("Rent"));
- estate.setRooms(FormUtil.readInt("Rooms"));
- input = FormUtil.readString("Balcony(Y/N)");
- estate.setBalcony(input=="Y"||input=="y");
- input = FormUtil.readString("Built-in Kitchen(Y/N)");
- estate.setBuiltinKitchen(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
-
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/77/d08c80d74c2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/77/d08c80d74c2400171c12f364ff2ba386
deleted file mode 100644
index 0ec99f9..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/77/d08c80d74c2400171c12f364ff2ba386
+++ /dev/null
@@ -1,61 +0,0 @@
-package de.dis2017.data;
-
-/**
- * EstateAgent data class
- */
-public class Estate {
- private int id = -1;
- private String city;
- private int postalcode;
- private String street;
- private int streetnumber;
- private int squarearea;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public int getPostalcode() {
- return postalcode;
- }
-
- public void setPostalcode(int postalcode) {
- this.postalcode = postalcode;
- }
-
- public String getStreet() {
- return street;
- }
-
- public void setStreet(String street) {
- this.street = street;
- }
-
- public int getStreetNumber() {
- return streetnumber;
- }
-
- public void setStreetnumber(int streetnumber) {
- this.streetnumber = streetnumber;
- }
-
- public int getSquareArea() {
- return streetnumber;
- }
-
- public void setSquareArea(int squarearea) {
- this.squarearea = squarearea;
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8/3040a9884b2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/8/3040a9884b2400171c12f364ff2ba386
deleted file mode 100644
index 1d14756..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8/3040a9884b2400171c12f364ff2ba386
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.dis2017.data;
-
-public class House extends Estate {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/92/d0c9feae4b2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/92/d0c9feae4b2400171c12f364ff2ba386
deleted file mode 100644
index 23dc7fb..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/92/d0c9feae4b2400171c12f364ff2ba386
+++ /dev/null
@@ -1,223 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- boolean apartment = FormUtil.readString("Apartmnet(A)/House(H)")=="A"||FormUtil.readString("Apartmnet(A)/House(H)")=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
-
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9b/c04ba535482400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/9b/c04ba535482400171c12f364ff2ba386
deleted file mode 100644
index ceb3237..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9b/c04ba535482400171c12f364ff2ba386
+++ /dev/null
@@ -1,171 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination
- System.out.println("EstateAgent with the ID " + agent.getId() + " logged in succesfully.")
-
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a6/00fa2711472400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/a6/00fa2711472400171c12f364ff2ba386
deleted file mode 100644
index b4105dc..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a6/00fa2711472400171c12f364ff2ba386
+++ /dev/null
@@ -1,99 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int QUIT = 1;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * Shows the estate management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Create EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Create EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/902496d04a2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/aa/902496d04a2400171c12f364ff2ba386
deleted file mode 100644
index eec2b4f..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/902496d04a2400171c12f364ff2ba386
+++ /dev/null
@@ -1,222 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- boolean apartment = FormUtil.readString("Apartmnet(A)/House(H)")=="A"||FormUtil.readString("Apartmnet(A)/House(H)")=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
-
- _orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
-
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b0/d0aa90244a2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/b0/d0aa90244a2400171c12f364ff2ba386
deleted file mode 100644
index 2025413..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b0/d0aa90244a2400171c12f364ff2ba386
+++ /dev/null
@@ -1,61 +0,0 @@
-package de.dis2017.data;
-
-/**
- * EstateAgent data class
- */
-public class Estate {
- private int id = -1;
- private String city;
- private int postalcode;
- private String street;
- private int streetnumber;
- private int squarearea;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public int getPostalcode() {
- return postalcode;
- }
-
- public void setpostalcode(int postalcode) {
- this.postalcode = postalcode;
- }
-
- public String getStreet() {
- return street;
- }
-
- public void setStreet(String street) {
- this.street = street;
- }
-
- public int getStreetNumber() {
- return streetnumber;
- }
-
- public void setStreetnumber(int streetnumber) {
- this.streetnumber = streetnumber;
- }
-
- public int getSquareArea() {
- return streetnumber;
- }
-
- public void setSquareArea(int squarearea) {
- this.squarearea = squarearea;
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/bd/70de81e7492400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/bd/70de81e7492400171c12f364ff2ba386
deleted file mode 100644
index e69de29..0000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c4/80ab84d74c2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/c4/80ab84d74c2400171c12f364ff2ba386
deleted file mode 100644
index d16c656..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c4/80ab84d74c2400171c12f364ff2ba386
+++ /dev/null
@@ -1,248 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.House;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- String input = FormUtil.readString("Apartmnet(A)/House(H)");
- boolean apartment = input=="A"||input=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloor(FormUtil.readInt("Floor"));
- estate.setRent(FormUtil.readInt("Rent"));
- estate.setRooms(FormUtil.readInt("Rooms"));
- input = FormUtil.readString("Balcony(Y/N)");
- estate.setBalcony(input=="Y"||input=="y");
- input = FormUtil.readString("Built-in Kitchen(Y/N)");
- estate.setBuiltinKitchen(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
- House estate = new House();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloors(FormUtil.readInt("Floors"));
- estate.setPrice(FormUtil.readInt("Price"));
- input = FormUtil.readString("Garden(Y/N)");
- estate.setGarden(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c5/e076daf4492400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/c5/e076daf4492400171c12f364ff2ba386
deleted file mode 100644
index 23f8eae..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c5/e076daf4492400171c12f364ff2ba386
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.dis2017.data;
-
-public class Apartment {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c7/a0f624bf4a2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/c7/a0f624bf4a2400171c12f364ff2ba386
deleted file mode 100644
index f01c84b..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c7/a0f624bf4a2400171c12f364ff2ba386
+++ /dev/null
@@ -1,215 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- Estate estate = new Estate();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(estate);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d7/50e391244a2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/d7/50e391244a2400171c12f364ff2ba386
deleted file mode 100644
index a1889d3..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d7/50e391244a2400171c12f364ff2ba386
+++ /dev/null
@@ -1,214 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.*;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- Estate estate = new Estate();
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(estate);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d8/6084688c462400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/d8/6084688c462400171c12f364ff2ba386
deleted file mode 100644
index a0651a4..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d8/6084688c462400171c12f364ff2ba386
+++ /dev/null
@@ -1,89 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int QUIT = 1;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * Shows the estate management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int BACK = 1;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/dc/40380e764b2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/dc/40380e764b2400171c12f364ff2ba386
deleted file mode 100644
index c202699..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/dc/40380e764b2400171c12f364ff2ba386
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.dis2017.data;
-
-public class Apartment extends Estate{
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/701b840e4d2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/e9/701b840e4d2400171c12f364ff2ba386
deleted file mode 100644
index 6dbd727..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/701b840e4d2400171c12f364ff2ba386
+++ /dev/null
@@ -1,280 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.House;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- String input = FormUtil.readString("Apartmnet(A)/House(H)");
- boolean apartment = input=="A"||input=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloor(FormUtil.readInt("Floor"));
- estate.setRent(FormUtil.readInt("Rent"));
- estate.setRooms(FormUtil.readInt("Rooms"));
- input = FormUtil.readString("Balcony(Y/N)");
- estate.setBalcony(input=="Y"||input=="y");
- input = FormUtil.readString("Built-in Kitchen(Y/N)");
- estate.setBuiltinKitchen(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
- House estate = new House();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloors(FormUtil.readInt("Floors"));
- estate.setPrice(FormUtil.readInt("Price"));
- input = FormUtil.readString("Garden(Y/N)");
- estate.setGarden(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- if(estate instanceof Apartment){
- Apartment apartment = (Apartment) estate;
-
-
- apartment.setFloor(FormUtil.readInt("Floor"));
- apartment.setRent(FormUtil.readInt("Rent"));
- apartment.setRooms(FormUtil.readInt("Rooms"));
- String input = FormUtil.readString("Balcony(Y/N)");
- apartment.setBalcony(input=="Y"||input=="y");
- input = FormUtil.readString("Built-in Kitchen(Y/N)");
- apartment.setBuiltinKitchen(input=="Y"||input=="y");
-
- //_orm.persist(apartment);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
- House house = (House)estate;
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- house.setFloors(FormUtil.readInt("Floors"));
- house.setPrice(FormUtil.readInt("Price"));
- String input = FormUtil.readString("Garden(Y/N)");
- house.setGarden(input=="Y"||input=="y");
-
- //_orm.persist(house);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ef/d02f44ee4c2400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/ef/d02f44ee4c2400171c12f364ff2ba386
deleted file mode 100644
index a7bb586..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ef/d02f44ee4c2400171c12f364ff2ba386
+++ /dev/null
@@ -1,280 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.Apartment;
-import de.dis2017.data.Estate;
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.House;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- String input = FormUtil.readString("Apartmnet(A)/House(H)");
- boolean apartment = input=="A"||input=="a";
- if(apartment){
- Apartment estate = new Apartment();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloor(FormUtil.readInt("Floor"));
- estate.setRent(FormUtil.readInt("Rent"));
- estate.setRooms(FormUtil.readInt("Rooms"));
- input = FormUtil.readString("Balcony(Y/N)");
- estate.setBalcony(input=="Y"||input=="y");
- input = FormUtil.readString("Built-in Kitchen(Y/N)");
- estate.setBuiltinKitchen(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
- House estate = new House();
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloors(FormUtil.readInt("Floors"));
- estate.setPrice(FormUtil.readInt("Price"));
- input = FormUtil.readString("Garden(Y/N)");
- estate.setGarden(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- if(estate instanceof Apartment){
- Apartment apartment = (Apartment) estate;
-
-
- apartment.setFloor(FormUtil.readInt("Floor"));
- apartment.setRent(FormUtil.readInt("Rent"));
- apartment.setRooms(FormUtil.readInt("Rooms"));
- String input = FormUtil.readString("Balcony(Y/N)");
- apartment.setBalcony(input=="Y"||input=="y");
- input = FormUtil.readString("Built-in Kitchen(Y/N)");
- apartment.setBuiltinKitchen(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- else{
- House house = (House)
-
- estate.setCity(FormUtil.readString("Name"));
- estate.setPostalcode(FormUtil.readInt("Postal Code"));
- estate.setStreet(FormUtil.readString("Street"));
- estate.setStreetnumber(FormUtil.readInt("Street Number"));
- estate.setSquareArea(FormUtil.readInt("Square Area"));
-
- estate.setFloors(FormUtil.readInt("Floors"));
- estate.setPrice(FormUtil.readInt("Price"));
- input = FormUtil.readString("Garden(Y/N)");
- estate.setGarden(input=="Y"||input=="y");
-
- //_orm.persist(estate);
-
- System.out.println("Estate with the ID " + estate.getId() + " was created.");
- }
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f8/c0234293482400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/f8/c0234293482400171c12f364ff2ba386
deleted file mode 100644
index 987e807..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f8/c0234293482400171c12f364ff2ba386
+++ /dev/null
@@ -1,171 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/20a2d8f4492400171c12f364ff2ba386 b/.metadata/.plugins/org.eclipse.core.resources/.history/ff/20a2d8f4492400171c12f364ff2ba386
deleted file mode 100644
index 4517f27..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/20a2d8f4492400171c12f364ff2ba386
+++ /dev/null
@@ -1,214 +0,0 @@
-package de.dis2017;
-
-import de.dis2017.data.EstateAgent;
-import de.dis2017.data.db.ORM;
-
-/**
- * Main class
- */
-public class Main {
- private static ORM _orm;
-
- /**
- * Starts the application.
- */
- public static void main(String[] args) {
- _orm = new ORM();
- showMainMenu();
- }
-
- /**
- * Shows the main menu.
- */
- private static void showMainMenu() {
- // menu options
- final int MENU_AGENT = 0;
- final int MENU_ESTATES = 1;
- final int QUIT = 2;
-
- // create menu
- Menu mainMenu = new Menu("Main menu");
- mainMenu.addEntry("EstateAgent management", MENU_AGENT);
- mainMenu.addEntry("Estate management", MENU_ESTATES);
- mainMenu.addEntry("Quit", QUIT);
-
- // process input
- while(true) {
- int response = mainMenu.show();
-
- switch(response) {
- case MENU_AGENT:
- showEstateAgentMenu();
- break;
- case MENU_ESTATES:
- showEstateMenu();
- break;
- case QUIT:
- return;
- }
- }
- }
-
- /**
- * TODO Shows the estate management.
- */
- private static void showEstateMenu() {
- String username = FormUtil.readString("Username");
- String password = FormUtil.readString("Password");
- // TODO Check username password combination else back to MainMenu
- System.out.println("EstateAgent "+username+" logged in succesfully.");
-
- // menu options
- final int NEW_ESTATE = 0;
- final int CHANGE_ESTATE = 1;
- final int DELETE_ESTATE = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateMenu = new Menu("Estate management");
- estateMenu.addEntry("Create Estate", NEW_ESTATE);
- estateMenu.addEntry("Change Estate", CHANGE_ESTATE);
- estateMenu.addEntry("Delete Estate", DELETE_ESTATE);
- estateMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateMenu.show();
-
- switch(response) {
- case NEW_ESTATE:
- newEstate();
- break;
- case CHANGE_ESTATE:
- changeEstate();
- break;
- case DELETE_ESTATE:
- deleteEstate();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstate() {
- Estate estate = new Estate();
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(estate);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstate() {
- //Choose Estate from List
- Estate estate = new Estate();//choosen Estate
-
- estate.setName(FormUtil.readString("Name"));
- estate.setAddress(FormUtil.readString("Address"));
- estate.setLogin(FormUtil.readString("Login"));
- estate.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + estate.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate.
- */
- private static void deleteEstate() {
- //Choose estate from list.
- Estate estate = new Estate();//choosen estate.
- //Delete Agent
- System.out.println("EstateAgent with the ID " + estate.getId() + " was deleted.");
- }
-
- /**
- * Shows the estate agent management.
- */
- private static void showEstateAgentMenu() {
- // menu options
- final int NEW_AGENT = 0;
- final int CHANGE_AGENT = 1;
- final int DELETE_AGENT = 2;
- final int BACK = 3;
-
- // estate management menu
- Menu estateAgentMenu = new Menu("EstateAgent management");
- estateAgentMenu.addEntry("Create EstateAgent", NEW_AGENT);
- estateAgentMenu.addEntry("Change EstateAgent", CHANGE_AGENT);
- estateAgentMenu.addEntry("Delete EstateAgent", DELETE_AGENT);
- estateAgentMenu.addEntry("Back to the main menu", BACK);
-
- // process input
- while(true) {
- int response = estateAgentMenu.show();
-
- switch(response) {
- case NEW_AGENT:
- newEstateAgent();
- break;
- case CHANGE_AGENT:
- changeEstateAgent();
- break;
- case DELETE_AGENT:
- deleteEstateAgent();
- break;
- case BACK:
- return;
- }
- }
- }
-
- /**
- * Creates a new estate agent after the usesr has entered the necessary data.
- */
- private static void newEstateAgent() {
- EstateAgent agent = new EstateAgent();
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- _orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was created.");
- }
-
- /**
- * TODO Change an estate agent after the usesr has entered the necessary data.
- */
- private static void changeEstateAgent() {
- EstateAgent agent = new EstateAgent();//logged in Agent
-
- agent.setName(FormUtil.readString("Name"));
- agent.setAddress(FormUtil.readString("Address"));
- agent.setLogin(FormUtil.readString("Login"));
- agent.setPassword(FormUtil.readString("Password"));
-
- //_orm.persist(agent);
-
- System.out.println("EstateAgent with the ID " + agent.getId() + " was changed.");
- }
-
- /**
- * TODO Deletes an estate agent.
- */
- private static void deleteEstateAgent() {
- //Delete Agent
- EstateAgent agent = new EstateAgent();//logged in Agent
- System.out.println("EstateAgent with the ID " + agent.getId() + " was deleted.");
- }
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.indexes/e4/81/72/aa/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.indexes/e4/81/72/aa/history.index
deleted file mode 100644
index 3ba717d..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.indexes/e4/81/72/aa/history.index and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.indexes/e4/81/72/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.indexes/e4/81/72/history.index
deleted file mode 100644
index 002483a..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.indexes/e4/81/72/history.index and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.markers.snap
deleted file mode 100644
index 3ce4fe2..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.syncinfo.snap
deleted file mode 100644
index 6fe4a90..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/02/.syncinfo.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
deleted file mode 100644
index 25cb955..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
deleted file mode 100644
index 856e238..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
deleted file mode 100644
index 6b2aaa7..0000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
deleted file mode 100644
index cbb1524..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
deleted file mode 100644
index 8a1fc9e..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
deleted file mode 100644
index 55f6e47..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/1.snap b/.metadata/.plugins/org.eclipse.core.resources/1.snap
deleted file mode 100644
index 8f57ec3..0000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/1.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index dffc6b5..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-version=1
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
deleted file mode 100644
index 9dd00d6..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\r\n\r\n
-preferredTargets=default\:default|
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.logging.aeri.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.logging.aeri.ide.prefs
deleted file mode 100644
index c186df8..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.logging.aeri.ide.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-resetSendMode=KEEP
-resetSendModeOn=0
-sendMode=NOTIFY
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c24a64f..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 31acf06..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n\r\n\r\n\r\n\r\n
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index cad9e0d..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,19 +0,0 @@
-content_assist_disabled_computers=org.eclipse.jdt.ui.textProposalCategory\u0000org.eclipse.recommenders.calls.rcp.proposalCategory.templates\u0000org.eclipse.mylyn.java.ui.javaAllProposalCategory\u0000org.eclipse.jdt.ui.javaAllProposalCategory\u0000org.eclipse.jdt.ui.javaTypeProposalCategory\u0000org.eclipse.jdt.ui.javaNoTypeProposalCategory\u0000org.eclipse.recommenders.chain.rcp.proposalCategory.chain\u0000
-content_assist_number_of_computers=21
-content_assist_proposals_background=255,255,255
-content_assist_proposals_foreground=0,0,0
-eclipse.preferences.version=1
-fontPropagated=true
-org.eclipse.jdt.ui.editor.tab.width=
-org.eclipse.jdt.ui.formatterprofiles.version=12
-org.eclipse.jdt.ui.javadoclocations.migrated=true
-org.eclipse.jdt.ui.text.code_templates_migrated=true
-org.eclipse.jdt.ui.text.custom_code_templates=
-org.eclipse.jdt.ui.text.custom_templates=
-org.eclipse.jdt.ui.text.templates_migrated=true
-org.eclipse.jface.textfont=1|Courier New|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Courier New;
-proposalOrderMigrated=true
-spelling_locale_initialized=true
-tabWidthPropagated=true
-useAnnotationsPrefPage=true
-useQuickDiffPrefPage=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
deleted file mode 100644
index 67b1d96..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.m2e.discovery.pref.projects=
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
deleted file mode 100644
index 43e97e4..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-mylyn.attention.migrated=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
deleted file mode 100644
index 8d462a6..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 2b60c21..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-migrated.task.repositories.secure.store=true
-org.eclipse.mylyn.tasks.ui.filters.nonmatching=true
-org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true
-org.eclipse.mylyn.tasks.ui.welcome.message=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.recommenders.completion.rcp.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.recommenders.completion.rcp.prefs
deleted file mode 100644
index a0ebc15..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.recommenders.completion.rcp.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-completion_tips_seen=org.eclipse.recommenders.completion.rcp.tips.types
-eclipse.preferences.version=1
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
deleted file mode 100644
index 0734bfe..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-PROBLEMS_FILTERS_MIGRATE=true
-eclipse.preferences.version=1
-platformState=1477429056778
-quickStart=false
-tipsAndTricks=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
deleted file mode 100644
index 08076f2..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-showIntro=false
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
deleted file mode 100644
index dd77496..0000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false
-PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery;
-eclipse.preferences.version=1
diff --git a/.metadata/.plugins/org.eclipse.debug.core/.launches/Main.launch b/.metadata/.plugins/org.eclipse.debug.core/.launches/Main.launch
deleted file mode 100644
index 66bea07..0000000
--- a/.metadata/.plugins/org.eclipse.debug.core/.launches/Main.launch
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
deleted file mode 100644
index 0c4fd42..0000000
--- a/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
deleted file mode 100644
index bdb5074..0000000
--- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
+++ /dev/null
@@ -1,2620 +0,0 @@
-
-
-
- activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration
- ModelMigrationProcessor.001
-
-
-
-
-
-
-
- topLevel
- shellMaximized
-
-
-
-
- persp.actionSet:org.eclipse.mylyn.doc.actionSet
- persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation
- persp.actionSet:org.eclipse.ui.cheatsheets.actionSet
- persp.actionSet:org.eclipse.search.searchActionSet
- persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation
- persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation
- persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo
- persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet
- persp.actionSet:org.eclipse.ui.actionSet.keyBindings
- persp.actionSet:org.eclipse.ui.actionSet.openFiles
- persp.actionSet:org.eclipse.wb.core.ui.actionset
- persp.actionSet:org.eclipse.debug.ui.launchActionSet
- persp.actionSet:org.eclipse.jdt.ui.JavaActionSet
- persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet
- persp.actionSet:org.eclipse.ui.NavigateActionSet
- persp.viewSC:org.eclipse.jdt.ui.PackageExplorer
- persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy
- persp.viewSC:org.eclipse.jdt.ui.SourceView
- persp.viewSC:org.eclipse.jdt.ui.JavadocView
- persp.viewSC:org.eclipse.search.ui.views.SearchView
- persp.viewSC:org.eclipse.ui.console.ConsoleView
- persp.viewSC:org.eclipse.ui.views.ContentOutline
- persp.viewSC:org.eclipse.ui.views.ProblemView
- persp.viewSC:org.eclipse.ui.views.ResourceNavigator
- persp.viewSC:org.eclipse.ui.views.TaskList
- persp.viewSC:org.eclipse.ui.views.ProgressView
- persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer
- persp.viewSC:org.eclipse.ui.texteditor.TemplatesView
- persp.viewSC:org.eclipse.pde.runtime.LogView
- persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard
- persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard
- persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard
- persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard
- persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard
- persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard
- persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard
- persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard
- persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard
- persp.newWizSC:org.eclipse.ui.wizards.new.folder
- persp.newWizSC:org.eclipse.ui.wizards.new.file
- persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard
- persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective
- persp.perspSC:org.eclipse.debug.ui.DebugPerspective
- persp.viewSC:org.eclipse.ant.ui.views.AntView
- persp.showIn:org.eclipse.egit.ui.RepositoriesView
- persp.actionSet:org.eclipse.debug.ui.breakpointActionSet
- persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet
- persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard
- persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet
- persp.showIn:org.eclipse.jdt.ui.PackageExplorer
- persp.showIn:org.eclipse.team.ui.GenericHistoryView
- persp.showIn:org.eclipse.ui.views.ResourceNavigator
- persp.showIn:org.eclipse.ui.navigator.ProjectExplorer
- persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks
- persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task
- persp.viewSC:org.eclipse.wb.core.StructureView
- persp.viewSC:org.eclipse.wb.core.PaletteView
-
-
-
- org.eclipse.e4.primaryNavigationStack
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.eclipse.e4.secondaryNavigationStack
-
-
-
-
-
-
-
- org.eclipse.e4.secondaryDataStack
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- View
- categoryTag:Help
-
-
-
- View
- categoryTag:General
-
- ViewMenu
- menuContribution:menu
-
-
-
-
- View
- categoryTag:Help
-
-
-
- org.eclipse.e4.primaryDataStack
- EditorStack
- active
- noFocus
-
-
- Editor
- org.eclipse.jdt.ui.CompilationUnitEditor
- removeOnHide
- active
-
- menuContribution:popup
- popup:#CompilationUnitEditorContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext
- popup:#AbstractTextEditorContext
-
-
- menuContribution:popup
- popup:#CompilationUnitRulerContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext
- popup:#AbstractTextEditorRulerContext
-
-
- menuContribution:popup
- popup:#OverviewRulerContext
-
-
-
-
- Editor
- org.eclipse.jdt.ui.CompilationUnitEditor
- removeOnHide
-
- menuContribution:popup
- popup:#CompilationUnitEditorContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext
- popup:#AbstractTextEditorContext
-
-
- menuContribution:popup
- popup:#CompilationUnitRulerContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext
- popup:#AbstractTextEditorRulerContext
-
-
- menuContribution:popup
- popup:#OverviewRulerContext
-
-
-
-
- Editor
- org.eclipse.jdt.ui.CompilationUnitEditor
- removeOnHide
-
- menuContribution:popup
- popup:#CompilationUnitEditorContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext
- popup:#AbstractTextEditorContext
-
-
- menuContribution:popup
- popup:#CompilationUnitRulerContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext
- popup:#AbstractTextEditorRulerContext
-
-
- menuContribution:popup
- popup:#OverviewRulerContext
-
-
-
-
- Editor
- org.eclipse.jdt.ui.CompilationUnitEditor
- removeOnHide
-
- menuContribution:popup
- popup:#CompilationUnitEditorContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext
- popup:#AbstractTextEditorContext
-
-
- menuContribution:popup
- popup:#CompilationUnitRulerContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext
- popup:#AbstractTextEditorRulerContext
-
-
- menuContribution:popup
- popup:#OverviewRulerContext
-
-
-
-
- Editor
- org.eclipse.jdt.ui.CompilationUnitEditor
- removeOnHide
-
- menuContribution:popup
- popup:#CompilationUnitEditorContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext
- popup:#AbstractTextEditorContext
-
-
- menuContribution:popup
- popup:#CompilationUnitRulerContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext
- popup:#AbstractTextEditorRulerContext
-
-
- menuContribution:popup
- popup:#OverviewRulerContext
-
-
-
-
- Editor
- org.eclipse.jdt.ui.CompilationUnitEditor
- removeOnHide
-
- menuContribution:popup
- popup:#CompilationUnitEditorContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext
- popup:#AbstractTextEditorContext
-
-
- menuContribution:popup
- popup:#CompilationUnitRulerContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext
- popup:#AbstractTextEditorRulerContext
-
-
- menuContribution:popup
- popup:#OverviewRulerContext
-
-
-
-
- Editor
- org.eclipse.jdt.ui.CompilationUnitEditor
- removeOnHide
-
- menuContribution:popup
- popup:#CompilationUnitEditorContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext
- popup:#AbstractTextEditorContext
-
-
- menuContribution:popup
- popup:#CompilationUnitRulerContext
- popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext
- popup:#AbstractTextEditorRulerContext
-
-
- menuContribution:popup
- popup:#OverviewRulerContext
-
-
-
-
-
-
- View
- categoryTag:Java
-
- ViewMenu
- menuContribution:menu
-
-
- menuContribution:popup
- popup:org.eclipse.jdt.ui.PackageExplorer
-
-
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
-
- View
- categoryTag:General
-
- ViewMenu
- menuContribution:menu
-
-
- menuContribution:popup
- popup:org.eclipse.ui.views.ProblemView
- popup:org.eclipse.ui.ide.MarkersView
-
-
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:General
-
-
-
- View
- categoryTag:General
-
- ViewMenu
- menuContribution:menu
-
-
- menuContribution:popup
- popup:org.eclipse.debug.ui.ProcessConsoleType.#ContextMenu
-
-
- menuContribution:popup
- popup:org.eclipse.debug.ui.ProcessConsoleType.#ContextMenu
-
-
- menuContribution:popup
- popup:org.eclipse.debug.ui.ProcessConsoleType.#ContextMenu
-
-
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
-
- View
- categoryTag:General
-
- ViewMenu
- menuContribution:menu
-
-
- menuContribution:popup
- popup:org.eclipse.jdt.ui.outline
-
-
- menuContribution:popup
- popup:org.eclipse.jdt.ui.outline
-
-
- menuContribution:popup
- popup:org.eclipse.jdt.ui.outline
-
-
- menuContribution:popup
- popup:org.eclipse.jdt.ui.outline
-
-
- menuContribution:popup
- popup:org.eclipse.jdt.ui.outline
-
-
- menuContribution:popup
- popup:org.eclipse.jdt.ui.outline
-
-
- menuContribution:popup
- popup:org.eclipse.jdt.ui.outline
-
-
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:Ant
-
-
- View
- categoryTag:Git
-
-
- View
- categoryTag:Java
-
-
-
- View
- categoryTag:Mylyn
-
- ViewMenu
- menuContribution:menu
-
-
- menuContribution:popup
- popup:org.eclipse.mylyn.tasks.ui.menus.activeTask
-
-
- menuContribution:popup
- popup:org.eclipse.mylyn.tasks.ui.views.tasks
-
-
-
-
- View
- categoryTag:WindowBuilder
-
-
- View
- categoryTag:WindowBuilder
-
-
-
- toolbarSeparator
-
-
-
- Draggable
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
-
- toolbarSeparator
-
-
-
- Draggable
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
-
- Draggable
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
-
- Draggable
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
-
- Draggable
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
-
- toolbarSeparator
-
-
-
- Draggable
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
-
- Opaque
-
-
- Opaque
-
-
- Opaque
-
-
-
- Draggable
-
-
- toolbarSeparator
-
-
-
- toolbarSeparator
-
-
-
- Draggable
-
- Opaque
-
-
- Opaque
-
-
-
- stretch
- SHOW_RESTORE_MENU
-
-
- Draggable
- HIDEABLE
- SHOW_RESTORE_MENU
-
-
-
-
- stretch
-
-
- Draggable
-
-
- Draggable
-
-
-
-
- TrimStack
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- locale:de
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- platform:win32
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Editor
-
-
- View
- categoryTag:Ant
-
-
- View
- categoryTag:Gradle
-
-
- View
- categoryTag:Gradle
-
-
- View
- categoryTag:Debug
-
-
- View
- categoryTag:Debug
-
-
- View
- categoryTag:Debug
-
-
- View
- categoryTag:Debug
-
-
- View
- categoryTag:Debug
-
-
- View
- categoryTag:Debug
-
-
- View
- categoryTag:Debug
-
-
- View
- categoryTag:Git
-
-
- View
- categoryTag:Git
-
-
- View
- categoryTag:Git
-
-
- View
- categoryTag:Git
-
-
- View
- categoryTag:Git
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:Help
-
-
- View
- categoryTag:Debug
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:Java Browsing
-
-
- View
- categoryTag:Java Browsing
-
-
- View
- categoryTag:Java Browsing
-
-
- View
- categoryTag:Java Browsing
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:Java
-
-
- View
- categoryTag:Maven
-
-
- View
- categoryTag:Maven
-
-
- View
- categoryTag:Mylyn
-
-
- View
- categoryTag:Mylyn
-
-
- View
- categoryTag:Mylyn
-
-
- View
- categoryTag:Mylyn
-
-
- View
- categoryTag:Code Recommenders
-
-
- View
- categoryTag:Code Recommenders
-
-
- View
- categoryTag:Code Recommenders
-
-
- View
- categoryTag:Code Recommenders
-
-
- View
- categoryTag:Code Recommenders
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:Team
-
-
- View
- categoryTag:Team
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:Help
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:WindowBuilder
-
-
- View
- categoryTag:WindowBuilder
-
-
- View
- categoryTag:General
-
-
- View
- categoryTag:XML
-
-
- View
- categoryTag:XML
-
-
- View
- categoryTag:Oomph
-
-
- View
- categoryTag:Colligens
-
-
- View
- categoryTag:Colligens
-
-
- View
- categoryTag:Colligens
-
-
- View
- categoryTag:Colligens
-
-
- View
- categoryTag:FeatureIDE
-
-
- View
- categoryTag:FeatureIDE
-
-
- View
- categoryTag:FeatureIDE
-
-
- View
- categoryTag:FeatureIDE
-
-
- View
- categoryTag:C/C++
-
-
- View
- categoryTag:C/C++
-
-
- View
- categoryTag:C/C++
-
-
- View
- categoryTag:C/C++
-
-
- View
- categoryTag:C/C++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fdt b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fdt
deleted file mode 100644
index d5abf41..0000000
Binary files a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fdt and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fdx b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fdx
deleted file mode 100644
index b8ee809..0000000
Binary files a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fdx and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fnm b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fnm
deleted file mode 100644
index 523c92e..0000000
--- a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.fnm
+++ /dev/null
@@ -1 +0,0 @@
-version
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.frq b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.frq
deleted file mode 100644
index e69de29..0000000
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.nrm b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.nrm
deleted file mode 100644
index cf8dc75..0000000
--- a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.nrm
+++ /dev/null
@@ -1 +0,0 @@
-NRM
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.tii b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.tii
deleted file mode 100644
index ebd518d..0000000
Binary files a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.tii and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.tis b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.tis
deleted file mode 100644
index ebd518d..0000000
Binary files a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/_0.tis and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments.gen b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments.gen
deleted file mode 100644
index 63a7ec9..0000000
Binary files a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments.gen and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments_1 b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments_1
deleted file mode 100644
index 2d538bf..0000000
Binary files a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments_1 and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/write.lock b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/write.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fdt b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fdt
deleted file mode 100644
index b05aaf4..0000000
Binary files a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fdt and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fdx b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fdx
deleted file mode 100644
index 76446ea..0000000
Binary files a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fdx and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fnm b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fnm
deleted file mode 100644
index b4b8341..0000000
--- a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.fnm
+++ /dev/null
@@ -1 +0,0 @@
-fingerprintactionbugIdbugUrlmessage needinfos
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.frq b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.frq
deleted file mode 100644
index ebf3dfe..0000000
--- a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/_1.frq
+++ /dev/null
@@ -1,4637 +0,0 @@
-WyVbfU[ UQ/WXֺ~oYaf^aW`RXo[ UQUwcʿyVbWocUccrUWUyVbTW'/UUXUWTyVbSWU[ UQ__Z__aUWP %ͺ__b T&UbWjc[b'TJXoa[ UQVcWɾbǻj__WU. f_9^[ UQUaAEVϭ[ UQcհUT/c[ UQUXUo$[ UQWh yVbaVU[ UQ`5UjTqQUհoT[ UQXZͽj[ho
XyVbѽ c[j[Yѽac[]SþXTcT]VD
-wѬoQXŽ[E !E.U]gb^S}\WTUc5yVbCW^^__V[ UQ. .ocUWcVqUX`.
nVU[[ UQX[ UQѽa[b'ѽP
AW
-@V_o[V[ UQaScŽ[1V^__]5XW__T[TQyٹѬQ][ UQT][V`@D[1|U[ UQO[ca[TQ[ UQ[ UQV WcUjc[ UQ4U[ UQKW[ UQP QlXELgyVbVQKQ[ UQ[ UQϽ]_9^ǽTirWXYU`__|9fxVb
-yVbo__f[ UQS
-oSWUUyٹ/c5oU[TQTU4UAWyVb___WnU*X
KaWV^^"Uq]#ccScSXS[ UQ4XUU#U5SWUUyVbVc4cUUyVb$cPUdP22[ UQW+`a,VWY[?!E__byVb/__9^U`TUUTSUWX
-[ UQ[ UQo[ UQT[ UQ_ZbTjb[TQ[Qda SsmcX54Z_U#Z#0#Z/U__4oPUo̽_9^Q__WkTUyVb~XayVbѽUoU_9^ELgcXcd]o
-Wo[j[TXU XS
-a~ѽXtoUXWNþfyVbS4cX
-U[ UQ[yVbUjc`ŽS
y
SP U[ UQZayVb[ UQ^T
Ka[ UQWeU[ UQob/c`Rϲ}[ UQUaa[Un____ѽ%XScT[ UQ[ UQad
Scab[1[\ɯQUbBSsmcTZ`f__S TSW[TQQ=[==ZX[ UQSsmcScVtQ[__UyVb.ɯ'SY\S[ UQþ[c&UX4QX^^`W~`5ZUZ__XŽ
-ot_9^հoVWU_9^UWco#ScFa_I[ UQ[ UQd[ UQSQxVb
-S$[FoUwT__[ UQ[TQWScѽ __f[ѿj[
Z4XWWZ0AEtoQ^XŽUXU4XUUUͺuyVbUQAE[ UQWa /ba_9^SQyVb_\.МyVb[4Sa__c/[ UQXZX~oaWP [TQVo[ UQ,][ UQ[ UQaUX
-U[TQAEXWW+}U[ UQP
-UUW__[ UQ[TQѽX_8^yVbWQ'cUobU@_bcǻtXP T<aXT[1[nWW
-X[ UQU@DǮUSS[ UQYѽέWcoXabW^^VyVbVVѬ͵`# F þʿdVWW[ UQ#oqdShP ]SSSþxVb
-VVTXWհ[1TSXTaa//P [[YVjc[1XfSY__yVbScU_!UUUѽUUSSUyVboSQwU]XU#W_Iհ]:(yVbI/W[ UQ4[U^^YbyVbo[ UQWXcUP\U/c__Scj[cU#Wa/X[ UQ
[TQSP كX)4nհVVϿa#^^X__WcoVfTh[ UQWUSˣ`YfA`__fT.c[ UQ[ UQjcWjV[TQUUѬUVUS
-__U|__ZyVbT_9^kScY[ UQyVbloThXXX`SsmcQP ɰ`SUXϿѽc`TX#]SWU@D/ScѺWW@DUVxVb
-Uao ][ UQSWjW[[͵WXZ/}VyVbQ[UYoSxVb
-_\._9^__TQZUoYVnXX 4[ UQUWհS
-^^[ UQyVb`bXS[ UQTYVQ[[ UQj[ Q`cSS__ooWjo``ݽyVb`UWScAEWQ___8^yVbb^^WU XsUT[ UQ__[ UQa~,X[ UQ[ UQ
Ka
KaUf[ UQUbUWa\^^P/U[ UQScT__UVyVbb____[ UQ[ UQ_I
__XW WyVbkUgP W[TyVb;SP [ UQXѽbs^^U
KacUͽ9`WTbTa\/XU/fZ0WXcSyVb_tQAEA[ UQ.[^^CQV/TZ0uRY____oXebUUb/W
Ka[ UQU
aQþѽ&yVbUqtTUX__ѽoYSVWb__FT`j[cWT`bdbP խ]S~/bSXf[ UQ˿[1__W$WbVyٹyVbWS/WVXWVTbVScհ[ UQP V`WU___9^bWVXW VbU]b][ UQ_9^S__UoSѽUyVb/U+Whȯb%[]ѬUS
- Vc
KacoScXnW[Wo`oaɯHjAyVb
KacZUcXAWYf[^UP `SUT 4[ UQѺѽW1S]s!^X[ UQQd_9^UW`WɯVb[9fUaoQdW/qXWW5_9^yVbUk
AEj__4U[ UQoUU`TyVb5[ UQ5[ UQcfcSyVb/V4]SUUbyVbUc/[ UQX[ UQAXcWUѰWcU[TQXWk~ U WVUU`cTSyVbSTXS_#P Q[a[ UQyVbb[VWU[1U[ UQUoaXobaI[ UQXUXWoScWY˿[.5jc ]UXVSU[UbXUU[ UQoXyVb^WQTVSkX]__VѬbXX[ UQUհ6bXS\UTXW/`yVbWyVb^^XZ0a_[ UQocoѬfab.22[ UQX4Q[ UQXV4TfyVbJt__cZUհ[ UQaAE/oV__S[ UQpP/WUƽ.bVUo
-Uc[ UQAEdco\\P ѽUQ[__`xVb
-]b_9^oyVbP [ UQ[`UUUT__W^aaWScS[ UQnAEհo4UWU`qaX`VAVUUcS_\/W~S U[TQj[`yVbfUϭjcfUA~ɯSTǻCyVbyVbUUSW[TQ_9^U[ UQS`PeWSTUWWU^^U/_%tWTUհU[ UQ[ UQUUU/[ UQ۳XcWa]yVboXSyVb`Y4U̵P aAExVb
-UX[TQUcCTj]dT\UTba/VoUU[ UQ__$~[o[+3YXXUUV'Xհ
-U/UUb~ScU.CUWWq[ UQ__@DU4Q[ UQcW[U~]yVbUX[ UQ/Tέ`[UWU
P S4XaS`X8]gaA5oU[ UQ
Ka[TQ
KaaU[TQyVb__UbŽ@Xh X
KaTcc__U[XWѲ[ UQThUX[ UQn[ UQja /Sj[c]ZyVbS+VP U(c__~WWCb#jcjc5ѽyVbyjcZyVbV#þyVbj[XTW_9^5UTUYW[ UQVU
Ka[oX9_9^qʣ
-ǻcP XѽXVUW,U[ UQX[ UQUT`#dQQdyVbUWc%yVbWcV
Kaoo]g][[ǻcyVbWQWWZUXWU^^bUUٿ[TQUTT~P [ UQ_oUU[ UQ5Tb_9^V8^Sj[yVbUaWc[ UQX _9^aSc]pq_9^YUYnXaj
-c
-^oS[ UQ
jcf[ UQ!SZ.AE^^c5[ UQWUcb`;SXP UX
-]WqoUyVbycTdf_9^W
bkŽUSj[.X4`oTS'c[oTTo___VñUQo_9^WW__WWXUjSAafS_^^__ScoScS`TUqT[ UQVcP
KaX/U [ UQUϭ[ UQSU^^A__W5SP xVb
-[ UQScKXU#bUUX`PXc4AE&TXAïUU_9^ĿPUqWjcxVb
-^^T^Zq`QUayVbYUj[ UQcU
KaV
[ UQQdoþVXV[ UQ[ UQb^_9^] ]`aTLgP RͲ/T
-UU[ UQWcWT[AEXcoobVWWWoo~TɯXɯUfAa_9^yVb/`UUU[ UQ__ScUѬ,cUUfS[*2VyVb[ UQX_V[ UQcYToc[ UQ'UaUSr lc
XXyVb[ UQWWUXb]d@Db5.Xbѽ
-WWɯThȯYUc Q[X mWSWXWU T__UUELg[ UQ5PT/V XcZf^^`XTyVbf _9^TVP UМ
[ UQ`S5ѿ[ UQUU SoXUoXjcyVboj[fo5(WUWyVboUT5]?rlcyX[ UQհQŽWTd\ccW^^[ UQTooUUSWXSVS[TQU"5#W_9^ cU[X3ZUyVbUxVb
-TWUU[ UQdS_%[ UQcELgTUP UU/yVbU[j[WU[ UQUcQU^[ UQcUX`TW`XxVb
-^^\Uժ ^3oT/U`jcQ~ѽSc[^^UUX5W_oyVbNP f@yVb__a ɯ__j[MxVb
-
Ka˿[ UQWVXP S[ UQ4^yVb/jccyVb_9^UWC%XjcSyVb[4#aaưyVbWPU/AE
\a Sc`WFP USc` Wͯˣa^^[ UQadc_9^abZyVbW//__W aѽ[QyVb[ UQYVyVbohScVɯXS[ UQ[ UQMa`TjcUǵݽQT[1Ta/Ub7Ko#'59b` ` V[o_9^)oX_f` WAET__o][ UQSU_oU^^X#٠oU̹US`j[UxVb
-S_9^+P jU"WyVbX4UUomVYUcUV[`TScUxVb
-TWVNUUUyVbj[CP qUW-eeQX[
-
-
-
-
-T
-Q
-
-XTn [ UQ[ UQC_9^[__UXW[Uqj[UaMVyVbo[ UQͽWXc`UWUQc__W[ UQYX UVUyVbX\bUoY+SUUlJ_W[ UQWUS}CoW)jcSkUQWbɯS[ UQCCZ*C2CVo
KaQUQ[U[ UQH߿\VW-ee__WVX[ UQU__
-\ aU SELg@
-DX5g[ UQj*TTVUWT/cb9UUnbT`USn[ UQßELgѽ+`I_9^UyVb[ UQR[b']U_9^S`Yt
yVb9UU__ocUQdk
KaW
-WyVbSsmcQU[ UQ#XAU_9^TŽScboSV[M_9^T]gyVb.SѺX/^C`U__o_9^R`_9^UUWþWT]UZWW _9^Y
__[ UQU#
Ka`Q[T[ UQU
-
-
-T
-
-yVbS/VŽXN ToXW[yVb\9P U__e
Ka]tY[axVb
-
Kaj[c[aaհV[ UQWKcWP yVbcSoYoUXacQ^WcXAE__TrVRɾyVb__]xVb
-UT[WSXWȯX[ UQXW5T~Scխ[ UQX#c TQV`ZdA_9^[ UQoݻT`j[fXT/
-oXW&[oX
-Uoa;[
Ka[ UQcVoUQUUZpSUWb[
-11yVbyVbfWW[ UQWkWS[1[b'5ofZbYc
-[ UQoU~US[ UQn[byVbX[ UQSUVѽ~yVb__FTWP WSScSy`__b_9^\S*foհ[ UQV Wa/W__
KaQjc߿T__^^b[ UQ`5͵U[ UQSbU`VjWxVb
-/Y[ UQyVbX8r#yVbX@
-UX[_I]ScUyVbUX]&[Q5`}Sh^WxVb
-U`Z0$X
KaSc__Uk#[ UQgUXS.bR`WTbScckP `Uo[S][ UQT4TUyVb]EWQWW/cj[__c:SyVbUo+q____#U`f[TQELgUVao^bT5@DXɾT4__W^Uc[ UQUScyVbX^bVU
-U_9^WyVbVj[j[yVb]_9^V`c9U_9^byVbScUU[ UQWQb`b__QcgoyVbXZSWۿXRyVbAEP oWUjcUb*
-Q
-V_IUj[oYUWTc[_9^c[ UQWV__[/US_U WRaELgSϺqUScYfVXW yVbyVbUP UUyVbUQ[UfZ[ UQyVbx
-V
-b
-
-
-lV
-UU[TQyVbZ̽QѽUJ
-
KaP TѬyVbVϿ`YIbHUSXWX3WUbZa
-WyVbPXUTX5հ`ͭXϿV_Z0UoWoW[ UQ[ UQUaWWXɯT[oSc^^U]q__U$ __Th
KaV``NTeSooUbUU
-11[cyVbyVbVѽ\`S`CA [ UQVS[TQUoU_9^Uc__fWQhfUcpUd/I_\.
KaTc˿ _9^ X/tKb.__fkF^^IUTc(p__ `%P ϿoUf[ UQUWWP 0R\r^^UcWSnj__X-\[TQ[TQUV4#c[1yVb^^[cVb4[ UQfmVX.`yVbSXWXU/TU_9^dUb/TWUabF߲Ut[ UQ
-Sa[Sc_9^[ UQ[ TQ[ UQнyVb`_9^UojcncbVX/YUW[ UQUyVbUJ KSbSc SUo XUaTQ#TWbXB,^^`ɾɯfXWSUŽUn
-UP bo
Ka__USW_
KaS
-X&þXUcZcYcyVb[ UQqf]+cUXyVbAEU/|հaCbyVbbkU
UU[ UQUTyVbٽU[TQVհ[ UQa[ UQjcUknyVbVf/Q.UU___\bѬXoqVŽ[ UQX[ UQ[ UQ\SX[1atW`UK_xVb
-__Q Xa
-114bP WoUTWZ!Q[oWdo__cU/1S]sThoPqXSkZQ[Tc[ϿV
-WQUþaZ0Žo[U͵#cTyVbfdUbU
KaT[TQ[ UQV-AE[TQSUScX_WyVb[ UQUT5/U[ UQUxVb
-/W/^^R[;SUaUU_\/UXyVbUǽUfT#__HScXU
-.__W[ZSj[[Uѽc c[ UQWUTVTW[ UQUU]|Tt[ UQX[TQհXT/4hӪyVbe__VWհ8UWkc`^^Yf
Ka___[ UQTZcTWk/XSsmco[ UQU`o[TQќoyVbհ#&yVb%WQh\__[1VyVbVyVb[UWUUZayVbWc/WyVbc SUQyVbZU![[ UQXQjcUU[ UQ____Sc~WWW`^^ѺS
-__Q[]Sc`UUoŽW<UZ0ŽԮ`bUAE]yVb6Sɯ occVdo@DUXoa.%%yVb[ UQj[yVbSYV/UDDbo_I[o__TbV?UUWfTob@DjcP Ssmcf`f[QUyVba
ǨUyVboUcyVbxVb
-^^Q[UyVbSTfU_9^yVbScXdnbQo
ɾUyVbcAVyVb//Ucjc[cU/\aUXV]WUbanP f`/XWyVbUbcUXyVb[ UQVW[ UQqc\bSrlcV/TQ/__AEyVbT`U_WQ
-UoQoV54yVbSSy
-jcW`T/SkTVoX*^^cyVbUa[Ua`[oyٹX]YXVѬXXѽoc
Kaj[WUU`Uc[ UQWScUUѽbcWcELgjcyVbVW`ayVbSkjc[]ˣ_9^SbTUU__/WUAP ^^[EyVbհW[ UQVXoհþ[ UQ[ UQX]UU/xVb
-[ UQS^^[UX[Z[ UQc55WfUUZUyVbUV
T [TQU[ UQ[ UQ~[ UQ+__ScVXd[TyVbxVb
-/WX/Sa/SGXVjcU Z * 2`TϿZQScXU__aVհgb]SyVbW`j[nSV_9^_\.UFT]QVAE[Um4__oVWUWyVb[a]ѽՔU@D/XToP [ UQWY/Žȯ5S[hwW5[ UQctSaoyVbWoyVbQX0U b`^^U__UTP [TQ][TQXVbaVUTSU[TQS
-]XWT[ UQoWQtThVf
-_\/cXV
-SUU
-UL+Ujd5yVbUoXf.____VVyVbWQ߭Q`S
-11P Z!WU==b
-T.Y_[ UQ``j[o
yVb/ScP cSa/XSc/XUǻn UUyVbWELg]hP `\UW][ UQUU_9^V\ W=WoUNQ^^aX/[ UQUWo.jaJ KS/cXqU``\Xg`U[ UQW/
KaS[ UQb=WyVbyVbf`[ UQAEUc__yVbyVbXU_9^__TUTP ScP o@DQU4TTUWc[ UQP TUcyVbcyVb`_9^QW/5WU[ UQXfgca[`UoUW_UWXUX[TQ[ UQkTScyVbA_9^oP a_9^Uþ[V__jhP o[ UQX]þ__XSU____P WQ/`jchoTU Sc6a__yVbUW`adW[ UQoyVb/fWQU__XWUj[V`ELgX[_\/[ UQUP `Sc+cUtjc`WɯWcV^cQUSUUU4UW5__}VŽX`.[1deUyVbo_9^Ub__YbX`V a[ UQUXUUZbWXXUk^TհQ^_9^S`[ UQW[ UQUWoSW[ UQ@D[ UQUDoaWnZXPbZ0yVb/W#ˣcXdyVbakY`;SyVbTj`_9^_]SclV[ UQoXbU[TQSc__Ͽ
KaٿUXXѺXab[TQ_9^[[ UQѽtW@D[ UQWU[ UQ}_9^U_9^Sc[TQUU[ UQAE[ UQQdjX__UѬ=UbPUѽnUUW@DZT W-ee#AŽ__/
_9^UVSsmcP U
KaW^^o \þT_9^cUWnѽyVbq~cSPFXTX]UVTWoUoVScQ[U[ UQ^^UZ0WA [ UQXcͽc^^UxVb
-Uf_9^C[ UQǽ'aŽݡoXXX r`[ UQyVbUWþWj[S][XyVbUnUTU[ UQyVbIQj[Q]WT_9^W[ UQjcUTέ]g_9^ jc
KaU.XQ[T`WUoyVbX1S]sDLg`fAScc7WtP X֫W ~^^5q`aoXT#cXP S
-UUWTWX_9^]q
KaP __YTT__d~yVb/[1VѽŽT
-`[ UQWVSaDLg yVbW#[ UQccUXW հHS[TQcc'UyVbU^^UQ[U[ UQˮUZbSѬI[ UQ[ UQջAWU4coXVV
-T[+3P [ UQ[TQ[ UQfcbTc[ɯ[J1111T1Q11Wj[[ UQUaWp_[b'xVbU__WTU/^^__[TQU`X[TQqUaScSV___9^cdW__Ubb[ UQ^^Wǽ[ UQ[TQSTQ[ W[ UQVcS/US[ UQU__`XUUU[ UQ$X[ UQþ__ __UV
Yo^^Žj/[ UQa/TXڿUyVbXSck[T/Te[TQTU_ˣXdScS
-yVbVUU1ZМUU/W
Ka_9^[WW.P yVba
-_9^fyVbaPTXaUUϭQ4T/`SyVb
-Q[ UQV_kyVbѽWxVb
-W XZUP 5P Xoa_9^c~WoTXW[oT
Ka[ UQyVbXUaUo[1@D_9^aέeհc[ UQVWT
-Uj[SXTUa[ UQWSkyVb____[ UQa`ctaϸ/__|Qc[ UQ[VUjɯP ScѽUK
Ka![ UQ[ UQb[ UQ__ŽSc~[oP P dSհf[ UQDbAEWWyVbWyVb__XA[ UQ _9^TSca[ UQ][TQ__`T\ [jcWTP W@DWWW[\
tW[ T Q yVb$cW#caWGWɯ/[1UXYbU]\yVbU_9^TYSnjyVbyVb]^^XA.XTUod\
KayVbUIqWUScUIaUfbVP FfSTmXP__ZfWa[ UQU[ UQj xVb
-^^TTUbcW]qoYVY#)S`oYV 5cadaW@D@DcUWPUU@D/5ѽTdUyVbUP Wc[Z]g[U.j[WbyVb[TQ._9^yVb[ UQXt TTXP [ UQ`AEcoe\T`[ UQ/Pp VͲSyVbyٹjTeQX[ UQVѬǰM^^XW
US/U
-11
KaV[jctþo_\/cUb yVbUѽS
-4oUWyVbTyVb__yVbXUcU/__TeUkSS]aY[ UQUyVb[TQV]U)P S[ UQKt/`[Q
Ka[ UQWSbUTc `yVbWjc TTwScaj[Ž/[QUoY߬TeUaTb[ UQaIXWyVb_9^UjSc_9^XW|ѽUX`fjP UU
KaQobTc____USWa~U/t[TQzQUU`[ UQ[ocyVbTyVbTWQ[ UQ_9^yVbW-ee_9^Zc_`__T[_9^МUX8XoSScUW`oV/zWjxVb
-oQ`tyVb`cc__WS`_9^ajcX_9^cQ[ UQao`dTWSa[ UQyVbVU][ UQUXU0oo__[T#[þZUoѺT}bU`S__[ UQX[ UQ__[TQAVQUbWa_9^#5#ùXyVbo%X,XoT$a/¹SU[Q[b'dVXSfWWͽ[ UQZUXT#U[_9^ŽUXc/.VU[ UQUkVjY.yVbYWQaP "U][ UQXxVb
-`UoY0\ag4[TQ_9^j[UoWXWc`jcϿ#WX[yVb[ UQoW_9^WSQdyVbXP TWyVbnXnTXXa[ UQVWVTѬbSWWyVbQ[__ `d[ UQ]U[ UQWѺo^^X
-`UɯPeTU
-11U81&VTUo4]P [ UQScUo[ UQXZ`U`U[ UQSѬȯXSo
Ka.TTTxVb
-ofS[TQSk[ UQ_9^`]VoUʣ[_9^__yVboUU\yVbP M[ UQXT4VU^ X[ UQcc.Wþ_co`aT4jcUbŽXoTyVb@DUQo5TUSWf TkXc`SaUۭ=X%oþotT[nyٹ`P c_9^XP .aWbUW`WSQdѽ`o[ UQpf/[ UQURU`[ UQ_9^[ UQUWnyVbUU^^cc[ UQSS\Wb/AEW[ UQ[ UQoW5AUXbThUS[ UQĽ`[yVb/cn[TQ[ UQTѬaŽ[TQЬyVb__WyVbXXjcW__[TQ`W_9^V`UW`c
-wWX[bWc__UXVWQQbUSJ KWP []b]
Ka[ UQTXjc[TQyVbS[`STELgUyVbŽbSXUT[4voX*TxVb
-aU[ UQ[1^^aT
Kaj[TU
Ka[ UQcU__ oX%acU/yVb_9^Q9_I[ UQ[TQSV[TQSTSa_9^[ UQ_9^yVbSoyVbcW[S#d[ UQ#[TQS|UyVbQQ[fa yVb]U4SyVbyVbof\Wj[TP U[ UQXoWѬSհ[ UQWP #[XUbcoS VoyVbc~\aAEXUXUWnfX͵U[ UQ`
-U__byVb`VWpaX`TbØ._ŽUXUcaUyVbU_SUdU/_9^[ UQtTVU0V__`V_9^yVb^^_`UٷUHc
`/\4T/#WUUUUaU/nP bWT~WkWUCa/UP VT
[1yٹ"[ UQ[ UQWo[TQ`^[TQWUXfUoX/yVbUSyVbUTyVb__ȯaSV____WPcQ/[ UQUUٲyٹ[ UQbbjc[ UQ[ UQa[ UQP cyVboj[[ UQTUѽSX[ UQ[TQɯUa
KaU^^_9^QXFSVQYwUW[ UQ4W^^XSWW~ xVb
-WF`5U \WT[ UQ[SS κU[ UQnѽ[ UQyVb[U`[WoyVbo`Z0UbVɾaМxVb
-[ UQTXS7^^SUSf/__eX5yVbɯ/]X.
-
-SsmcUU^^X|__ ThXo]X^Y[ UQ#XyVbC__ɯ[ UQSV4oU'/cP Q EQSxVb
-yVbS V
-tUTVo_IE[ UQ_9^|U`UU+@yVb1S]soŽ_9^`c\@D[ UQ4wcyVbV_9^X[ UQayVb`UojXyVbVxVb
-|Ѭ[qVW/`[yVbyVb˿V~bW8S
-ǻ__/yVbcf[ UQVyVb
Kaέ[TQX889WQctTUUUS__T__UX3acb jct[1`W___|P X.UQ[TbcoYjbȯUUUyVbF P o)QTYU[W_T4yVbXa[ UQ!o`_9^yVbSTS
-ݭ|bdWoo~[ UQWAE
-ScW
KaQX$@T%Q[ZaW_I