From: Roland Haeder Date: Tue, 29 Sep 2015 08:36:40 +0000 (+0200) Subject: auto-formatted project + updated jars X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=672084ab2c551cbff8c8c424780ed344f7c13925;p=jshop-core.git auto-formatted project + updated jars Signed-off-by:Roland Häder --- diff --git a/build.xml b/build.xml index 6379c06..c213c8a 100644 --- a/build.xml +++ b/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/lib/jcore.jar b/lib/jcore.jar index 7884f3d..2179b37 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 621440d..c276670 100644 Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index e841dc3..25a9570 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -18,1421 +18,1421 @@ 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 feaeefa..5c51ec6 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,19 +1,19 @@ - org.netbeans.modules.java.j2seproject - - - jshop-core - - - - - - - - - ./lib/nblibraries.properties - - - + org.netbeans.modules.java.j2seproject + + + jshop-core + + + + + + + + + ./lib/nblibraries.properties + + + diff --git a/src/org/mxchange/jshopcore/exceptions/BasketItemAlreadyAddedException.java b/src/org/mxchange/jshopcore/exceptions/BasketItemAlreadyAddedException.java index 053d7fb..6f09ee9 100644 --- a/src/org/mxchange/jshopcore/exceptions/BasketItemAlreadyAddedException.java +++ b/src/org/mxchange/jshopcore/exceptions/BasketItemAlreadyAddedException.java @@ -22,7 +22,7 @@ import org.mxchange.jshopcore.model.basket.AddableBasketItem; /** * An exception thrown when the given item is already added to the * basketController. - * + *

* @author Roland Haeder */ public class BasketItemAlreadyAddedException extends Exception { @@ -34,7 +34,7 @@ public class BasketItemAlreadyAddedException extends Exception { /** * Constructor with item instance T - * + *

* @param Any item that is or extends the interface * @param item An instance of a T item */ diff --git a/src/org/mxchange/jshopcore/exceptions/CannotAddCategoryException.java b/src/org/mxchange/jshopcore/exceptions/CannotAddCategoryException.java index 45247a4..2bc03de 100644 --- a/src/org/mxchange/jshopcore/exceptions/CannotAddCategoryException.java +++ b/src/org/mxchange/jshopcore/exceptions/CannotAddCategoryException.java @@ -19,7 +19,7 @@ package org.mxchange.jshopcore.exceptions; /** * An exception thrown when the category cannot be added for a "low level" * reason. - * + *

* @author Roland Haeder */ public class CannotAddCategoryException extends Exception { @@ -31,7 +31,7 @@ public class CannotAddCategoryException extends Exception { /** * Constructor with cause - * + *

* @param cause Causing exception */ public CannotAddCategoryException (final Throwable cause) { diff --git a/src/org/mxchange/jshopcore/exceptions/CannotAddProductException.java b/src/org/mxchange/jshopcore/exceptions/CannotAddProductException.java index 7dd1acc..beb077f 100644 --- a/src/org/mxchange/jshopcore/exceptions/CannotAddProductException.java +++ b/src/org/mxchange/jshopcore/exceptions/CannotAddProductException.java @@ -19,7 +19,7 @@ package org.mxchange.jshopcore.exceptions; /** * An exception thrown when the product cannot be added for a "low level" * reason. - * + *

* @author Roland Haeder */ public class CannotAddProductException extends Exception { @@ -31,7 +31,7 @@ public class CannotAddProductException extends Exception { /** * Constructor with cause - * + *

* @param cause Causing exception */ public CannotAddProductException (final Throwable cause) { diff --git a/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java b/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java index 33db0d6..8c477a2 100644 --- a/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java +++ b/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java @@ -21,7 +21,7 @@ import org.mxchange.jshopcore.model.category.Category; /** * An exception thrown when the given title is already used - * + *

* @author Roland Haeder */ public class CategoryTitleAlreadyUsedException extends Exception { @@ -33,7 +33,7 @@ public class CategoryTitleAlreadyUsedException extends Exception { /** * Constructor with HttpServletRequest instance - * + *

* @param category Category instance */ public CategoryTitleAlreadyUsedException (final Category category) { diff --git a/src/org/mxchange/jshopcore/exceptions/CustomerAlreadyRegisteredException.java b/src/org/mxchange/jshopcore/exceptions/CustomerAlreadyRegisteredException.java index f095b5b..187ae56 100644 --- a/src/org/mxchange/jshopcore/exceptions/CustomerAlreadyRegisteredException.java +++ b/src/org/mxchange/jshopcore/exceptions/CustomerAlreadyRegisteredException.java @@ -21,7 +21,7 @@ import org.mxchange.jshopcore.model.customer.Customer; /** * An exception thrown when the customer is already registered - * + *

* @author Roland Haeder */ public class CustomerAlreadyRegisteredException extends Exception { @@ -33,7 +33,7 @@ public class CustomerAlreadyRegisteredException extends Exception { /** * Constructor with already registered customer instance - * + *

* @param customer Customer instance */ public CustomerAlreadyRegisteredException (final Customer customer) { diff --git a/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java b/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java index 0a1989a..a2246de 100644 --- a/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java +++ b/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java @@ -21,7 +21,7 @@ import org.mxchange.jshopcore.model.product.Product; /** * An exception thrown when the given title is already used - * + *

* @author Roland Haeder */ public class ProductTitleAlreadyUsedException extends Exception { @@ -33,7 +33,7 @@ public class ProductTitleAlreadyUsedException extends Exception { /** * Constructor with HttpServletRequest instance - * + *

* @param product Product instance */ public ProductTitleAlreadyUsedException (final Product product) { diff --git a/src/org/mxchange/jshopcore/model/basket/AddableBasketItem.java b/src/org/mxchange/jshopcore/model/basket/AddableBasketItem.java index 023729d..a732413 100644 --- a/src/org/mxchange/jshopcore/model/basket/AddableBasketItem.java +++ b/src/org/mxchange/jshopcore/model/basket/AddableBasketItem.java @@ -21,14 +21,14 @@ import org.mxchange.jshopcore.model.product.Product; /** * An interface for addable basket items - * + *

* @author Roland Haeder */ public interface AddableBasketItem extends Serializable { /** * Check equality on item instance - * + *

* @param object Other object to check */ @Override @@ -36,56 +36,56 @@ public interface AddableBasketItem extends Serializable { /** * Getter for item amount - * + *

* @return the amount */ public Long getOrderedAmount (); /** * Setter for item amount - * + *

* @param amount the amount to set */ public void setOrderedAmount (final Long amount); /** * Getter for entry id (from database backend) - * + *

* @return the id */ public Long getItemId (); /** * Setter for entry id (from database backend) - * + *

* @param id the id to set */ public void setItemId (final Long id); /** * Getter for item type - * + *

* @return the type */ public String getItemType (); /** * Setter for item type - * + *

* @param type the type to set */ public void setItemType (final String type); /** * Getter for product instance - * + *

* @return the product */ public Product getItemProduct (); /** * Setter fo product instance - * + *

* @param product the product to set */ public void setItemProduct (final Product product); @@ -98,7 +98,7 @@ public interface AddableBasketItem extends Serializable { /** * Determines whether the item has a Product instance set - * + *

* @return Whether a Product instance is set */ public boolean isProductType (); diff --git a/src/org/mxchange/jshopcore/model/basket/BaseBasket.java b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java index 4d8e7c4..85df7bb 100644 --- a/src/org/mxchange/jshopcore/model/basket/BaseBasket.java +++ b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java @@ -24,7 +24,7 @@ import org.mxchange.jshopcore.exceptions.BasketItemAlreadyAddedException; /** * A general basket class. This class does not store any properties, it only * contains logic for handling the items (T). - * + *

* @author Roland Haeder * @param Any instance that implements AddableBasketItem */ diff --git a/src/org/mxchange/jshopcore/model/basket/Basket.java b/src/org/mxchange/jshopcore/model/basket/Basket.java index 1a9dabe..28d1eeb 100644 --- a/src/org/mxchange/jshopcore/model/basket/Basket.java +++ b/src/org/mxchange/jshopcore/model/basket/Basket.java @@ -22,7 +22,7 @@ import org.mxchange.jshopcore.exceptions.BasketItemAlreadyAddedException; /** * An interface for baskets - * + *

* @author Roland Haeder * @param Any addable basket items */ @@ -30,7 +30,7 @@ public interface Basket extends Serializable { /** * Adds given item instance to this basket - * + *

* @param item Item instance to add * @throws org.mxchange.jshopcore.exceptions.BasketItemAlreadyAddedException * If the item instance has already been added @@ -44,21 +44,21 @@ public interface Basket extends Serializable { /** * Some "getter" for all entries in this basket - * + *

* @return Map on all basket items */ public List getAll (); /** * Getter for last entry - * + *

* @return Last added item in basket */ public T getLast (); /** * Getter for last num rows - * + *

* @return Last num rows */ public int getLastNumRows (); @@ -66,7 +66,7 @@ public interface Basket extends Serializable { /** * Checks whether the given item has already been added by checking the * item's id. - * + *

* @param item Item instance to check * @return Whether the given item has been found */ @@ -74,7 +74,7 @@ public interface Basket extends Serializable { /** * Checks if the basket is empty - * + *

* @return Whether the basket is empty */ public boolean isEmpty (); diff --git a/src/org/mxchange/jshopcore/model/basket/ShopBasket.java b/src/org/mxchange/jshopcore/model/basket/ShopBasket.java index 635f55c..48647d2 100644 --- a/src/org/mxchange/jshopcore/model/basket/ShopBasket.java +++ b/src/org/mxchange/jshopcore/model/basket/ShopBasket.java @@ -18,7 +18,7 @@ package org.mxchange.jshopcore.model.basket; /** * A basket for orderable items - * + *

* @author Roland Haeder */ public class ShopBasket extends BaseBasket implements Basket { diff --git a/src/org/mxchange/jshopcore/model/basket/items/BaseItem.java b/src/org/mxchange/jshopcore/model/basket/items/BaseItem.java index 6c2309f..f7fb199 100644 --- a/src/org/mxchange/jshopcore/model/basket/items/BaseItem.java +++ b/src/org/mxchange/jshopcore/model/basket/items/BaseItem.java @@ -23,7 +23,7 @@ import org.mxchange.jshopcore.model.product.Product; /** * An item (addedable to a basket) could respresent a product or a discount * coupon. This depends on the type of the item. - * + *

* @author Roland Haeder */ public abstract class BaseItem implements AddableBasketItem, Comparable { diff --git a/src/org/mxchange/jshopcore/model/basket/items/BasketItem.java b/src/org/mxchange/jshopcore/model/basket/items/BasketItem.java index 5cb551d..83775c3 100644 --- a/src/org/mxchange/jshopcore/model/basket/items/BasketItem.java +++ b/src/org/mxchange/jshopcore/model/basket/items/BasketItem.java @@ -31,7 +31,7 @@ import org.mxchange.jshopcore.model.product.Product; /** * A general basket item - * + *

* @author Roland Haeder */ @Entity (name = "basket_items") @@ -80,7 +80,7 @@ public class BasketItem extends BaseItem implements AddableBasketItem { /** * Constructor for an item from given Product instance - * + *

* @param product Product instance */ public BasketItem (final Product product) { @@ -102,7 +102,7 @@ public class BasketItem extends BaseItem implements AddableBasketItem { /** * Constructor for an item from given Product instance and orderedAmount. - * + *

* @param product Product instance * @param amount Ordered orderedAmount */ diff --git a/src/org/mxchange/jshopcore/model/category/Category.java b/src/org/mxchange/jshopcore/model/category/Category.java index 5b47563..43b2d26 100644 --- a/src/org/mxchange/jshopcore/model/category/Category.java +++ b/src/org/mxchange/jshopcore/model/category/Category.java @@ -20,56 +20,56 @@ import java.io.Serializable; /** * An interface for categories - * + *

* @author Roland Haeder */ public interface Category extends Serializable { /** * Copies all properties from other category to this - * + *

* @param category Source category instance */ public void copyAll (final Category category); /** * Id number of category - * + *

* @return the id */ public Long getCategoryId (); /** * Id number of category - * + *

* @param id the id to set */ public void setCategoryId (final Long id); /** * Parent category - * + *

* @return the parent category */ public Category getParentCategory (); /** * Parent category - * + *

* @param parentCategory the parent category to set */ public void setParentCategory (final Category parentCategory); /** * Title of category - * + *

* @return the title */ public String getCategoryTitle (); /** * Title of category - * + *

* @param title the title to set */ public void setCategoryTitle (final String title); diff --git a/src/org/mxchange/jshopcore/model/category/ProductCategory.java b/src/org/mxchange/jshopcore/model/category/ProductCategory.java index 2fb8d08..c5b055f 100644 --- a/src/org/mxchange/jshopcore/model/category/ProductCategory.java +++ b/src/org/mxchange/jshopcore/model/category/ProductCategory.java @@ -29,7 +29,7 @@ import javax.persistence.Table; /** * A product category - * + *

* @author Roland Haeder */ @Entity (name = "category") @@ -65,7 +65,7 @@ public class ProductCategory implements Category, Comparable { /** * Constructor which accepts all database fields - * + *

* @param categoryId Id number of database record * @param categoryTitle Category categoryTitle * @param parentCategory Parent category diff --git a/src/org/mxchange/jshopcore/model/customer/Customer.java b/src/org/mxchange/jshopcore/model/customer/Customer.java index ffb8354..0a9492f 100644 --- a/src/org/mxchange/jshopcore/model/customer/Customer.java +++ b/src/org/mxchange/jshopcore/model/customer/Customer.java @@ -23,126 +23,126 @@ import org.mxchange.jshopcore.model.customer.status.CustomerAccountStatus; /** * A customer interface - * + *

* @author Roland Haeder */ public interface Customer extends Serializable { /** * Copies all attributes from other customer object to this - * + *

* @param customer Source instance */ public void copyAll (final Customer customer); /** * Getter for contact instance - * + *

* @return Contact id number */ public Contact getContact (); /** * Setter for contact instance - * + *

* @param contact Contact instance */ public void setContact (final Contact contact); /** * Getter for confirmation key - * + *

* @return Confirmation key */ public String getCustomerConfirmKey (); /** * Setter for confirmation key - * + *

* @param customerConfirmKey Confirmation key */ public void setCustomerConfirmKey (final String customerConfirmKey); /** * Getter for "created" timestamp - * + *

* @return "created" timestamp */ public Calendar getCustomerCreated (); /** * Setter for "created" timestamp - * + *

* @param customerCreated "created" timestamp */ public void setCustomerCreated (final Calendar customerCreated); /** * Getter for customer id number - * + *

* @return Customer id number */ public Long getCustomerId (); /** * Settte for customer id number - * + *

* @param customerId Customer id number */ public void setCustomerId (final Long customerId); /** * Getter for "locked" timestamp - * + *

* @return "locked" timestamp */ public Calendar getCustomerLocked (); /** * Getter for "locked" timestamp - * + *

* @param customerLocked "locked" timestamp */ public void setCustomerLocked (final Calendar customerLocked); /** * Getter for customer number - * + *

* @return Customer number */ public String getCustomerNumber (); /** * Setter for customer number - * + *

* @param customerNumber Customer number */ public void setCustomerNumber (final String customerNumber); /** * Getter for password hash - * + *

* @return Password hash */ public String getCustomerPasswordHash (); /** * Setter for password hash - * + *

* @param customerPasswordHash Password hash */ public void setCustomerPasswordHash (final String customerPasswordHash); /** * Getter for account status - * + *

* @return Account status */ public CustomerAccountStatus getCustomerAccountStatus (); /** * Setter for account status - * + *

* @param customerStatus Account status */ public void setCustomerAccountStatus (final CustomerAccountStatus customerStatus); diff --git a/src/org/mxchange/jshopcore/model/customer/CustomerUtils.java b/src/org/mxchange/jshopcore/model/customer/CustomerUtils.java index 7e660fa..5eb699c 100644 --- a/src/org/mxchange/jshopcore/model/customer/CustomerUtils.java +++ b/src/org/mxchange/jshopcore/model/customer/CustomerUtils.java @@ -27,7 +27,7 @@ import org.mxchange.jshopcore.model.order.ShopOrder; /** * An utilities class for customers - * + *

* @author Roland Haeder */ public class CustomerUtils extends BaseFrameworkSystem { @@ -40,7 +40,7 @@ public class CustomerUtils extends BaseFrameworkSystem { /** * Generates an unique customer number by checking is existence - * + *

* @param em Entity manager instance * @return Generated customer number (not used before) * @throws java.sql.SQLException If any SQL error occured @@ -92,14 +92,13 @@ public class CustomerUtils extends BaseFrameworkSystem { // Trace message // TODO: utils.getLogger().logTrace(MessageFormat.format("generateCustomerNumber: customerNumber={0} - EXIT!", customerNumber)); - // Found one return customerNumber; } /** * Generates an unique access key. - * + *

* @param em Entity manager instance * @param customer Customer instance * @return An unique access key @@ -146,7 +145,6 @@ public class CustomerUtils extends BaseFrameworkSystem { // Trace message // TODO: utils.getLogger().logTrace(MessageFormat.format("generateAccessKey: accessKey={0} - EXIT!", accessKey)); - // Found one return accessKey; } diff --git a/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java index 606f633..6de33c5 100644 --- a/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java +++ b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java @@ -36,7 +36,7 @@ import org.mxchange.jshopcore.model.customer.status.CustomerAccountStatus; /** * A shop customer class. - * + *

* @author Roland Haeder */ @Entity (name = "customer") @@ -101,7 +101,7 @@ public class ShopCustomer implements Customer { */ @Basic (optional = false) @Column (name = "customer_account_status", nullable = false) - @Enumerated(EnumType.STRING) + @Enumerated (EnumType.STRING) private CustomerAccountStatus customerAccountStatus; /** diff --git a/src/org/mxchange/jshopcore/model/customer/status/CustomerAccountStatus.java b/src/org/mxchange/jshopcore/model/customer/status/CustomerAccountStatus.java index 5b41557..d4142da 100644 --- a/src/org/mxchange/jshopcore/model/customer/status/CustomerAccountStatus.java +++ b/src/org/mxchange/jshopcore/model/customer/status/CustomerAccountStatus.java @@ -20,10 +20,11 @@ import java.io.Serializable; /** * An enum for customer's account status like confirmed, locked, etc. - * + *

* @author Roland Haeder */ public enum CustomerAccountStatus implements Serializable { + /** * Unconfirmed (default) */ @@ -46,7 +47,7 @@ public enum CustomerAccountStatus implements Serializable { /** * Constructor with i18n translation key - * + *

* @param messageKey Message key (i18n) */ private CustomerAccountStatus (final String messageKey) { @@ -56,7 +57,7 @@ public enum CustomerAccountStatus implements Serializable { /** * Output value (for messages) - * + *

* @return the messageKey */ public String getMessageKey () { diff --git a/src/org/mxchange/jshopcore/model/order/Orderable.java b/src/org/mxchange/jshopcore/model/order/Orderable.java index d490f6a..1078570 100644 --- a/src/org/mxchange/jshopcore/model/order/Orderable.java +++ b/src/org/mxchange/jshopcore/model/order/Orderable.java @@ -24,77 +24,77 @@ import org.mxchange.jshopcore.model.customer.Customer; /** * An interface for customer orders - * + *

* @author Roland Haeder */ public interface Orderable extends Serializable { /** * Getter for access key - * + *

* @return Access key */ public String getAccessKey (); /** * Setter for access key - * + *

* @param accessKey Access key */ public void setAccessKey (final String accessKey); /** * Getter for created timestamp - * + *

* @return Created timestamp */ public Calendar getOrderCreated (); /** * Setter for created timestamp - * + *

* @param created Created timestamp */ public void setOrderCreated (final Calendar created); /** * Getter for customer instance - * + *

* @return Customer instance */ public Customer getCustomer (); /** * Setter for customer instance - * + *

* @param customer Customer instance */ public void setCustomer (final Customer customer); /** * Getter for order id - * + *

* @return Order id */ public Long getOrderId (); /** * Setter for order id - * + *

* @param id Order id */ public void setOrderId (final Long id); /** * Getter for list of ordered basket items - * + *

* @return List of items */ public List getOrderedItems (); /** * Setter for list of ordered basket items - * + *

* @param itemList List of items */ public void setOrderedItems (final List itemList); diff --git a/src/org/mxchange/jshopcore/model/order/ShopOrder.java b/src/org/mxchange/jshopcore/model/order/ShopOrder.java index 57f25ce..321f03e 100644 --- a/src/org/mxchange/jshopcore/model/order/ShopOrder.java +++ b/src/org/mxchange/jshopcore/model/order/ShopOrder.java @@ -36,7 +36,7 @@ import org.mxchange.jshopcore.model.customer.ShopCustomer; /** * An entity class for shop orders - * + *

* @author Roland Haeder */ @Entity (name = "orders") diff --git a/src/org/mxchange/jshopcore/model/order/items/OrderItem.java b/src/org/mxchange/jshopcore/model/order/items/OrderItem.java index 9cca118..c1783fb 100644 --- a/src/org/mxchange/jshopcore/model/order/items/OrderItem.java +++ b/src/org/mxchange/jshopcore/model/order/items/OrderItem.java @@ -32,7 +32,7 @@ import org.mxchange.jshopcore.model.product.Product; /** * A general basket item - * + *

* @author Roland Haeder */ @Entity (name = "ordered_item") diff --git a/src/org/mxchange/jshopcore/model/product/GenericProduct.java b/src/org/mxchange/jshopcore/model/product/GenericProduct.java index 570c627..a2daad1 100644 --- a/src/org/mxchange/jshopcore/model/product/GenericProduct.java +++ b/src/org/mxchange/jshopcore/model/product/GenericProduct.java @@ -31,7 +31,7 @@ import org.mxchange.jshopcore.model.category.ProductCategory; /** * Generic product class - * + *

* @author Roland Haeder * TODO: Find a better name */ @@ -53,8 +53,8 @@ public class GenericProduct implements Product, Comparable { /** * Product productCategory */ - @JoinColumn(name = "category_id", nullable = false, updatable = false) - @OneToOne(targetEntity = ProductCategory.class, optional = false) + @JoinColumn (name = "category_id", nullable = false, updatable = false) + @OneToOne (targetEntity = ProductCategory.class, optional = false) private Category productCategory; /** @@ -62,7 +62,7 @@ public class GenericProduct implements Product, Comparable { */ @Id @GeneratedValue (strategy = GenerationType.IDENTITY) - @Column(name = "product_id", length = 20, nullable = false, updatable = false) + @Column (name = "product_id", length = 20, nullable = false, updatable = false) private Long productId; /** @@ -87,7 +87,7 @@ public class GenericProduct implements Product, Comparable { /** * Constructor will all required data - * + *

* @param productId Id number of product * @param productTitle Name of product * @param productPrice Price diff --git a/src/org/mxchange/jshopcore/model/product/Product.java b/src/org/mxchange/jshopcore/model/product/Product.java index 140dd70..365e38c 100644 --- a/src/org/mxchange/jshopcore/model/product/Product.java +++ b/src/org/mxchange/jshopcore/model/product/Product.java @@ -21,84 +21,84 @@ import org.mxchange.jshopcore.model.category.Category; /** * An interface for in database storable products - * + *

* @author Roland Haeder */ public interface Product extends Serializable { /** * Copies all properties from source product to this. - * + *

* @param product Source product */ public void copyAll (final Product product); /** * Getter for product availability - * + *

* @return Product availability */ public Boolean getProductAvailability (); /** * Setter for product availability - * + *

* @param productAvailability Product availability */ public void setProductAvailability (final Boolean productAvailability); /** * Getter for product category id - * + *

* @return Product category id */ public Category getProductCategory (); /** * Setter for product category - * + *

* @param productCategory Product category */ public void setProductCategory (final Category productCategory); /** * Getter for id number, suitable for form fields. - * + *

* @return Id number of product */ public Long getProductId (); /** * Id number of product - * + *

* @param productId the id number to set */ public void setProductId (final Long productId); /** * Getter for raw price. - * + *

* @return Single price of product */ public Float getProductPrice (); /** * Price of product - * + *

* @param productPrice the price to set */ public void setProductPrice (final Float productPrice); /** * Getter for title. - * + *

* @return Title of product */ public String getProductTitle (); /** * Title of product - * + *

* @param productTitle the title to set */ public void setProductTitle (final String productTitle); diff --git a/src/org/mxchange/jshopcore/wrapper/CheckoutWrapper.java b/src/org/mxchange/jshopcore/wrapper/CheckoutWrapper.java index 6bfe3c5..3b1a9e2 100644 --- a/src/org/mxchange/jshopcore/wrapper/CheckoutWrapper.java +++ b/src/org/mxchange/jshopcore/wrapper/CheckoutWrapper.java @@ -22,7 +22,7 @@ import org.mxchange.jshopcore.model.customer.Customer; /** * A wrapper for checkouts (customer, ordered items) - * + *

* @author Roland Haeder */ public class CheckoutWrapper implements WrapableCheckout { diff --git a/src/org/mxchange/jshopcore/wrapper/WrapableCheckout.java b/src/org/mxchange/jshopcore/wrapper/WrapableCheckout.java index 1ad5a9f..a23f691 100644 --- a/src/org/mxchange/jshopcore/wrapper/WrapableCheckout.java +++ b/src/org/mxchange/jshopcore/wrapper/WrapableCheckout.java @@ -23,35 +23,35 @@ import org.mxchange.jshopcore.model.customer.Customer; /** * An interface for checkout wrapper - * + *

* @author Roland Haeder */ public interface WrapableCheckout extends Serializable { /** * Getter for customer instance - * + *

* @return Customer indstance */ public Customer getCustomer (); /** * Setter for customer instance - * + *

* @param customer Customer instance */ public void setCustomer (final Customer customer); /** * Getter for a List of AddableBasktem instances - * + *

* @return List with AddableBasketItem instances */ public List getList (); /** * Setter for a List of AddableBasktem instances - * + *

* @param list List with AddableBasketItem instances */ public void setList (final List list);