From e7491da4c52e0e6cc223032222e494e8dc1f3bb1 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 9 Oct 2015 21:37:56 +0200 Subject: [PATCH] Auto-formatted whole project --- build.xml | 44 ++-- nbproject/ant-deploy.xml | 212 +++++++++--------- nbproject/build-impl.xml | 72 +++--- nbproject/faces-config.NavData | 104 ++++----- nbproject/project.xml | 146 ++++++------ .../beans/addressbook/AddressbookWebBean.java | 16 +- .../addressbook/AddressbookWebController.java | 10 +- .../addressbook/beans/user/UserWebBean.java | 24 +- .../beans/user/UserWebController.java | 2 + web/WEB-INF/templates/guest/guest_base.tpl | 4 +- web/WEB-INF/templates/guest/guest_footer.tpl | 16 +- web/WEB-INF/templates/guest/guest_menu.tpl | 24 +- web/WEB-INF/templates/login/login_footer.tpl | 16 +- web/WEB-INF/templates/login/login_menu.tpl | 28 ++- 14 files changed, 382 insertions(+), 336 deletions(-) diff --git a/build.xml b/build.xml index aa84465d..c1e4ecde 100644 --- a/build.xml +++ b/build.xml @@ -12,27 +12,27 @@ + --> diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml index 2d5f8778..3c015605 100644 --- a/nbproject/ant-deploy.xml +++ b/nbproject/ant-deploy.xml @@ -1,111 +1,111 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index f151f5a3..4de471dc 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f The libs.CopyLibs.classpath property is not set up. -This property must point to +This property must point to org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at +of NetBeans IDE installation and is usually located at <netbeans_installation>/java<version>/ant/extra folder. Either open the project in the IDE and make sure CopyLibs library exists or setup the property manually. For example like this: @@ -1368,7 +1368,7 @@ exists or setup the property manually. For example like this: @@ -1407,7 +1407,7 @@ exists or setup the property manually. For example like this: @@ -1443,7 +1443,7 @@ exists or setup the property manually. For example like this: @@ -1465,35 +1465,35 @@ exists or setup the property manually. For example like this: - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + CLEANUP SECTION + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index f1818296..a28edad9 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -1,55 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/project.xml b/nbproject/project.xml index 8a21668f..a7f5af57 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,76 +1,76 @@ - org.netbeans.modules.web.project - - - addressbook-war - 1.6.5 - - - ${file.reference.jcore.jar} - WEB-INF/lib - - - ${file.reference.jcoreee.jar} - WEB-INF/lib - - - ${file.reference.jcore-logger-lib.jar} - WEB-INF/lib - - - ${file.reference.jcontacts-core.jar} - WEB-INF/lib - - - ${file.reference.jcontacts-business-core.jar} - WEB-INF/lib - - - ${file.reference.jcontacts-lib.jar} - WEB-INF/lib - - - ${file.reference.juser-core.jar} - WEB-INF/lib - - - ${file.reference.juser-lib.jar} - WEB-INF/lib - - - ${reference.addressbook-lib.jar} - WEB-INF/lib - - - ${file.reference.cdi-api.jar} - WEB-INF/lib - - - ${file.reference.gf-client.jar} - WEB-INF/lib - - - - - - - - - - - - .\lib\nblibraries.properties - - - - addressbook-lib - jar - - jar - clean - jar - - - + org.netbeans.modules.web.project + + + addressbook-war + 1.6.5 + + + ${file.reference.jcore.jar} + WEB-INF/lib + + + ${file.reference.jcoreee.jar} + WEB-INF/lib + + + ${file.reference.jcore-logger-lib.jar} + WEB-INF/lib + + + ${file.reference.jcontacts-core.jar} + WEB-INF/lib + + + ${file.reference.jcontacts-business-core.jar} + WEB-INF/lib + + + ${file.reference.jcontacts-lib.jar} + WEB-INF/lib + + + ${file.reference.juser-core.jar} + WEB-INF/lib + + + ${file.reference.juser-lib.jar} + WEB-INF/lib + + + ${reference.addressbook-lib.jar} + WEB-INF/lib + + + ${file.reference.cdi-api.jar} + WEB-INF/lib + + + ${file.reference.gf-client.jar} + WEB-INF/lib + + + + + + + + + + + + .\lib\nblibraries.properties + + + + addressbook-lib + jar + + jar + clean + jar + + + diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java index 8ea68860..078626ab 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java @@ -39,7 +39,7 @@ import org.mxchange.addressbook.model.addressbook.status.AddressbokStatus; *

* @author Roland Haeder */ -@Named("addressbookController") +@Named ("addressbookController") @SessionScoped public class AddressbookWebBean implements AddressbookWebController { @@ -73,7 +73,7 @@ public class AddressbookWebBean implements AddressbookWebController { /** * Default constructor */ - public AddressbookWebBean() { + public AddressbookWebBean () { // Try it try { // Get initial context @@ -88,7 +88,7 @@ public class AddressbookWebBean implements AddressbookWebController { } @PostConstruct - public void init() { + public void init () { // Init list this.addressbookList = new ArrayList<>(0); @@ -100,7 +100,7 @@ public class AddressbookWebBean implements AddressbookWebController { } @Override - public boolean hasCreatedAddressbooks() { + public boolean hasCreatedAddressbooks () { // Is the user logged in? if (!this.loginController.isUserLoggedIn()) { // Not logged in @@ -112,7 +112,7 @@ public class AddressbookWebBean implements AddressbookWebController { } @Override - public void addAddressbook() { + public void addAddressbook () { // Is this name already used? if (!this.loginController.isUserLoggedIn()) { // Not logged in @@ -151,17 +151,17 @@ public class AddressbookWebBean implements AddressbookWebController { } @Override - public String getAddressbookName() { + public String getAddressbookName () { return this.addressbookName; } @Override - public void setAddressbookName(final String addressbookName) { + public void setAddressbookName (final String addressbookName) { this.addressbookName = addressbookName; } @Override - public boolean isAddressbookNameUsed(final String addressbookName) { + public boolean isAddressbookNameUsed (final String addressbookName) { // Is it zero size? if (null == addressbookName) { // Is null diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java index d4adf218..3d5a8154 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java @@ -31,27 +31,27 @@ public interface AddressbookWebController extends Serializable { *

* @return Whether the user has created at least one addressbook */ - public boolean hasCreatedAddressbooks(); + public boolean hasCreatedAddressbooks (); /** * Creates a new address book with a name. For this method to work it is * vital that the user is logged into his/her account. */ - public void addAddressbook(); + public void addAddressbook (); /** * Getter for address book name *

* @return Address book name */ - public String getAddressbookName(); + public String getAddressbookName (); /** * Setter for address book name *

* @param addressbookName Address book name */ - public void setAddressbookName(final String addressbookName); + public void setAddressbookName (final String addressbookName); /** * Checks if the given address book name is already used by the user. @@ -60,5 +60,5 @@ public interface AddressbookWebController extends Serializable { *

* @return Whether the name has already been used by the user */ - public boolean isAddressbookNameUsed(final String addressbookName); + public boolean isAddressbookNameUsed (final String addressbookName); } diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java index fdf037db..9739db93 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java @@ -498,18 +498,18 @@ public class UserWebBean implements UserWebController { @Override public boolean isRequiredPersonalDataSet () { - return ((this.getUserName() != null) - && (this.getGender() != null) - && (this.getFirstName() != null) - && (this.getFamilyName() != null) - && (this.getStreet() != null) - && (this.getHouseNumber() != null) - && (this.getZipCode() != null) - && (this.getCity() != null) - && (this.getEmailAddress() != null) - && (this.getEmailAddressRepeat() != null) - && (this.getUserPassword() != null) - && (this.getUserPasswordRepeat() != null)); + return ((this.getUserName() != null) && + (this.getGender() != null) && + (this.getFirstName() != null) && + (this.getFamilyName() != null) && + (this.getStreet() != null) && + (this.getHouseNumber() != null) && + (this.getZipCode() != null) && + (this.getCity() != null) && + (this.getEmailAddress() != null) && + (this.getEmailAddressRepeat() != null) && + (this.getUserPassword() != null) && + (this.getUserPasswordRepeat() != null)); } @Override diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java index a661d10e..56b2da08 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java @@ -324,6 +324,7 @@ public interface UserWebController extends Serializable { * Checks whether user instance's email address is used *

* @param user User instance's email address to check + *

* @return Whether it is already used */ public boolean isEmailAddressRegistered (final User user); @@ -353,6 +354,7 @@ public interface UserWebController extends Serializable { * Checks whether given user instance's name is used *

* @param user User instance's name to check + *

* @return Whether it is already used */ public boolean isUserNameRegistered (final User user); diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index 4ad527bb..407a67ce 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -4,7 +4,9 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"> - + + + diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index e327def5..2449e844 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -6,10 +6,18 @@ xmlns:ui="http://java.sun.com/jsf/facelets">

    -
    • -
    • -
    • -
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
  • Copyright (c) 2015 by Roland Häder
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index 9c2b948d..f2134194 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -12,8 +12,12 @@
    -
    • -
    • +
  • + +
    • +
  • + +
@@ -21,10 +25,18 @@
    -
    • -
    • -
    • -
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
diff --git a/web/WEB-INF/templates/login/login_footer.tpl b/web/WEB-INF/templates/login/login_footer.tpl index 98fd01dc..7a8b04e5 100644 --- a/web/WEB-INF/templates/login/login_footer.tpl +++ b/web/WEB-INF/templates/login/login_footer.tpl @@ -6,10 +6,18 @@ xmlns:ui="http://java.sun.com/jsf/facelets">
    -
    • -
    • -
    • -
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
  • Copyright (c) 2015 by Roland Häder
diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl index 70b7f101..5133db82 100644 --- a/web/WEB-INF/templates/login/login_menu.tpl +++ b/web/WEB-INF/templates/login/login_menu.tpl @@ -12,8 +12,12 @@
    -
    • -
    • +
  • + +
    • +
  • + +
@@ -21,8 +25,12 @@
    -
    • -
    • +
  • + +
    • +
  • + +
@@ -30,8 +38,12 @@
    -
    • -
    • +
  • + +
    • +
  • + +
@@ -39,7 +51,9 @@
    -
    • +
  • + +
-- 2.39.5