\r
import java.text.MessageFormat;\r
import java.util.Arrays;\r
-import java.util.HashMap;\r
-import java.util.Map;\r
import java.util.Scanner;\r
import org.mxchange.addressbook.UnhandledUserChoiceException;\r
import org.mxchange.addressbook.application.AddressbookApplication;\r
* @author Roland Haeder\r
*/\r
public class ConsoleClient extends BaseClient implements Client {\r
- /**\r
- * Menu system\r
- */\r
- private final Map<String, Menu> menus;\r
-\r
/**\r
* Scanner instance for reading data from console input\r
*/\r
// Set application instance\r
this.setApplication(application);\r
\r
- // Init contact manager here\r
- this.initContactManager(this);\r
-\r
// Init scanner instance\r
this.scanner = new Scanner(System.in);\r
-\r
- // Init menu map\r
- this.menus = new HashMap<>(10);\r
-\r
- // Fill menu map\r
- this.fillConsoleMenuMap();\r
}\r
\r
/**\r
@Override\r
public void displayAddressBox (final Contact contact) {\r
// Simple display ...\r
- // @todo Use mask\r
+ // @todo Use mask\r
this.outputMessage("Strasse, PLZ Ort, Land: " + contact.getStreet() + "\n" + contact.getZipCode() + " " + contact.getCity() + "\n" + contact.getCountryCode());\r
}\r
\r
@Override\r
public void displayOtherDataBox (final Contact contact) {\r
// Cellphone and such ...\r
- this.outputMessage("Telefonnumer: " + contact.getPhoneNumber() + "\nFaxnummer: " + contact.getFaxNumber() + "\nHandy: " + contact.getCellphoneNumber() + "\nKommentar:\n" + contact.getComment());\r
+ this.outputMessage(MessageFormat.format("Telefonnumer: {0}\nFaxnummer: {1}\nHandy: {2}\nKommentar:\n{3}", contact.getPhoneNumber(), contact.getFaxNumber(), contact.getCellphoneNumber(), contact.getComment()));\r
+ }\r
+\r
+ /**\r
+ * Shutdown this client\r
+ */\r
+ @Override\r
+ public void doShutdown () {\r
+ // Parent call\r
+ super.doShutdown();\r
+\r
+ // @TODO Add other shutdown stuff\r
}\r
\r
@Override\r
public void doUserMenuChoice () throws UnhandledUserChoiceException {\r
// Get all access keys from menu\r
- char[] accessKeys = MenuTools.getAccessKeysFromMenuMap(this.menus, this.getCurrentMenu());\r
+ char[] accessKeys = MenuTools.getAccessKeysFromMenuMap(this.getMenus(), this.getCurrentMenu());\r
\r
// Output textural message and ask for a char as input\r
char choice = this.enterChar(accessKeys, "Bitte Auswahl eingeben (0=Programm beenden): ");\r
this.getContactManager().addOtherAddress();\r
break;\r
\r
- case '4': // Change other addess\r
+ case '4': // List contacts\r
+ this.getContactManager().listContacts();\r
+ break;\r
+ \r
+ case '5': // Search addresses\r
+ this.getContactManager().searchContacts();\r
+ break;\r
+\r
+ case '6': // Change other addess\r
this.getContactManager().changeOtherAddress();\r
break;\r
\r
- case '5': // Delete other address\r
+ case '7': // Delete other address\r
this.getContactManager().deleteOtherAddress();\r
break;\r
\r
case '0': // Program exit\r
- this.disableIsRunning();\r
+ this.getApplication().doShutdown();\r
break;\r
\r
default:\r
// @TODO throw own exception\r
- throw new UnhandledUserChoiceException("Choice '" + choice + "' not handled yet.");\r
+ throw new UnhandledUserChoiceException(MessageFormat.format("Choice '{0}' not handled yet.", choice));\r
}\r
}\r
\r
return new ConsoleMenuItem(accessKey,text);\r
}\r
\r
+ /**\r
+ * Inizializes this client\r
+ */\r
+ @Override\r
+ public void initClient () {\r
+ // Init contact manager here\r
+ this.initContactManager();\r
+ \r
+ // Fill menu map\r
+ this.fillMenuMap();\r
+ }\r
+\r
/**\r
* Displays textural message to the user\r
* @param message\r
this.showMenu(this.getCurrentMenu());\r
}\r
\r
+ /**\r
+ * Shows given menu entry to user\r
+ * \r
+ * @param item Menu entry\r
+ */\r
@Override\r
public void showEntry (final SelectableMenuItem item) {\r
// Access key then text\r
*/\r
@Override\r
public void showWelcome () {\r
- this.outputMessage("Welcome to " + AddressbookApplication.APP_TITLE + " v" + AddressbookApplication.APP_VERSION);\r
+ this.outputMessage("Welcome to " + AddressbookApplication.printableTitle());\r
this.outputMessage("");\r
this.outputMessage("Copyright(c) 2015 by Roland Haeder, this is free software");\r
\r
// Debug message\r
this.getLogger().debug("Intro shown to user");\r
- }\r
+ }\r
\r
@Override\r
public void userChooseChangeContactData (final Contact contact) throws UnhandledUserChoiceException {\r
}\r
}\r
\r
- /**\r
- * Fills menu map with menu entries\r
- */\r
- private void fillConsoleMenuMap () {\r
- // Initialize first (main) menu\r
- Menu menu = new ConsoleMenu("main", this);\r
-\r
- // Add it\r
- this.menus.put("main", menu);\r
- }\r
-\r
- /**\r
- * "Getter" for given menu type\r
- * \r
- * @param menuType Menu type instance to return\r
- * @return Menu or null if not found\r
- */\r
- private Menu getMenu (final String menuType) {\r
- // Default is not found\r
- Menu menu = null;\r
-\r
- // Check array\r
- if (this.menus.containsKey(menuType)) {\r
- // Found!\r
- menu = this.menus.get(menuType);\r
- }\r
- \r
- // Return it\r
- return menu;\r
- }\r
-\r
/**\r
* Reads one character\r
* \r
}\r
\r
/**\r
- * Shows given menu\r
- *\r
- * @param menuType Given menu to show\r
+ * Fills menu map with menu entries\r
*/\r
- private void showMenu (final String menuType) {\r
- Menu menu = this.getMenu(menuType);\r
- \r
- // Is the menu set?\r
- if (!(menu instanceof Menu)) {\r
- // Not found\r
- // @todo Own exception?\r
- throw new NullPointerException("Menu '" + menuType + "' not found.");\r
- }\r
+ @Override\r
+ protected final void fillMenuMap () {\r
+ // Initialize first (main) menu\r
+ Menu menu = new ConsoleMenu("main", this);\r
\r
- // Show menu\r
- menu.show(this);\r
+ // Add it\r
+ this.getMenus().put("main", menu);\r
}\r
}\r
projects / jfinancials-swing.git / blobdiff