From 4e789b77f2a6fcdd6cb4e7b3acd9ce00a388a111 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 9 Oct 2015 21:37:48 +0200 Subject: [PATCH] Auto-formatted whole project --- build.xml | 22 +- nbproject/build-impl.xml | 2806 ++++++++--------- nbproject/project.xml | 50 +- .../addressbook/BaseAddressbookSystem.java | 2 +- .../application/AddressbookApplication.java | 2 +- .../addressbook/client/AddressbookClient.java | 11 +- .../client/BaseAddressbookClient.java | 3 +- .../client/console/ConsoleClient.java | 2 +- .../client/gui/AddressbookFrame.java | 4 + .../addressbook/client/gui/SwingClient.java | 1 + .../contact/AddressbookContactFacade.java | 1 + .../facade/contact/ContactFacade.java | 11 +- .../mxchange/addressbook/menu/MenuTools.java | 5 +- 13 files changed, 1472 insertions(+), 1448 deletions(-) diff --git a/build.xml b/build.xml index 93e259a..3cce210 100644 --- a/build.xml +++ b/build.xml @@ -12,9 +12,9 @@ + --> diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 7a1b05a..93e31a9 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -18,1408 +18,1408 @@ is divided into following sections: - applet - cleanup - --> +--> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - Must select one file in the IDE or set profile.class - This target only works when run from inside the NetBeans IDE. - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - Must select some files in the IDE or set test.includes - - - - - Must select one file in the IDE or set run.class - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/project.xml b/nbproject/project.xml index 9183d1b..6ba2092 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,28 +1,28 @@ - org.netbeans.modules.java.j2seproject - - - addressbook-swing - - - - - - - - - .\lib\nblibraries.properties - - - - addressbook-lib - jar - - jar - clean - jar - - - + org.netbeans.modules.java.j2seproject + + + addressbook-swing + + + + + + + + + .\lib\nblibraries.properties + + + + addressbook-lib + jar + + jar + clean + jar + + + diff --git a/src/org/mxchange/addressbook/BaseAddressbookSystem.java b/src/org/mxchange/addressbook/BaseAddressbookSystem.java index 772922b..a0e2457 100644 --- a/src/org/mxchange/addressbook/BaseAddressbookSystem.java +++ b/src/org/mxchange/addressbook/BaseAddressbookSystem.java @@ -60,7 +60,7 @@ public abstract class BaseAddressbookSystem extends BaseFrameworkSystem { protected void abortProgramWithException (final Throwable throwable) { // Log exception this.logException(throwable); - + // Abort here System.exit(1); } diff --git a/src/org/mxchange/addressbook/application/AddressbookApplication.java b/src/org/mxchange/addressbook/application/AddressbookApplication.java index 921078d..c84b7f4 100644 --- a/src/org/mxchange/addressbook/application/AddressbookApplication.java +++ b/src/org/mxchange/addressbook/application/AddressbookApplication.java @@ -367,7 +367,7 @@ public class AddressbookApplication extends BaseApplication implements Applicati protected void abortProgramWithException (final Throwable throwable) { // Log exception this.logException(throwable); - + // Abort here System.exit(1); } diff --git a/src/org/mxchange/addressbook/client/AddressbookClient.java b/src/org/mxchange/addressbook/client/AddressbookClient.java index ff8442b..4961722 100644 --- a/src/org/mxchange/addressbook/client/AddressbookClient.java +++ b/src/org/mxchange/addressbook/client/AddressbookClient.java @@ -53,7 +53,7 @@ public interface AddressbookClient extends Client { /** * Shows given contact instamce - * + *

* @param contact Contact instance */ public void show (final Contact contact); @@ -90,7 +90,8 @@ public interface AddressbookClient extends Client { * Asks the user for a choice and proceeds accordingly *

* @throws UnhandledUserChoiceException If choice is not supported - * @throws org.mxchange.jcore.exceptions.MenuInitializationException If the menu cannot be initialized + * @throws org.mxchange.jcore.exceptions.MenuInitializationException If the + * menu cannot be initialized */ public void doUserMenuChoice () throws UnhandledUserChoiceException, MenuInitializationException; @@ -99,6 +100,7 @@ public interface AddressbookClient extends Client { *

* @param validChars Valid chars that are accepted * @param message Message to user + *

* @return Allowed character */ public char enterChar (final char[] validChars, final String message); @@ -107,6 +109,7 @@ public interface AddressbookClient extends Client { * Asks the user to enter his/her gender (M=Male, F=Female, C=Company) *

* @param message Message to output + *

* @return Gender enum */ public Gender enterGender (final String message); @@ -117,6 +120,7 @@ public interface AddressbookClient extends Client { * @param minimum Minimum allowed number * @param maximum Maximum allowed number * @param message Message to user + *

* @return Entered string by user or null if empty string is allowed */ public int enterInt (final int minimum, final int maximum, final String message); @@ -130,6 +134,7 @@ public interface AddressbookClient extends Client { * @param maxLength Maximum length of the string to read * @param message Message to user * @param allowEmpty Whether empty strings are allowed + *

* @return Entered string by user or null if empty string is allowed */ public String enterString (final int minLength, final int maxLength, final String message, final boolean allowEmpty); @@ -146,6 +151,7 @@ public interface AddressbookClient extends Client { *

* @param accessKey Key to press to access this menu * @param text Text to show to user + *

* @return */ public SelectableMenuItem getMenuItem (final char accessKey, final String text); @@ -167,6 +173,7 @@ public interface AddressbookClient extends Client { * [o]ther *

* @param contact Contact instance to let the user change data + *

* @throws UnhandledUserChoiceException If choice is not supported */ public void userChooseChangeContactData (final Contact contact) throws UnhandledUserChoiceException; diff --git a/src/org/mxchange/addressbook/client/BaseAddressbookClient.java b/src/org/mxchange/addressbook/client/BaseAddressbookClient.java index 69b631d..3dced1b 100644 --- a/src/org/mxchange/addressbook/client/BaseAddressbookClient.java +++ b/src/org/mxchange/addressbook/client/BaseAddressbookClient.java @@ -92,6 +92,7 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres * "Getter" for given menu type *

* @param menuType Menu type instance to return + *

* @return Menu or null if not found */ private Menu getMenu (final String menuType) { @@ -116,7 +117,7 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres protected void abortProgramWithException (final Throwable throwable) { // Log exception this.logException(throwable); - + // Abort here System.exit(1); } diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java index d2c31eb..5cdc068 100644 --- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -545,7 +545,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC } // Ask the user for editing [name], [a]ddress or [other] data - char choice = this.enterChar(new char[] {'n', 'a', 'o', 'x'}, "Welchen Daten möchten Sie ändern? (n=Namensdaten, a=Anschriftsdaten, o=Andere, x=Zurück zur Hauptauswahl) "); + char choice = this.enterChar(new char[]{'n', 'a', 'o', 'x'}, "Welchen Daten möchten Sie ändern? (n=Namensdaten, a=Anschriftsdaten, o=Andere, x=Zurück zur Hauptauswahl) "); // Get manager and cast it ContactFacade manager = (ContactFacade) this.getFacade(); diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java index 3f1f05a..c6c41b5 100644 --- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -75,6 +75,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra * Singelton getter for this frame instance. *

* @param client Client instance + *

* @return Returns a singelton instance of this frame */ public static final ClientFrame getSelfInstance (final Client client) { @@ -384,6 +385,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra * Generates a title for borders *

* @param key Key part to look for + *

* @return Human-readable title */ private String generateBorderTitle (final String key) { @@ -396,6 +398,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra * given, the sub title is not generated. *

* @param subKey Key for sub title resource + *

* @return A full application title */ private String generateFrameTitle (final String subKey) { @@ -636,6 +639,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra * Initializes a menu item instance with tool tip *

* @param key Message key part + *

* @return A finished JMenuItem instance */ private JMenuItem initMenuItemWithTooltip (final String key) { diff --git a/src/org/mxchange/addressbook/client/gui/SwingClient.java b/src/org/mxchange/addressbook/client/gui/SwingClient.java index 7bfc503..82cf84e 100644 --- a/src/org/mxchange/addressbook/client/gui/SwingClient.java +++ b/src/org/mxchange/addressbook/client/gui/SwingClient.java @@ -155,6 +155,7 @@ public class SwingClient extends BaseAddressbookClient implements AddressbookCli *

* @param accessKey Key to access the menu * @param text Text to show to user + *

* @return A SelectableMenuItem */ @Override diff --git a/src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java b/src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java index 592d5b7..9aabe4d 100644 --- a/src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java +++ b/src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java @@ -70,6 +70,7 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad * a client instance. *

* @param client Client instance to use + *

* @throws java.sql.SQLException If an SQL error occurs */ public AddressbookContactFacade (final Client client) throws SQLException { diff --git a/src/org/mxchange/addressbook/facade/contact/ContactFacade.java b/src/org/mxchange/addressbook/facade/contact/ContactFacade.java index aac08dd..c0dc2dd 100644 --- a/src/org/mxchange/addressbook/facade/contact/ContactFacade.java +++ b/src/org/mxchange/addressbook/facade/contact/ContactFacade.java @@ -33,7 +33,9 @@ public interface ContactFacade extends Facade { * Adds given Contact instance to list *

* @param contact Contact instance to add - * @throws org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException If the contact is already added + *

+ * @throws org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException If + * the contact is already added */ public void addContact (final Contact contact) throws ContactAlreadyAddedException; @@ -84,7 +86,8 @@ public interface ContactFacade extends Facade { /** * Asks user for own data *

- * @throws org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException If own contact is already added + * @throws org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException If + * own contact is already added * @throws java.io.IOException If an IO error was found */ public void doEnterOwnData () throws ContactAlreadyAddedException; @@ -201,6 +204,7 @@ public interface ContactFacade extends Facade { * Getter for column name at given index. *

* @param columnIndex Column index + *

* @return Database column name TODO: This is needed for TableModel in Swing */ public String getColumnName (final int columnIndex); @@ -209,6 +213,7 @@ public interface ContactFacade extends Facade { * Getter for translated column name at given index. *

* @param columnIndex Column index + *

* @return Human-readable column name TODO: This is needed for TableModel in * Swing */ @@ -219,6 +224,7 @@ public interface ContactFacade extends Facade { *

* @param rowIndex Row index * @param columnIndex Column index + *

* @return Value from given row/column */ public Object getValueFromRowColumn (final int rowIndex, final int columnIndex); @@ -228,6 +234,7 @@ public interface ContactFacade extends Facade { * isOwnContact flag *

* @return Whether own contact is already added + *

* @throws java.io.IOException If an IO error occurs */ public boolean isOwnContactAdded () throws IOException; diff --git a/src/org/mxchange/addressbook/menu/MenuTools.java b/src/org/mxchange/addressbook/menu/MenuTools.java index 87f8c11..bc90ec8 100644 --- a/src/org/mxchange/addressbook/menu/MenuTools.java +++ b/src/org/mxchange/addressbook/menu/MenuTools.java @@ -35,8 +35,11 @@ public class MenuTools extends BaseAddressbookSystem { *

* @param menus A Map with all menus and their entries * @param menuType Menu type + *

* @return An array with available access chars - * @throws org.mxchange.jcore.exceptions.MenuInitializationException If the menu cannot be initialized + *

+ * @throws org.mxchange.jcore.exceptions.MenuInitializationException If the + * menu cannot be initialized */ public static char[] getAccessKeysFromMenuMap (final Map menus, final String menuType) throws MenuInitializationException { // First search for the proper menu class -- 2.39.5