]> git.mxchange.org Git - jaddressbook-lib.git/commitdiff
Auto-formation and yes, it is better this way
authorRoland Haeder <roland@mxchange.org>
Tue, 28 Jul 2015 11:44:26 +0000 (13:44 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 28 Jul 2015 11:44:26 +0000 (13:44 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

15 files changed:
Addressbook/build.xml
Addressbook/src/log4j2.xml
Addressbook/src/org/mxchange/addressbook/BaseFrameworkSystem.java
Addressbook/src/org/mxchange/addressbook/FrameworkInterface.java
Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java
Addressbook/src/org/mxchange/addressbook/client/Client.java
Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java
Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
Addressbook/src/org/mxchange/addressbook/client/gui/SwingClient.java
Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java
Addressbook/src/org/mxchange/addressbook/contact/Gender.java
Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java
Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
Addressbook/src/org/mxchange/addressbook/menu/MenuTools.java
Addressbook/src/org/mxchange/addressbook/model/BaseModel.java

index c24405d92227b060e9dbe0be371ca20129c99e7a..b72f99da1c193f79db1ec1fd5fe34ce5834c9544 100644 (file)
@@ -69,5 +69,5 @@
     properties which you can use, check the target you are overriding in the
     nbproject/build-impl.xml file. 
 
-    -->
+       -->
 </project>
index cafb433353391a258d13b974d7d0d5c9b1992b20..d54528779709c848cfc5cbb23b88c670af70e7dd 100644 (file)
@@ -16,14 +16,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <Configuration status="WARN">
-  <Appenders>
-    <Console name="STDOUT" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="trace">
-      <AppenderRef ref="STDOUT" level="TRACE"/>
-    </Root>
-  </Loggers>
+       <Appenders>
+               <Console name="STDOUT" target="SYSTEM_OUT">
+                       <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+               </Console>
+       </Appenders>
+       <Loggers>
+               <Root level="trace">
+                       <AppenderRef ref="STDOUT" level="TRACE"/>
+               </Root>
+       </Loggers>
 </Configuration>
index b104090c5ba9f218fe1c7bd0f44a98097777af44..555d9ed7171f87d83a0ad65170c12d60aade1c47 100644 (file)
@@ -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
         */
index fc44b3fcf11433edced8c75f21fa7acc9cf6668d..822be62dbdfd42055e68583673eccbfc6ca9d35b 100644 (file)
@@ -50,7 +50,7 @@ public interface FrameworkInterface {
 
        /**
         * Getter for human-readable string from given key
-        * 
+        *
         * @param key Key to return
         * @return Human-readable message
         */
index 7f55a382725a8c1b0936dc399621f00bccc6ce82..2f4f185617f6c50bc821018a211a659b7cef5805 100644 (file)
@@ -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 () {
index 9ebbc14c79b1547bea2ed702a1790d9a74703f5d..aba84ef2eaeaaafcc7309f5d6ed0ad5727f54150 100644 (file)
@@ -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
         */
index 846d4bb95df7949817f8b9f915f8317af915da65..9de67f1a2787a11e439683e57506bbed96c9f089 100644 (file)
@@ -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);
 
index fdc59e1e990e50d7e1e4b377e3e83552f1011e7a..92e8dfe375646bba016972fa4d2fc863ae1ce076 100644 (file)
@@ -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> 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
        }
 }
index 634b0cf2cf4cca5c1bad26da82e637102ac59517..17d3e1b05ae300c444f5678a85b3c335fed43bd4 100644 (file)
@@ -87,7 +87,7 @@ public class SwingClient extends BaseClient implements Client {
 
        /**
         * Shows dialog to enter new contact
-        * 
+        *
         * @return Returns finished Contact instance
         */
        @Override
index 2db18d27525b9c524b5d62bea208542a313d90ec..42be4d329675aca8ce004011c09a85adeb1a8d75 100644 (file)
@@ -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());
index 6bd68df38d9ea1a745564c176dee70d483ddd945..cdfab047a3dfb96a10e12cdc51856e1c55364439 100644 (file)
@@ -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
index 2715b5e1597c891ed7a4f39dbaea252db515fa20..b8ab55df0e93ef7289ce9508c25d52bddd0bfa35 100644 (file)
@@ -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<Contact> 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);
index 107bf3f1acfa24bfbe973571004fc40c015bf5f0..62bcfbd484c678bdfe1095beedc0dfd655572557 100644 (file)
@@ -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<Contact> 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)))) {
index 44d5395c398b513d852ff994ff74af767404b43f..a8d5bd3cec318c4a4321ca1b03078c2db18c12f8 100644 (file)
@@ -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);
index 22c7e8d368a3d99242a0558f28353b017ca9a0c5..e1991653254cbfa55a40ec21cb5171f286efcbea 100644 (file)
@@ -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) {