From 2b2b237022f09686bd6413a140b77e33cb569da8 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 4 Sep 2015 23:41:55 +0200 Subject: [PATCH] =?utf8?q?Binded=20to=20jshop-core=20+=20added=20it=20Sign?= =?utf8?q?ed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jshop-core.jar | Bin 0 -> 28048 bytes nbproject/project.properties | 5 ++++- .../application/PizzaApplication.java | 16 ++++++++-------- .../application/PizzaServiceApplication.java | 8 ++++---- 4 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 lib/jshop-core.jar diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..feda701b1145bb8e0f90a0dd25b725b116c38425 GIT binary patch literal 28048 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 literal 0 HcmV?d00001 diff --git a/nbproject/project.properties b/nbproject/project.properties index 6a34e7b..3a457c9 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -28,6 +28,7 @@ dist.jar=${dist.dir}/PizzaService-swing.jar dist.javadoc.dir=${dist.dir}/javadoc excludes= file.reference.jcore.jar=lib/jcore.jar +file.reference.jshop-core.jar=lib/jshop-core.jar file.reference.jswingcore.jar=lib/jswingcore.jar file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar file.reference.log4j-core-2.3.jar=lib/log4j-core-2.3.jar @@ -37,7 +38,8 @@ javac.classpath=\ ${file.reference.jcore.jar}:\ ${file.reference.log4j-api-2.3.jar}:\ ${file.reference.log4j-core-2.3.jar}:\ - ${file.reference.jswingcore.jar} + ${file.reference.jswingcore.jar}:\ + ${file.reference.jshop-core.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -78,6 +80,7 @@ run.test.classpath=\ ${build.test.classes.dir} source.encoding=UTF-8 source.reference.jcore.jar=../jcore/src/ +source.reference.jshop-core.jar=../jshop-core/src/ source.reference.jswingcore.jar=../jswingcore/src/ src.dir=src test.src.dir=test diff --git a/src/org/mxchange/pizzaapplication/application/PizzaApplication.java b/src/org/mxchange/pizzaapplication/application/PizzaApplication.java index df96805..1a6f286 100644 --- a/src/org/mxchange/pizzaapplication/application/PizzaApplication.java +++ b/src/org/mxchange/pizzaapplication/application/PizzaApplication.java @@ -22,10 +22,10 @@ import java.sql.SQLException; import java.util.Deque; import java.util.Iterator; import org.mxchange.jcore.application.Application; -import org.mxchange.jshop.category.Category; -import org.mxchange.jshop.exceptions.CategoryTitleAlreadyUsedException; -import org.mxchange.jshop.exceptions.ProductTitleAlreadyUsedException; -import org.mxchange.jshop.product.Product; +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; /** * @@ -153,7 +153,7 @@ public interface PizzaApplication extends Application { * Adds given category data from request to database * * @param category Category instance - * @throws org.mxchange.jshop.exceptions.CategoryTitleAlreadyUsedException The category's title is already used + * @throws org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException The category's title is already used * @throws java.io.IOException If an IO error occurs * @throws java.sql.SQLException If an SQL error occurs * @throws java.lang.NoSuchMethodException If a method was not found @@ -171,7 +171,7 @@ public interface PizzaApplication extends Application { * @throws java.lang.NoSuchMethodException If a method was not found * @throws java.lang.IllegalAccessException If the method cannot be accessed publicly * @throws java.lang.reflect.InvocationTargetException If something else happens? - * @throws org.mxchange.jshop.exceptions.ProductTitleAlreadyUsedException If the product's title is already used + * @throws org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the product's title is already used */ public void doAdminAddProduct (final Product product) throws IOException, SQLException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, ProductTitleAlreadyUsedException; @@ -183,7 +183,7 @@ public interface PizzaApplication extends Application { * @throws java.lang.NoSuchMethodException If a method was not found * @throws java.lang.IllegalAccessException If the method cannot be accessed publicly * @throws java.lang.reflect.InvocationTargetException If something else happens? - * @throws org.mxchange.jshop.exceptions.ProductTitleAlreadyUsedException If the product's title is already used + * @throws org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the product's title is already used * @deprecated Old lost code */ @Deprecated @@ -197,7 +197,7 @@ public interface PizzaApplication extends Application { * @throws java.lang.NoSuchMethodException If a method was not found * @throws java.lang.IllegalAccessException If the method cannot be accessed publicly * @throws java.lang.reflect.InvocationTargetException If something else happens? - * @throws org.mxchange.jshop.exceptions.CategoryTitleAlreadyUsedException The category's title is already used + * @throws org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException The category's title is already used * @deprecated */ @Deprecated diff --git a/src/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java index c3e7748..62790de 100644 --- a/src/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java +++ b/src/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java @@ -23,10 +23,10 @@ import java.text.MessageFormat; import java.util.Deque; import java.util.Iterator; import org.mxchange.jcore.BaseFrameworkSystem; -import org.mxchange.jshop.category.Category; -import org.mxchange.jshop.exceptions.CategoryTitleAlreadyUsedException; -import org.mxchange.jshop.exceptions.ProductTitleAlreadyUsedException; -import org.mxchange.jshop.product.Product; +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; /** * Main application class -- 2.39.5