From 6b9f17d0a9ac8377e24651fb9f48e2d3ce7de94e Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 7 Sep 2015 20:47:39 +0200
Subject: [PATCH] =?utf8?q?Continued:=20-=20updated=20jcore.jar=20-=20got?=
 =?utf8?q?=20rid=20of=20some=20things=20that=20don't=20work=20in=20EJB=20c?=
 =?utf8?q?ontainer=20...=20:-(=20Signed-off-by:Roland=20H=C3=A4der=20<rola?=
 =?utf8?q?nd@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/jcore.jar                                 | Bin 29138 -> 29128 bytes
 src/org/mxchange/jshopcore/BaseShopCore.java  |  48 ------------------
 src/org/mxchange/jshopcore/ShopInterface.java |  37 --------------
 .../CategoryTitleAlreadyUsedException.java    |   2 +-
 .../ProductTitleAlreadyUsedException.java     |   2 +-
 .../jshopcore/model/basket/BaseBasket.java    |   8 +--
 .../jshopcore/model/basket/Basket.java        |   4 +-
 .../model/basket/item/ItemBasket.java         |   2 +-
 .../model/category/BaseCategory.java          |  24 ++++-----
 .../jshopcore/model/category/Category.java    |   4 +-
 .../model/item/AddableBasketItem.java         |  15 +++++-
 .../jshopcore/model/item/BaseItem.java        |  42 +++++++++++----
 .../jshopcore/model/product/BaseProduct.java  |  24 ++++-----
 .../jshopcore/model/product/Product.java      |   4 +-
 .../model/product/generic/GenericProduct.java |   1 +
 15 files changed, 83 insertions(+), 134 deletions(-)
 delete mode 100644 src/org/mxchange/jshopcore/BaseShopCore.java
 delete mode 100644 src/org/mxchange/jshopcore/ShopInterface.java

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 636db5cb817c5a8422435600d1eaa83f399dcde9..1e4a78b02a1d9abd48a4b7cb5e7a53a763af1d77 100644
GIT binary patch
delta 4654
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

delta 4581
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
aXLWg^36o7-KJ8pnG}hadVfVCfxBmh3<Kip;

diff --git a/src/org/mxchange/jshopcore/BaseShopCore.java b/src/org/mxchange/jshopcore/BaseShopCore.java
deleted file mode 100644
index fe407a6..0000000
--- a/src/org/mxchange/jshopcore/BaseShopCore.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2015 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jshopcore;
-
-import org.mxchange.jcore.BaseFrameworkSystem;
-import org.mxchange.jshopcore.model.product.Product;
-
-/**
- * A general shop class
- *
- * @author Roland Haeder
- */
-public class BaseShopCore extends BaseFrameworkSystem implements ShopInterface {
-	/**
-	 * Item instance
-	 */
-	private Product product;
-
-	/**
-	 * @return the product
-	 */
-	@Override
-	public Product getProduct () {
-		return this.product;
-	}
-
-	/**
-	 * @param product the product to set
-	 */
-	@Override
-	public void setProduct (final Product product) {
-		this.product = product;
-	}
-}
diff --git a/src/org/mxchange/jshopcore/ShopInterface.java b/src/org/mxchange/jshopcore/ShopInterface.java
deleted file mode 100644
index d2813e5..0000000
--- a/src/org/mxchange/jshopcore/ShopInterface.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2015 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jshopcore;
-
-import org.mxchange.jcore.FrameworkInterface;
-import org.mxchange.jshopcore.model.product.Product;
-
-/**
- * A general shop interface
- *
- * @author Roland Haeder
- */
-public interface ShopInterface extends FrameworkInterface {
-	/**
-	 * @return the product
-	 */
-	public Product getProduct ();
-
-	/**
-	 * @param product the product to set
-	 */
-	public void setProduct (final Product product);
-}
diff --git a/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java b/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java
index ae81b3c..4936d65 100644
--- a/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java
+++ b/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java
@@ -28,7 +28,7 @@ public class CategoryTitleAlreadyUsedException extends Exception {
 	/**
 	 * Serial number
 	 */
-	private static final long serialVersionUID = 53751434673262L;
+	private static final long serialVersionUID = 53_751_434_673_262L;
 
 	/**
 	 * Constructor with HttpServletRequest instance
diff --git a/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java b/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java
index 1206661..3191646 100644
--- a/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java
+++ b/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java
@@ -28,7 +28,7 @@ public class ProductTitleAlreadyUsedException extends Exception {
 	/**
 	 * Serial number
 	 */
-	private static final long serialVersionUID = 4252734834174L;
+	private static final long serialVersionUID = 4_252_734_834_174L;
 
 	/**
 	 * Constructor with HttpServletRequest instance
diff --git a/src/org/mxchange/jshopcore/model/basket/BaseBasket.java b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java
index 9c2b1ae..b019f83 100644
--- a/src/org/mxchange/jshopcore/model/basket/BaseBasket.java
+++ b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java
@@ -22,7 +22,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.sql.SQLException;
 import java.text.MessageFormat;
 import java.util.Map;
-import org.mxchange.jshopcore.BaseShopCore;
+import org.mxchange.jcore.BaseFrameworkSystem;
 import org.mxchange.jshopcore.model.item.AddableBasketItem;
 
 /**
@@ -31,11 +31,11 @@ import org.mxchange.jshopcore.model.item.AddableBasketItem;
  * @author Roland Haeder
  * @param <T> Any instance that implements AddableBasketItem
  */
-public class BaseBasket<T extends AddableBasketItem> extends BaseShopCore implements Basket<T>, Serializable {
+public abstract class BaseBasket<T extends AddableBasketItem> extends BaseFrameworkSystem implements Basket<T>, Serializable {
 	/**
 	 * Serial number
 	 */
-	private static final long serialVersionUID = 784396762230845717L;
+	private static final long serialVersionUID = 784_396_762_230_845_717L;
 
 	/**
 	 * Protected constructor with session instance
@@ -53,7 +53,7 @@ public class BaseBasket<T extends AddableBasketItem> extends BaseShopCore implem
 		this.getLogger().trace("CALLED!"); //NOI18N
 
 		// Is the bundle initialized?
-		if (!BaseShopCore.isBundledInitialized()) {
+		if (!BaseFrameworkSystem.isBundledInitialized()) {
 			// Temporary initialize default bundle
 			// TODO The enum Gender uses this
 			this.initBundle();
diff --git a/src/org/mxchange/jshopcore/model/basket/Basket.java b/src/org/mxchange/jshopcore/model/basket/Basket.java
index 97423d7..46af288 100644
--- a/src/org/mxchange/jshopcore/model/basket/Basket.java
+++ b/src/org/mxchange/jshopcore/model/basket/Basket.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.SQLException;
 import java.util.Map;
-import org.mxchange.jshopcore.ShopInterface;
+import org.mxchange.jcore.FrameworkInterface;
 import org.mxchange.jshopcore.model.item.AddableBasketItem;
 
 /**
@@ -30,7 +30,7 @@ import org.mxchange.jshopcore.model.item.AddableBasketItem;
  * @author Roland Haeder
  * @param <T> Any addable basket items
  */
-public interface Basket<T extends AddableBasketItem> extends Serializable, ShopInterface {
+public interface Basket<T extends AddableBasketItem> extends FrameworkInterface, Serializable {
 
 	/**
 	 * Adds given item instance to this basket
diff --git a/src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java b/src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java
index b7dda1f..9cd3c53 100644
--- a/src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java
+++ b/src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java
@@ -30,7 +30,7 @@ public class ItemBasket extends BaseBasket<AddableBasketItem> implements Basket<
 	/**
 	 * Serial number
 	 */
-	private static final long serialVersionUID = 4384123923163957L;
+	private static final long serialVersionUID = 4_384_123_923_163_957L;
 
 	/**
 	 * Default constructor to be able to throw exceptions from super constructor
diff --git a/src/org/mxchange/jshopcore/model/category/BaseCategory.java b/src/org/mxchange/jshopcore/model/category/BaseCategory.java
index 493da9b..5588dbe 100644
--- a/src/org/mxchange/jshopcore/model/category/BaseCategory.java
+++ b/src/org/mxchange/jshopcore/model/category/BaseCategory.java
@@ -19,14 +19,14 @@ package org.mxchange.jshopcore.model.category;
 import java.io.UnsupportedEncodingException;
 import java.text.MessageFormat;
 import java.util.Objects;
-import org.mxchange.jshopcore.BaseShopCore;
+import org.mxchange.jcore.BaseFrameworkSystem;
 
 /**
  * A general product category class
  *
  * @author Roland Haeder
  */
-public class BaseCategory extends BaseShopCore implements Category {
+public abstract class BaseCategory extends BaseFrameworkSystem implements Category {
 
 	/**
 	 * Id number of category
@@ -52,9 +52,9 @@ public class BaseCategory extends BaseShopCore implements Category {
 	 */
 	protected BaseCategory (final Long categoryId, final String title, final Long parentId) {
 		// Set all here
-		this.setCategoryId(categoryId);
-		this.setTitle(title);
-		this.setParentId(parentId);
+		this.categoryId = categoryId;
+		this.title = title;
+		this.parentId = parentId;
 	}
 
 	/**
@@ -101,7 +101,7 @@ public class BaseCategory extends BaseShopCore implements Category {
 	 * @return Decoded title
 	 */
 	@Override
-	public final String getDecodedTitle () throws UnsupportedEncodingException {
+	public String getDecodedTitle () throws UnsupportedEncodingException {
 		// Get title
 		byte[] t = this.getTitle().getBytes();
 
@@ -115,7 +115,7 @@ public class BaseCategory extends BaseShopCore implements Category {
 	 * @return the categoryId
 	 */
 	@Override
-	public final Long getCategoryId () {
+	public Long getCategoryId () {
 		return this.categoryId;
 	}
 
@@ -125,7 +125,7 @@ public class BaseCategory extends BaseShopCore implements Category {
 	 * @param categoryId the categoryId to set
 	 */
 	@Override
-	public final void setCategoryId (final Long categoryId) {
+	public void setCategoryId (final Long categoryId) {
 		this.categoryId = categoryId;
 	}
 
@@ -135,7 +135,7 @@ public class BaseCategory extends BaseShopCore implements Category {
 	 * @return the parentId
 	 */
 	@Override
-	public final Long getParentId () {
+	public Long getParentId () {
 		return this.parentId;
 	}
 
@@ -145,7 +145,7 @@ public class BaseCategory extends BaseShopCore implements Category {
 	 * @param parentId the parentId to set
 	 */
 	@Override
-	public final void setParentId (final Long parentId) {
+	public void setParentId (final Long parentId) {
 		this.parentId = parentId;
 	}
 
@@ -155,7 +155,7 @@ public class BaseCategory extends BaseShopCore implements Category {
 	 * @return the title
 	 */
 	@Override
-	public final String getTitle () {
+	public String getTitle () {
 		return this.title;
 	}
 
@@ -165,7 +165,7 @@ public class BaseCategory extends BaseShopCore implements Category {
 	 * @param title the title to set
 	 */
 	@Override
-	public final void setTitle (final String title) {
+	public void setTitle (final String title) {
 		this.title = title;
 	}
 }
diff --git a/src/org/mxchange/jshopcore/model/category/Category.java b/src/org/mxchange/jshopcore/model/category/Category.java
index a32f8bd..4edbdee 100644
--- a/src/org/mxchange/jshopcore/model/category/Category.java
+++ b/src/org/mxchange/jshopcore/model/category/Category.java
@@ -17,14 +17,14 @@
 package org.mxchange.jshopcore.model.category;
 
 import java.io.UnsupportedEncodingException;
-import org.mxchange.jshopcore.ShopInterface;
+import org.mxchange.jcore.FrameworkInterface;
 
 /**
  * An interface for categories
  *
  * @author Roland Haeder
  */
-public interface Category extends ShopInterface, Comparable<Category> {
+public interface Category extends FrameworkInterface, Comparable<Category> {
 
 	/**
 	 * Id number of category
diff --git a/src/org/mxchange/jshopcore/model/item/AddableBasketItem.java b/src/org/mxchange/jshopcore/model/item/AddableBasketItem.java
index 8ca2c40..fd75a98 100644
--- a/src/org/mxchange/jshopcore/model/item/AddableBasketItem.java
+++ b/src/org/mxchange/jshopcore/model/item/AddableBasketItem.java
@@ -16,14 +16,15 @@
  */
 package org.mxchange.jshopcore.model.item;
 
-import org.mxchange.jshopcore.ShopInterface;
+import org.mxchange.jcore.FrameworkInterface;
+import org.mxchange.jshopcore.model.product.Product;
 
 /**
  * An interface for addable basket items
  *
  * @author Roland Haeder
  */
-public interface AddableBasketItem extends ShopInterface, Comparable<AddableBasketItem> {
+public interface AddableBasketItem extends FrameworkInterface, Comparable<AddableBasketItem> {
 
 	/**
 	 * Item amount
@@ -76,6 +77,16 @@ public interface AddableBasketItem extends ShopInterface, Comparable<AddableBask
 	 */
 	public Float calculateTotalPrice ();
 
+	/**
+	 * @return the product
+	 */
+	public Product getProduct ();
+
+	/**
+	 * @param product the product to set
+	 */
+	public void setProduct (final Product product);
+
 	/**
 	 * Compare method
 	 * @param item Item to compare to
diff --git a/src/org/mxchange/jshopcore/model/item/BaseItem.java b/src/org/mxchange/jshopcore/model/item/BaseItem.java
index 25c758d..213ac7f 100644
--- a/src/org/mxchange/jshopcore/model/item/BaseItem.java
+++ b/src/org/mxchange/jshopcore/model/item/BaseItem.java
@@ -18,7 +18,8 @@ package org.mxchange.jshopcore.model.item;
 
 import java.text.MessageFormat;
 import java.util.Objects;
-import org.mxchange.jshopcore.BaseShopCore;
+import org.mxchange.jcore.BaseFrameworkSystem;
+import org.mxchange.jshopcore.model.product.Product;
 
 /**
  * An item (addedable to a basket) could respresent a product or a discount
@@ -26,7 +27,7 @@ import org.mxchange.jshopcore.BaseShopCore;
  *
  * @author Roland Haeder
  */
-public class BaseItem extends BaseShopCore implements AddableBasketItem {
+public abstract class BaseItem extends BaseFrameworkSystem implements AddableBasketItem {
 	/**
 	 * Entry id (from database backend)
 	 */
@@ -47,6 +48,11 @@ public class BaseItem extends BaseShopCore implements AddableBasketItem {
 	 */
 	private String itemType;
 
+	/**
+	 * Item instance
+	 */
+	private Product product;
+
 	@Override
 	public Float calculateTotalPrice () {
 		// product should be set
@@ -87,42 +93,58 @@ public class BaseItem extends BaseShopCore implements AddableBasketItem {
 	}
 
 	@Override
-	public final Long getAmount () {
+	public Long getAmount () {
 		return this.amount;
 	}
 
 	@Override
-	public final void setAmount (final Long amount) {
+	public void setAmount (final Long amount) {
 		this.amount = amount;
 	}
 
 	@Override
-	public final Long getId () {
+	public Long getId () {
 		return this.id;
 	}
 
 	@Override
-	public final void setId (final Long id) {
+	public void setId (final Long id) {
 		this.id = id;
 	}
 
 	@Override
-	public final Long getItemId () {
+	public Long getItemId () {
 		return this.itemId;
 	}
 
 	@Override
-	public final void setItemId( final Long itemId) {
+	public void setItemId( final Long itemId) {
 		this.itemId = itemId;
 	}
 
 	@Override
-	public final String getItemType () {
+	public String getItemType () {
 		return this.itemType;
 	}
 
 	@Override
-	public final void setItemType (final String itemType) {
+	public void setItemType (final String itemType) {
 		this.itemType = itemType;
 	}
+
+	/**
+	 * @return the product
+	 */
+	@Override
+	public Product getProduct () {
+		return this.product;
+	}
+
+	/**
+	 * @param product the product to set
+	 */
+	@Override
+	public void setProduct (final Product product) {
+		this.product = product;
+	}
 }
diff --git a/src/org/mxchange/jshopcore/model/product/BaseProduct.java b/src/org/mxchange/jshopcore/model/product/BaseProduct.java
index 5faa9bf..e1cc402 100644
--- a/src/org/mxchange/jshopcore/model/product/BaseProduct.java
+++ b/src/org/mxchange/jshopcore/model/product/BaseProduct.java
@@ -7,13 +7,13 @@ package org.mxchange.jshopcore.model.product;
 
 import java.text.MessageFormat;
 import java.util.Objects;
-import org.mxchange.jshopcore.BaseShopCore;
+import org.mxchange.jcore.BaseFrameworkSystem;
 
 /**
  *
  * @author Roland Haeder
  */
-public class BaseProduct extends BaseShopCore implements Product {
+public abstract class BaseProduct extends BaseFrameworkSystem implements Product {
 	/**
 	 * Availability of product
 	 */
@@ -66,52 +66,52 @@ public class BaseProduct extends BaseShopCore implements Product {
 	}
 
 	@Override
-	public final Boolean getAvailable () {
+	public Boolean getAvailable () {
 		return this.available;
 	}
 
 	@Override
-	public final void setAvailable (final Boolean available) {
+	public void setAvailable (final Boolean available) {
 		this.available = available;
 	}
 
 	@Override
-	public final Long getCategoryId () {
+	public Long getCategoryId () {
 		return this.categoryId;
 	}
 
 	@Override
-	public final void setCategoryId (final Long categoryId) {
+	public void setCategoryId (final Long categoryId) {
 		this.categoryId = categoryId;
 	}
 
 	@Override
-	public final Long getItemId () {
+	public Long getItemId () {
 		return this.itemId;
 	}
 
 	@Override
-	public final void setItemId (final Long itemId) {
+	public void setItemId (final Long itemId) {
 		this.itemId = itemId;
 	}
 
 	@Override
-	public final Float getPrice () {
+	public Float getPrice () {
 		return this.price;
 	}
 
 	@Override
-	public final void setPrice (final Float price) {
+	public void setPrice (final Float price) {
 		this.price = price;
 	}
 
 	@Override
-	public final String getTitle () {
+	public String getTitle () {
 		return this.title;
 	}
 
 	@Override
-	public final void setTitle (final String title) {
+	public void setTitle (final String title) {
 		this.title = title;
 	}
 }
diff --git a/src/org/mxchange/jshopcore/model/product/Product.java b/src/org/mxchange/jshopcore/model/product/Product.java
index d0e46fb..b70a199 100644
--- a/src/org/mxchange/jshopcore/model/product/Product.java
+++ b/src/org/mxchange/jshopcore/model/product/Product.java
@@ -16,14 +16,14 @@
  */
 package org.mxchange.jshopcore.model.product;
 
-import org.mxchange.jshopcore.ShopInterface;
+import org.mxchange.jcore.FrameworkInterface;
 
 /**
  * An interface for in database storable products
  *
  * @author Roland Haeder
  */
-public interface Product extends ShopInterface, Comparable<Product> {
+public interface Product extends FrameworkInterface, Comparable<Product> {
 	/**
 	 * Getter for id number, suitable for form fields.
 	 * 
diff --git a/src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java b/src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java
index 7fe9de6..1b5b863 100644
--- a/src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java
+++ b/src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java
@@ -24,6 +24,7 @@ import org.mxchange.jshopcore.model.product.Product;
  * Generic product class
  *
  * @author Roland Haeder
+ * TODO: Find a better name
  */
 public class GenericProduct extends BaseProduct implements Product {
 	/**
-- 
2.39.5