From ea1172472b6bd929318e20bddecf68771497439b Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 5 Sep 2015 15:05:50 +0200 Subject: [PATCH] =?utf8?q?Renaming=20season=20is=20not=20yet=20over=20...?= =?utf8?q?=20;-)=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore-ejb.jar | Bin 20505 -> 0 bytes lib/jcoreee.jar | Bin 0 -> 20440 bytes nbproject/build-impl.xml | 4 +- nbproject/project.properties | 6 +- nbproject/project.xml | 2 +- .../beans/controller/PizzaServiceWebBean.java | 50 +--- .../beans/controller/PizzaWebBean.java | 60 +---- .../beans/customer/CustomerWebBean.java | 226 +----------------- .../customer/PizzaServiceCustomerWebBean.java | 218 +---------------- .../beans/enums/DataWebBean.java | 2 +- .../beans/enums/PizzaServiceDataWebBean.java | 2 +- 11 files changed, 15 insertions(+), 555 deletions(-) delete mode 100644 lib/jcore-ejb.jar create mode 100644 lib/jcoreee.jar diff --git a/lib/jcore-ejb.jar b/lib/jcore-ejb.jar deleted file mode 100644 index 261eaa847bd061b91890fd98a540877af62f7eaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20505 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 literal 0 HcmV?d00001 diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 08650522..15f68d0d 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1023,7 +1023,7 @@ exists or setup the property manually. For example like this: - + @@ -1038,7 +1038,7 @@ exists or setup the property manually. For example like this: - + diff --git a/nbproject/project.properties b/nbproject/project.properties index 97210ba9..86ee86fb 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -33,7 +33,7 @@ file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar file.reference.commons-lang3-3.4.jar=lib/commons-lang3-3.4.jar file.reference.gf-client.jar=lib/gf-client.jar file.reference.jcore.jar=lib/jcore.jar -file.reference.jcore-ejb.jar=lib/jcore-ejb.jar +file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jshop-core.jar=lib/jshop-core.jar file.reference.jshop-ejb.jar=lib/jshop-ejb.jar file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar @@ -54,7 +54,7 @@ j2ee.server.type=gfv3ee6 jar.compress=false javac.classpath=\ ${file.reference.jcore.jar}:\ - ${file.reference.jcore-ejb.jar}:\ + ${file.reference.jcoreee.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ejb.jar}:\ ${reference.PizzaService-lib.jar}:\ @@ -104,7 +104,7 @@ run.test.classpath=\ runmain.jvmargs= source.encoding=UTF-8 source.reference.jcore.jar=../jcore/src/ -source.reference.jcore-ejb.jar=../jcore-ejb/src/ +source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jshop-core.jar=../jshop-core/src/ source.reference.jshop-ejb.jar=../jshop-ejb/src/ source.root=src diff --git a/nbproject/project.xml b/nbproject/project.xml index 7628060f..257793f7 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -11,7 +11,7 @@ WEB-INF/lib - ${file.reference.jcore-ejb.jar} + ${file.reference.jcoreee.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java index dd896a6c..e69bba25 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java @@ -20,18 +20,17 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.rmi.RemoteException; import java.sql.SQLException; -import java.text.MessageFormat; import java.util.Deque; import java.util.Iterator; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; import javax.faces.FacesException; import javax.inject.Named; +import org.mxchange.jcoreee.beans.BaseFrameworkBean; import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; import org.mxchange.jshopcore.model.category.Category; import org.mxchange.jshopcore.model.product.Product; -import org.mxchange.jshopejb.beans.BaseFrameworkBean; /** * Main application class @@ -65,13 +64,10 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe @PostConstruct public void init () throws FacesException { // Trace message - this.getLogger().trace(MessageFormat.format("application={0} - CALLED!", this.getApplication())); //NOI18N + this.getLogger().trace("CALLED!"); //NOI18N - // Must not be null - if (this.getApplication() == null) { - // Abort here - throw new NullPointerException("application is null"); //NOI18N - } + // Super call + super.init(); try { // Call init method @@ -82,12 +78,6 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe } } - @Override - @Deprecated - public String getPrintableProductAvailability (final Product product) { - return this.app.getPrintableProductAvailability(product); - } - @Override public Iterator getAvailableProductsIterator () throws RemoteException { try { @@ -167,36 +157,4 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe throw new RemoteException("doAdminAddProduct() failed.", ex); } } - - @Override - @Deprecated - public String getPrintableProduktCategory (final Product product) throws RemoteException { - try { - return this.app.getPrintableProductCategory(product); - } catch (final IOException | SQLException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { - // Continue to throw - throw new RemoteException("getPrintableProduktCategory() failed.", ex); - } - } - - @Override - @Deprecated - public void doAdminHandleProductForms () throws RemoteException { - // Deprecated method called - throw new UnsupportedOperationException("Deprecated method called"); - } - - @Override - @Deprecated - public void doAdminHandleCategoryForms () throws RemoteException { - // Deprecated method called - throw new UnsupportedOperationException("Deprecated method called"); - } - - @Override - @Deprecated - public String generateLinkForParent (final Category category) { - // Deligate to app - return this.app.generateLinkForParent(category); - } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java index f24dad1e..451f9f70 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java @@ -19,24 +19,17 @@ package org.mxchange.pizzaapplication.beans.controller; import java.rmi.RemoteException; import java.util.Deque; import java.util.Iterator; -import javax.faces.FacesException; +import org.mxchange.jcoreee.beans.FrameworkBean; import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; import org.mxchange.jshopcore.model.category.Category; import org.mxchange.jshopcore.model.product.Product; -import org.mxchange.jshopejb.beans.FrameworkBean; /** * * @author Roland Haeder */ public interface PizzaWebBean extends FrameworkBean { - /** - * Initializes this instance - * - * @throws FacesException If something was wrong - */ - public void init () throws FacesException; /** * Some "getter" for an iterator of only available products @@ -86,39 +79,6 @@ public interface PizzaWebBean extends FrameworkBean { */ public Deque getAllCategories () throws RemoteException; - /** - * Generates a link for category's parent category. If none is given, the method will return only a small - * note. - * - * @param category Category instance - * @return HTML link for category's parent category - * @deprecated Old lost code - */ - @Deprecated - public String generateLinkForParent (final Category category); - - /** - * Checks if given Product instance is available and returns a printable - * (human-readable) string. - * - * @param product Product instance to check - * @return Human-readable version of product availability - * @deprecated Old lost code - */ - @Deprecated - public String getPrintableProductAvailability (final Product product); - - /** - * Returns a printable (human-readable) string of product's category - * - * @param product Product instance to check - * @return Human-readable version of product availability - * @throws java.rmi.RemoteException If something unexpected happened - * @deprecated Old lost code - */ - @Deprecated - public String getPrintableProduktCategory (final Product product) throws RemoteException; - /** * Adds given category data from request to database * @@ -136,22 +96,4 @@ public interface PizzaWebBean extends FrameworkBean { * @throws org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the given product title is already used */ public void doAdminAddProduct (final Product product) throws RemoteException, ProductTitleAlreadyUsedException; - - /** - * Handles admin product form requests - * - * @throws RemoteException If something unexpected happened - * @deprecated Old lost code - */ - @Deprecated - public void doAdminHandleProductForms () throws RemoteException; - - /** - * Handles admin category form requests - * - * @throws RemoteException If something unexpected happened - * @deprecated Old lost code - */ - @Deprecated - public void doAdminHandleCategoryForms () throws RemoteException; } diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java index 7abb046c..fe9dec1b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java @@ -16,8 +16,7 @@ */ package org.mxchange.pizzaapplication.beans.customer; -import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jshopejb.beans.FrameworkBean; +import org.mxchange.jcoreee.beans.FrameworkBean; /** * An interface for customer beans @@ -25,227 +24,4 @@ import org.mxchange.jshopejb.beans.FrameworkBean; * @author Roland Haeder */ public interface CustomerWebBean extends FrameworkBean { - /** - * Some "getter" for translated gender of the contact - * - * @return Translated / human-readable gender - */ - public String getTranslatedGender (); - - /** - * Gender of the contact - * - * @return the gender - */ - public Gender getGender (); - - /** - * Gender of the contact - * - * @param gender the gender to set - */ - public void setGender (final Gender gender); - - /** - * First name - * - * @return the first name - */ - public String getFirstName (); - - /** - * First name - * - * @param firstName the first name to set - */ - public void setFirstName (final String firstName); - - /** - * Family name - * - * @return the familyName - */ - public String getFamilyName (); - - /** - * Family name - * - * @param familyName the familyName to set - */ - public void setFamilyName (final String familyName); - - /** - * Companyname - * - * @return the companyName - */ - public String getCompanyName (); - - /** - * Companyname - * - * @param companyName the companyName to set - */ - public void setCompanyName (final String companyName); - - /** - * Street - * - * @return the street - */ - public String getStreet (); - - /** - * Street - * - * @param street the street to set - */ - public void setStreet (final String street); - - /** - * House number - * - * @return the houseNumber - */ - public Long getHouseNumber (); - - /** - * House number - * - * @param houseNumber the houseNumber to set - */ - public void setHouseNumber (final Long houseNumber); - - /** - * ZIP code - * - * @return the zipCode - */ - public Long getZipCode (); - - /** - * ZIP code - * - * @param zipCode the zipCode to set - */ - public void setZipCode (final Long zipCode); - - /** - * City - * - * @return the city - */ - public String getCity (); - - /** - * City - * - * @param city the city to set - */ - public void setCity (final String city); - - /** - * Country code - * - * @return the countryCode - */ - public String getCountryCode (); - - /** - * Country code - * - * @param countryCode the countryCode to set - */ - public void setCountryCode (final String countryCode); - - /** - * Email address - * - * @return the emailAddress - */ - public String getEmailAddress (); - - /** - * Email address - * - * @param emailAddress the emailAddress to set - */ - public void setEmailAddress (final String emailAddress); - - /** - * Phone number - * - * @return the phoneNumber - */ - public String getPhoneNumber (); - - /** - * Phone number - * - * @param phoneNumber the phoneNumber to set - */ - public void setPhoneNumber (final String phoneNumber); - - /** - * Fax number - * - * @return the faxNumber - */ - public String getFaxNumber (); - - /** - * Fax number - * - * @param faxNumber the faxNumber to set - */ - public void setFaxNumber (final String faxNumber); - - /** - * Cellphone number - * - * @return the cellphoneNumber - */ - public String getCellphoneNumber (); - - /** - * Cellphone number - * - * @param cellphoneNumber the cellphoneNumber to set - */ - public void setCellphoneNumber (final String cellphoneNumber); - - /** - * Birth day - * - * @return the birthday - */ - public String getBirthday (); - - /** - * Birth day - * - * @param birthday the birthday to set - */ - public void setBirthday (final String birthday); - - /** - * Comments - * - * @return the comment - */ - public String getComment (); - - /** - * Comments - * - * @param comment the comment to set - */ - public void setComment (final String comment); - - /** - * Checks whether the contact is user's own data - * - * @return Own data? - */ - public boolean isOwnContact (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java index 0c5806ad..159413a2 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java @@ -18,10 +18,7 @@ package org.mxchange.pizzaapplication.beans.customer; import javax.enterprise.context.SessionScoped; import javax.inject.Named; -import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jshopcore.model.customer.Customer; -import org.mxchange.jshopcore.model.customer.ShopCustomer; -import org.mxchange.jshopejb.beans.BaseFrameworkBean; +import org.mxchange.jcoreee.beans.BaseFrameworkBean; /** * A customer bean which hides the customer instance @@ -36,222 +33,9 @@ public class PizzaServiceCustomerWebBean extends BaseFrameworkBean implements Cu */ private static final long serialVersionUID = 542145347916L; - /** - * Customer instance - */ - private final Customer customer; - /** * Default constructor */ public PizzaServiceCustomerWebBean () { - // Instance customer - this.customer = new ShopCustomer(); - } - - @Override - public String getBirthday () { - // Deligate to "hidden" object - return this.getCustomer().getBirthday(); - } - - @Override - public void setBirthday (final String birthday) { - // Deligate to "hidden" object - this.getCustomer().setBirthday(birthday); - } - - @Override - public String getCellphoneNumber () { - // Deligate to "hidden" object - return this.getCustomer().getCellphoneNumber(); - } - - @Override - public void setCellphoneNumber (final String cellphoneNumber) { - // Deligate to "hidden" object - this.getCustomer().setCellphoneNumber(cellphoneNumber); - } - - @Override - public String getCity () { - // Deligate to "hidden" object - return this.getCustomer().getCity(); - } - - @Override - public void setCity (final String city) { - // Deligate to "hidden" object - this.getCustomer().setCity(city); - } - - @Override - public String getComment () { - // Deligate to "hidden" object - return this.getCustomer().getComment(); - } - - @Override - public void setComment (final String comment) { - // Deligate to "hidden" object - this.getCustomer().setComment(comment); - } - - @Override - public String getCompanyName () { - // Deligate to "hidden" object - return this.getCustomer().getCompanyName(); - } - - @Override - public void setCompanyName (final String companyName) { - // Deligate to "hidden" object - this.getCustomer().setCompanyName(companyName); - } - - @Override - public String getCountryCode () { - // Deligate to "hidden" object - return this.getCustomer().getCountryCode(); - } - - @Override - public void setCountryCode (final String countryCode) { - // Deligate to "hidden" object - this.getCustomer().setCountryCode(countryCode); - } - - @Override - public String getEmailAddress () { - // Deligate to "hidden" object - return this.getCustomer().getEmailAddress(); - } - - @Override - public void setEmailAddress (final String emailAddress) { - // Deligate to "hidden" object - this.getCustomer().setEmailAddress(emailAddress); - } - - @Override - public String getFamilyName () { - // Trace call - //* NOISY-DEBUG: */ this.getLogger().trace("CALLED!"); - - // Deligate to "hidden" object - return this.getCustomer().getFamilyName(); - } - - @Override - public void setFamilyName (final String familyName) { - // Trace call - //* NOISY-DEBUG: */ this.getLogger().trace(MessageFormat.format("familyName={0} - CALLED!", familyName)); - - // Deligate to "hidden" object - this.getCustomer().setFamilyName(familyName); - } - - @Override - public String getFaxNumber () { - // Deligate to "hidden" object - return this.getCustomer().getFaxNumber(); - } - - @Override - public void setFaxNumber (final String faxNumber) { - // Deligate to "hidden" object - this.getCustomer().setFaxNumber(faxNumber); - } - - @Override - public Gender getGender () { - // Deligate to "hidden" object - return this.getCustomer().getGender(); - } - - @Override - public void setGender (final Gender gender) { - // Deligate to "hidden" object - this.getCustomer().setGender(gender); - } - - @Override - public Long getHouseNumber () { - // Deligate to "hidden" object - return this.getCustomer().getHouseNumber(); - } - - @Override - public void setHouseNumber (final Long houseNumber) { - // Deligate to "hidden" object - this.getCustomer().setHouseNumber(houseNumber); - } - - @Override - public String getPhoneNumber () { - // Deligate to "hidden" object - return this.getCustomer().getPhoneNumber(); - } - - @Override - public void setPhoneNumber (final String phoneNumber) { - // Deligate to "hidden" object - this.getCustomer().setPhoneNumber(phoneNumber); - } - - @Override - public String getStreet () { - // Deligate to "hidden" object - return this.getCustomer().getStreet(); - } - - @Override - public void setStreet (final String street) { - // Deligate to "hidden" object - this.getCustomer().setStreet(street); - } - - @Override - public String getFirstName () { - // Deligate to "hidden" object - return this.getCustomer().getFirstName(); - } - - @Override - public void setFirstName (final String firstName) { - // Deligate to "hidden" object - this.getCustomer().setFirstName(firstName); - } - - @Override - public String getTranslatedGender () { - // Deligate to "hidden" object - return this.getCustomer().getTranslatedGender(); - } - - @Override - public Long getZipCode () { - // Deligate to "hidden" object - return this.getCustomer().getZipCode(); - } - - @Override - public void setZipCode (final Long zipCode) { - // Deligate to "hidden" object - this.getCustomer().setZipCode(zipCode); - } - - @Override - public boolean isOwnContact () { - throw new UnsupportedOperationException("Not supported yet."); //NOI18N - } - - /** - * Getter for Customer instance - * - * @return Contact instance - */ - private Customer getCustomer () { - return this.customer; } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java index 327ac2b3..5fe8435d 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java @@ -18,7 +18,7 @@ package org.mxchange.pizzaapplication.beans.enums; import java.util.List; import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jshopejb.beans.FrameworkBean; +import org.mxchange.jcoreee.beans.FrameworkBean; /** * An interface for data beans diff --git a/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java index e9655c12..87ed577b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java @@ -22,7 +22,7 @@ import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jshopejb.beans.BaseFrameworkBean; +import org.mxchange.jcoreee.beans.BaseFrameworkBean; /** * A customer bean which hides the customer instance -- 2.39.5