From: Roland Haeder Date: Tue, 28 Jul 2015 11:44:26 +0000 (+0200) Subject: Auto-formation and yes, it is better this way X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=89eb7d817417c7d2779289adb287c85cbf8052c6;p=jaddressbook-lib.git Auto-formation and yes, it is better this way Signed-off-by:Roland Häder --- diff --git a/Addressbook/build.xml b/Addressbook/build.xml index c24405d9..b72f99da 100644 --- a/Addressbook/build.xml +++ b/Addressbook/build.xml @@ -69,5 +69,5 @@ properties which you can use, check the target you are overriding in the nbproject/build-impl.xml file. - --> + --> diff --git a/Addressbook/src/log4j2.xml b/Addressbook/src/log4j2.xml index cafb4333..d5452877 100644 --- a/Addressbook/src/log4j2.xml +++ b/Addressbook/src/log4j2.xml @@ -16,14 +16,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - - - - - - - - - - + + + + + + + + + + diff --git a/Addressbook/src/org/mxchange/addressbook/BaseFrameworkSystem.java b/Addressbook/src/org/mxchange/addressbook/BaseFrameworkSystem.java index b104090c..555d9ed7 100644 --- a/Addressbook/src/org/mxchange/addressbook/BaseFrameworkSystem.java +++ b/Addressbook/src/org/mxchange/addressbook/BaseFrameworkSystem.java @@ -169,7 +169,7 @@ public class BaseFrameworkSystem implements FrameworkInterface { /** * Getter for human-readable string from given key - * + * * @param key Key to return * @return Human-readable message */ diff --git a/Addressbook/src/org/mxchange/addressbook/FrameworkInterface.java b/Addressbook/src/org/mxchange/addressbook/FrameworkInterface.java index fc44b3fc..822be62d 100644 --- a/Addressbook/src/org/mxchange/addressbook/FrameworkInterface.java +++ b/Addressbook/src/org/mxchange/addressbook/FrameworkInterface.java @@ -50,7 +50,7 @@ public interface FrameworkInterface { /** * Getter for human-readable string from given key - * + * * @param key Key to return * @return Human-readable message */ diff --git a/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java b/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java index 7f55a382..2f4f1856 100644 --- a/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java +++ b/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java @@ -25,92 +25,49 @@ import org.mxchange.addressbook.exceptions.UnhandledUserChoiceException; import org.mxchange.addressbook.manager.application.ApplicationManager; /** - * ============================================ - * AddressbookApplication management: - * ============================================ - * + * ============================================ AddressbookApplication + * management: ============================================ + * * Inernet("public" service) and Intranet - * - * Version 1.0+: - * - Single-user local application - * - Fields: - * + Gender - * + Surname - * + Family name - * + Company name - * + Street + number - * + ZIP code - * + City - * + Landline number - * + Fax number - * + Cell phone number - * + Email address - * + Birth day - * + Comment (?) - * - Edit own data - * - Add new contact - * - Edit contacts - * - Delete contacts - * - Categorization of contacts - * - * Version 1.1+: - * - Permanent storage in database - * - * Version 2.0+: - * - Multi-user web application - * - Local user registration / login / resend confirmation link / password - * recovery - * - User groups (aka. teams) - * - Administration area (user role) - * + Create/edit/delete groups - * + Edit/delete/lock/unlock user - * + Assign user roles/rights - * - Allow other users / groups to view addressbook - * + Full addressbook - * + Only some categories - * - VCard export - * + Allow users/guests (not recommended) - * - XML export of addressbook and compressable (ZIP) - * - Form to contact other user/group without need of mail program - * + User can disabled this - * - Directory for ussers/groups (who allowed to be listed) - * + Simple click to add user to own addressbook - * + Search form? - * - * Version 2.1+: - * - Multi-language support - * - * Version 2.2+:("socialized") - * - "Social login" (OpenID consumer) - * + Connect user account to social account - * + Sync own data? - * - "Social profile" - * + OpenID provider - * + RSS/activity feed - * - * ============================================ - * Time esitmation: - * ============================================ - * 1.0 (console): - * + 2 days - * - * 1.1 (database): - * + 2 day - * + Initial tables: contacts, categories, contact_category - * - * 2.0 (web): - * + 3 days - * + Additional tables: admins (?), admin_rights, groups, - * users, user_contacts, user_user_rights, user_category_rights, - * - * 2.1 (language) - * + 1 day - * + Additional tables: languages (disable, enable language "pack" ?) - * - * 2.2 (social): - * + 3 days - * + Additional tables: ??? - * + * + * Version 1.0+: - Single-user local application - Fields: + Gender + Surname + + * Family name + Company name + Street + number + ZIP code + City + Landline + * number + Fax number + Cell phone number + Email address + Birth day + Comment + * (?) - Edit own data - Add new contact - Edit contacts - Delete contacts - + * Categorization of contacts + * + * Version 1.1+: - Permanent storage in database + * + * Version 2.0+: - Multi-user web application - Local user registration / login + * / resend confirmation link / password recovery - User groups (aka. teams) - + * Administration area (user role) + Create/edit/delete groups + + * Edit/delete/lock/unlock user + Assign user roles/rights - Allow other users / + * groups to view addressbook + Full addressbook + Only some categories - VCard + * export + Allow users/guests (not recommended) - XML export of addressbook and + * compressable (ZIP) - Form to contact other user/group without need of mail + * program + User can disabled this - Directory for ussers/groups (who allowed + * to be listed) + Simple click to add user to own addressbook + Search form? + * + * Version 2.1+: - Multi-language support + * + * Version 2.2+:("socialized") - "Social login" (OpenID consumer) + Connect user + * account to social account + Sync own data? - "Social profile" + OpenID + * provider + RSS/activity feed + * + * ============================================ Time esitmation: + * ============================================ 1.0 (console): + 2 days + * + * 1.1 (database): + 2 day + Initial tables: contacts, categories, + * contact_category + * + * 2.0 (web): + 3 days + Additional tables: admins (?), admin_rights, groups, + * users, user_contacts, user_user_rights, user_category_rights, + * + * 2.1 (language) + 1 day + Additional tables: languages (disable, enable + * language "pack" ?) + * + * 2.2 (social): + 3 days + Additional tables: ??? + * * @author Roland Haeder * @version 0.0 * @since 0.0 @@ -206,7 +163,7 @@ public class AddressbookApplication extends BaseFrameworkSystem implements Appli // Debug message this.getLogger().trace("CALLED!"); - // @TODO The application should be running now + // @TODO The application should be running now // Output introduction this.showIntro(); @@ -350,7 +307,7 @@ public class AddressbookApplication extends BaseFrameworkSystem implements Appli /** * Getter for this application - * + * * @return Instance from this application */ public static final Application getInstance () { diff --git a/Addressbook/src/org/mxchange/addressbook/client/Client.java b/Addressbook/src/org/mxchange/addressbook/client/Client.java index 9ebbc14c..aba84ef2 100644 --- a/Addressbook/src/org/mxchange/addressbook/client/Client.java +++ b/Addressbook/src/org/mxchange/addressbook/client/Client.java @@ -71,7 +71,7 @@ public interface Client extends FrameworkInterface { /** * Asks the user to enter his/her gender (M=Male, F=Female, C=Company) - * + * * @param message Message to output * @return Gender enum */ diff --git a/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java index 846d4bb9..9de67f1a 100644 --- a/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -290,7 +290,7 @@ public class ConsoleClient extends BaseClient implements Client { /** * Asks the user to enter his/her gender - * + * * @param message Message to the user * @return Gender enum */ @@ -301,7 +301,6 @@ public class ConsoleClient extends BaseClient implements Client { // Debug message //* NOISY-DEBUG: */ System.out.println(validChars); - // Call inner method char gender = this.enterChar(validChars, message); diff --git a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java index fdc59e1e..92e8dfe3 100644 --- a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -113,6 +113,11 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame */ private boolean isInitialized; + /** + * Layout instance + */ + private GridLayout layout; + /** * Status label needs to be updated */ @@ -125,11 +130,11 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame */ private AddressbookFrame (final Client client) { // Debug line - this.getLogger().trace(MessageFormat.format("client={0}: CALLED!", client)); + this.getLogger().trace(MessageFormat.format("client={0}: CALLED!", client)); //NOI18N // Set frame instance this.frame = new JFrame(); - this.frame.setTitle(this.generateFrameTitle("main")); + this.frame.setTitle(this.generateFrameTitle("main")); //NOI18N // Set client here this.setClient(client); @@ -141,7 +146,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame @Override public void doShutdown () { // First only show shutdown status - this.updateStatus("shutdown"); + this.updateStatus("shutdown"); //NOI18N } /** @@ -152,12 +157,12 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame @Override public void setupFrame (final Client client) { // Debug line - this.getLogger().trace(MessageFormat.format("client={0}: CALLED!", client)); + this.getLogger().trace(MessageFormat.format("client={0}: CALLED!", client)); //NOI18N // Has the user entered own data? if (this.getClient().getContactManager().isOwnContactAdded()) { // Debug message - this.getLogger().debug("Disabling menus: isOwnContactAdded()=false"); + this.getLogger().debug("Disabling menus: isOwnContactAdded()=false"); //NOI18N // Not entered yet, so disable "add" menu this.addOwnItem.setEnabled(false); @@ -170,7 +175,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame this.frame.setVisible(true); // All done here - this.updateStatus("done"); + this.updateStatus("done"); //NOI18N } /** @@ -185,7 +190,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame @Override public void init () throws FrameAlreadyInitializedException { // Debug line - this.getLogger().trace("CALLED!"); + this.getLogger().trace("CALLED!"); //NOI18N // Has this frame been initialized? if (this.isInitialized()) { @@ -219,7 +224,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame // To do this, the frame must be initialized if (!this.isInitialized()) { // Not initalized, so bad call - this.getLogger().fatal("Bad call of shutdownApplication(). Please report this."); + this.getLogger().fatal("Bad call of shutdownApplication(). Please report this."); //NOI18N return; } this.getClient().getApplication().doShutdown(); @@ -227,18 +232,19 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame /** * Generates a title for borders + * * @param key Key part to look for * @return Human-readable title */ private String generateBorderTitle (final String key) { // Call bundle instance - return this.getBundle().getString(String.format("AddressbookFrame.border.%s.title.text", key)); + return this.getBundle().getString(String.format("AddressbookFrame.border.%s.title.text", key)); //NOI18N } /** * Generates a title for all frames based on given sub title key. If null is * given, the sub title is not generated. - * + * * @param subKey Key for sub title resource * @return A full application title */ @@ -249,7 +255,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame // Is key given? if (subKey != null) { // Add sub title - title = String.format("%s - %s", title, this.getBundle().getString(String.format("AddressbookFrame.%s.title.text", subKey))); + title = String.format("%s - %s", title, this.getBundle().getString(String.format("AddressbookFrame.%s.title.text", subKey))); //NOI18N } // Return it @@ -262,8 +268,10 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame private void initAddContactDialog () { // Instance dialog and set title this.addContact = new JDialog(); - this.addContact.setTitle(this.generateFrameTitle("dialog.addContact")); - this.addContact.setLayout(new GridLayout(4, 1)); + this.addContact.setTitle(this.generateFrameTitle("dialog.addContact")); //NOI18N + + // Set layout + this.addContact.setLayout(new GridLayout(0, 1, 2, 2)); // Only hide it on close and make it appear in middle of screen this.addContact.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); @@ -274,7 +282,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame this.addContact.setAutoRequestFocus(true); // Initial dimension - this.addContact.setSize(500, 400); + this.addContact.setSize(500, 500); /* * Add listener which asks for confirmation, if data has been entered @@ -282,33 +290,37 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame * * @TODO Unfinished */ - // Init 3 panels: // 1) "name" panel - initNamePanel(); + initNameDataPanel(); // 2) "address" panel - initAddressPanel(); + initAddressDataPanel(); + + // 3) "other" panel + initOtherDataPanel(); // x)Only for developing: - /* DEBUG: */ this.addContact.setVisible(true); + /* + * DEBUG: + */ this.addContact.setVisible(true); } /** * Initializes address panel */ - private void initAddressPanel () { + private void initAddressDataPanel () { // Panel "address" input boxes JPanel addressPanel = new JPanel(); addressPanel.setLayout(new BoxLayout(addressPanel, BoxLayout.Y_AXIS)); - + // Set border to titled version - addressPanel.setBorder(new TitledBorder(this.generateBorderTitle("address"))); + addressPanel.setBorder(new TitledBorder(this.generateBorderTitle("address"))); //NOI18N // Init all elements: // 1) Street and number together JPanel streetNumberPanel = new JPanel(); - streetNumberPanel.setLayout(new GridLayout(1, 4)); + streetNumberPanel.setLayout(new GridLayout(1, 4, 5, 5)); // Label for street JLabel streetLabel = new JLabel(this.getBundle().getString("AddressbookFrame.street.text")); @@ -333,7 +345,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame /** * Method to verify that the entered data is a number. - * + * * @param input Input to verify * @return Whether the data is a number */ @@ -367,7 +379,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame // 2) ZIP code and ccity name JPanel zipCityPanel = new JPanel(); - zipCityPanel.setLayout(new GridLayout(1, 4)); + zipCityPanel.setLayout(new GridLayout(1, 4, 5, 5)); // Label for ZIP code, again numbers only JLabel zipLabel = new JLabel(this.getBundle().getString("AddressbookFrame.zip.text")); @@ -381,7 +393,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame /** * Method to verify that the entered data is a number. - * + * * @param input Input to verify * @return Whether the data is a number */ @@ -433,7 +445,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame */ private void initComponents () { // Debug line - this.getLogger().trace("CALLED!"); + this.getLogger().trace("CALLED!"); //NOI18N // Set default close operation this.frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); @@ -490,11 +502,11 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame JMenuBar menuBar = new JMenuBar(); JMenu menu; JMenuItem item; - + // Init some menus: // 1) File menu menu = new JMenu(this.getBundle().getString("AddressbookFrame.menu.file.text")); - + // Add menu items: // 1.x) Exit program (should be last) item = new JMenuItem(this.getBundle().getString("AddressbookFrame.menuItem.exitProgram.text")); @@ -518,7 +530,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame // Add menu -> menu bar menuBar.add(menu); - + // Init some menus: // 2) Addressbook menu menu = new JMenu(this.getBundle().getString("AddressbookFrame.menu.addressbook.text")); @@ -573,24 +585,24 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame /** * Initializes name panel */ - private void initNamePanel () { + private void initNameDataPanel () { // Panel "name" input boxes JPanel namePanel = new JPanel(); namePanel.setLayout(new BoxLayout(namePanel, BoxLayout.Y_AXIS)); // Set border to titled version - namePanel.setBorder(new TitledBorder(this.generateBorderTitle("name"))); + namePanel.setBorder(new TitledBorder(this.generateBorderTitle("name"))); //NOI18N // Panel for gender JPanel gPanel = new JPanel(); - gPanel.setLayout(new GridLayout(1, 2)); - + gPanel.setLayout(new GridLayout(1, 2, 5, 5)); + // Gender text field JLabel gLabel = new JLabel(this.getBundle().getString("AddressbookFrame.gender.text")); - + // Get all genders Gender[] genders = Gender.values(); - + // Init gender combo box with tool tip JComboBox gender = new JComboBox<>(new DefaultComboBoxModel<>(genders)); gender.setToolTipText(this.getBundle().getString("AddressbookFrame.gender.tooltipText")); @@ -604,7 +616,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame // Panel for surname JPanel sPanel = new JPanel(); - sPanel.setLayout(new GridLayout(1, 2)); + sPanel.setLayout(new GridLayout(1, 2, 5, 5)); // New label for surname is not needed JLabel sLabel = new JLabel(this.getBundle().getString("AddressbookFrame.surname.text")); @@ -642,6 +654,12 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame this.addContact.add(namePanel); } + /** + * Initializes "other" data panel + */ + private void initOtherDataPanel () { + } + /** * Initialize other dialogs (e.g. "Add contact") */ @@ -657,7 +675,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame private void initStatusPanel () { // Init status label (which needs to be updated this.statusLabel = new JLabel(); - this.updateStatus("initializing"); + this.updateStatus("initializing"); //NOI18N // Init status bar in south JPanel panel = new JPanel(); @@ -688,7 +706,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame */ @Override public void mouseClicked (final MouseEvent e) { - throw new UnsupportedOperationException("Unfinished."); + throw new UnsupportedOperationException("Unfinished."); //NOI18N } }); @@ -711,6 +729,6 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame */ private void updateStatus (final String type) { // Set status message - this.statusLabel.setText(this.getBundle().getString(String.format("AddressbookFrame.statusLabel.%s.text", type))); + this.statusLabel.setText(this.getBundle().getString(String.format("AddressbookFrame.statusLabel.%s.text", type))); //NOI18N } } diff --git a/Addressbook/src/org/mxchange/addressbook/client/gui/SwingClient.java b/Addressbook/src/org/mxchange/addressbook/client/gui/SwingClient.java index 634b0cf2..17d3e1b0 100644 --- a/Addressbook/src/org/mxchange/addressbook/client/gui/SwingClient.java +++ b/Addressbook/src/org/mxchange/addressbook/client/gui/SwingClient.java @@ -87,7 +87,7 @@ public class SwingClient extends BaseClient implements Client { /** * Shows dialog to enter new contact - * + * * @return Returns finished Contact instance */ @Override diff --git a/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java b/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java index 2db18d27..42be4d32 100644 --- a/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java +++ b/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java @@ -433,7 +433,7 @@ public class BaseContact extends BaseFrameworkSystem { @Override public int hashCode () { // Validate gender instance - assert(this.getGender() instanceof Gender) : "gender is not set."; + assert (this.getGender() instanceof Gender) : "gender is not set."; int hash = 7; hash = 79 * hash + Objects.hashCode(this.getFamilyName()); diff --git a/Addressbook/src/org/mxchange/addressbook/contact/Gender.java b/Addressbook/src/org/mxchange/addressbook/contact/Gender.java index 6bd68df3..cdfab047 100644 --- a/Addressbook/src/org/mxchange/addressbook/contact/Gender.java +++ b/Addressbook/src/org/mxchange/addressbook/contact/Gender.java @@ -20,24 +20,23 @@ import org.mxchange.addressbook.application.AddressbookApplication; /** * Gender enum + * * @author Roland Haeder */ public enum Gender { + /** * Unknown enum */ UNKNOWN("U", "BaseContact.gender.unknown.text"), - /** * Male enum */ MALE("M", "BaseContact.gender.male.text"), - /** * Female enum */ FEMALE("F", "BaseContact.gender.female.text"), - /** * Company enum */ @@ -84,7 +83,7 @@ public enum Gender { /** * Valid chars - * + * * @return Valid chars */ public static char[] validChars () { @@ -105,7 +104,6 @@ public enum Gender { // Debug message //* NOISY-DEBUG: */ System.out.println("gender=" + gender); - // Is it UNKNOWN? if (gender.equals(Gender.UNKNOWN)) { // Skip this @@ -114,7 +112,6 @@ public enum Gender { // Debug message //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("gender={0} - adding at pos {1} ...", gender, i)); - // Get database value as this is also the access valid[i] = gender.getDatabaseValue().charAt(0); @@ -141,7 +138,7 @@ public enum Gender { /** * Constructor - * + * * @param databaseValue Value being stored in database * @param messageKey Message key for resource file */ @@ -153,7 +150,7 @@ public enum Gender { /** * Database value - * + * * @return the databaseValue */ protected String getDatabaseValue () { @@ -162,7 +159,7 @@ public enum Gender { /** * Output value (for messages) - * + * * @return the messageKey */ protected String getMessageKey () { @@ -171,7 +168,7 @@ public enum Gender { /** * Overwritten to return human-readable strings - * + * * @return Human-readable strings */ @Override diff --git a/Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java b/Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java index 2715b5e1..b8ab55df 100644 --- a/Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java +++ b/Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java @@ -262,7 +262,7 @@ public class Base64CsvDatabaseBackend extends BaseDatabaseBackend implements Csv // Debug message this.getLogger().debug(MessageFormat.format("lines={0}", lines)); - // Instance list + // Instance list // @TODO The maximum length could be guessed from file size? List list = new ArrayList<>(lines); @@ -307,7 +307,7 @@ public class Base64CsvDatabaseBackend extends BaseDatabaseBackend implements Csv // UTF-8 writer characters found token = token.substring(2); } - + // Debug message this.getLogger().debug(MessageFormat.format("token={0}", token)); @@ -505,7 +505,7 @@ public class Base64CsvDatabaseBackend extends BaseDatabaseBackend implements Csv } // The contact instance should be there now - assert(contact instanceof Contact) : "contact is not set: " + contact; + assert (contact instanceof Contact) : "contact is not set: " + contact; // Add contact this.addContactToList(contact, list); diff --git a/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java b/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java index 107bf3f1..62bcfbd4 100644 --- a/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java +++ b/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java @@ -82,7 +82,7 @@ public class ContactManager extends BaseManager implements ManageableContact { // Read all entries this.contactDatabase.readAllContacts(); - // Debug message + // Debug message //* NOISY-DEBUG: */ this.getLogger().debug("client=" + client); } @@ -476,14 +476,14 @@ public class ContactManager extends BaseManager implements ManageableContact { public void registerContact (final Contact contact) { // Check if contact is found if (this.isContactAlreadyAdded(contact)) { - // Contact already added + // Contact already added // @todo Do something here } else if ((contact.isOwnContact()) && (this.isOwnContactAdded())) { - // Own contact already added + // Own contact already added // @todo Do something } - // Debug message + // Debug message /* * NOISY-DEBUG: */ this.getLogger().debug(MessageFormat.format("Adding '{0}' '{1}' at pos '{2}' ...", contact.getSurname(), contact.getFamilyName(), this.size())); @@ -598,7 +598,7 @@ public class ContactManager extends BaseManager implements ManageableContact { // Default is not found boolean isFound = false; - // Debug message + // Debug message //* NOISY-DEBUG: */ this.getLogger().debug("Checking '" + this.contacts.length + "' entries..."); // Now get it back from address book, first get an iterator Iterator iterator = this.contacts.iterator(); @@ -608,7 +608,7 @@ public class ContactManager extends BaseManager implements ManageableContact { // Get next entry Contact contact = iterator.next(); - // Debug message + // Debug message //* NOISY-DEBUG: */ this.getLogger().debug("contact=" + contact + ",checkContent=" + checkContact); // Is it valid? if ((contact instanceof Contact) && ((contact.equals(checkContact)))) { diff --git a/Addressbook/src/org/mxchange/addressbook/menu/MenuTools.java b/Addressbook/src/org/mxchange/addressbook/menu/MenuTools.java index 44d5395c..a8d5bd3c 100644 --- a/Addressbook/src/org/mxchange/addressbook/menu/MenuTools.java +++ b/Addressbook/src/org/mxchange/addressbook/menu/MenuTools.java @@ -45,7 +45,7 @@ public class MenuTools extends BaseFrameworkSystem { // Is it there? if (!(menu instanceof Menu)) { - // Not found + // Not found // @todo Rewrite to exception logger.error("Menu '" + menuType + "' not found."); System.exit(1); diff --git a/Addressbook/src/org/mxchange/addressbook/model/BaseModel.java b/Addressbook/src/org/mxchange/addressbook/model/BaseModel.java index 22c7e8d3..e1991653 100644 --- a/Addressbook/src/org/mxchange/addressbook/model/BaseModel.java +++ b/Addressbook/src/org/mxchange/addressbook/model/BaseModel.java @@ -27,6 +27,7 @@ import org.mxchange.addressbook.BaseFrameworkSystem; * @author Roland Haeder */ public class BaseModel extends BaseFrameworkSystem { + /** * List of event listeners */ @@ -48,7 +49,7 @@ public class BaseModel extends BaseFrameworkSystem { public void addListDataListener (final ListDataListener listener) { // Debug message this.getLogger().debug(MessageFormat.format("Adding listener {0} ...", listener.getClass())); - + // Remove listener this.eventListenerList.add(ListDataListener.class, listener); } @@ -81,7 +82,7 @@ public class BaseModel extends BaseFrameworkSystem { /** * Removes a TableModel listener instance from the event list. - * + * * @param listener Listener instance */ public void removeTableModelListener (final TableModelListener listener) {