From 45eb4d8fc87c2e1e2d907c41189b2705d0b977b5 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 27 Apr 2016 21:43:38 +0200 Subject: [PATCH] fixed project dependencies (you may not want to cherry-pick this, instead you should fix it on your own) --- nbproject/build-impl.xml | 20 +++++++++++-------- nbproject/genfiles.properties | 4 ++-- nbproject/project.properties | 3 +++ nbproject/project.xml | 1 + .../PizzaAdminCustomerSessionBean.java | 8 ++++---- .../customer/PizzaCustomerSessionBean.java | 4 ++-- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 32f3dbc..514a021 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -836,6 +836,7 @@ exists or setup the property manually. For example like this: + @@ -855,6 +856,7 @@ exists or setup the property manually. For example like this: + @@ -863,7 +865,7 @@ exists or setup the property manually. For example like this: - + @@ -874,13 +876,14 @@ exists or setup the property manually. For example like this: - - - - - - - + + + + + + + + @@ -894,6 +897,7 @@ exists or setup the property manually. For example like this: + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 8120b8f..f77344d 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=9c0f08a9 build.xml.stylesheet.CRC32=5910fda3@1.55.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=9e5ca144 -nbproject/build-impl.xml.script.CRC32=c2a539b2 +nbproject/build-impl.xml.data.CRC32=ab70c767 +nbproject/build-impl.xml.script.CRC32=2dec32dc nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index d110bbe..924261c 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -30,6 +30,7 @@ file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcountry-core.jar=lib/jcountry-core.jar file.reference.jcountry-lib.jar=lib/jcountry-lib.jar file.reference.jcustomer-core.jar=lib/jcustomer-core.jar +file.reference.jcustomer-lib.jar=lib/jcustomer-lib.jar file.reference.jmailer-ee.jar=lib/jmailer-ee.jar file.reference.jphone-core.jar=lib/jphone-core.jar file.reference.jphone-lib.jar=lib/jphone-lib.jar @@ -64,6 +65,7 @@ javac.classpath=\ ${file.reference.juser-core.jar}:\ ${file.reference.juser-lib.jar}:\ ${file.reference.jcustomer-core.jar}:\ + ${file.reference.jcustomer-lib.jar}:\ ${file.reference.jphone-core.jar}:\ ${file.reference.jphone-lib.jar}:\ ${file.reference.jshop-core.jar}:\ @@ -116,6 +118,7 @@ source.reference.jcoreee.jar=../../jcoreee/src/ source.reference.jcountry-core.jar=../jcountry-core/src/ source.reference.jcountry-lib.jar=../jcountry-lib/src/ source.reference.jcustomer-core.jar=../jcustomer-core/src/ +source.reference.jcustomer-lib.jar=../jcustomer-lib/src/ source.reference.jmailer-ee.jar=../jmailer-ee/src/ source.reference.jphone-core.jar=../jphone-core/src/ source.reference.jphone-lib.jar=../jphone-lib/src/ diff --git a/nbproject/project.xml b/nbproject/project.xml index 855481f..ee93a6a 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -15,6 +15,7 @@ file.reference.juser-core.jar file.reference.juser-lib.jar file.reference.jcustomer-core.jar + file.reference.jcustomer-lib.jar file.reference.jphone-core.jar file.reference.jphone-lib.jar file.reference.jshop-core.jar diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java index 109fbfd..ddba1e8 100644 --- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java @@ -74,9 +74,9 @@ public class PizzaAdminCustomerSessionBean extends BasePizzaDatabaseBean impleme } else if (customer.getCustomerNumber() == null) { // Customer numbers should be set, at least generate one with CustomerUtils throw new NullPointerException("customer.customerNumber is null"); //NOI18N - } else if (customer.getCustomerNumber().length() < RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) { + } else if (customer.getCustomerNumber().length() < PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) { // To short number - throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N } else if (this.customerBean.isReqistered(customer)) { // Throw exception throw new CustomerAlreadyRegisteredException(customer); @@ -196,9 +196,9 @@ public class PizzaAdminCustomerSessionBean extends BasePizzaDatabaseBean impleme } else if (customer.getCustomerNumber() == null) { // Customer numbers should be set, at least generate one with CustomerUtils throw new NullPointerException("customer.customerNumber is null"); //NOI18N - } else if (customer.getCustomerNumber().length() < RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) { + } else if (customer.getCustomerNumber().length() < PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) { // To short number - throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N } else if (this.customerBean.isReqistered(customer)) { // Throw exception throw new CustomerAlreadyRegisteredException(customer); diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java index 82f836b..0229a31 100644 --- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java @@ -60,9 +60,9 @@ public class PizzaCustomerSessionBean extends BasePizzaDatabaseBean implements P } else if (customer.getCustomerNumber() == null) { // Customer numbers should be set, at least generate one with CustomerUtils throw new NullPointerException("customer.customerNumber is null"); //NOI18N - } else if (customer.getCustomerNumber().length() < RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) { + } else if (customer.getCustomerNumber().length() < PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) { // To short number - throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N } // Init query instance -- 2.39.5