From: Roland Haeder <roland@mxchange.org>
Date: Thu, 10 Sep 2015 20:11:53 +0000 (+0200)
Subject: renamed fields + their setters/getter + updated jars
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=222663debde749e21f40aceaff10c56e32529723;p=jcustomer-core.git

renamed fields + their setters/getter + updated jars
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar
index c652122..6160458 100644
Binary files a/lib/jcore-ee-logger.jar and b/lib/jcore-ee-logger.jar differ
diff --git a/lib/jcore.jar b/lib/jcore.jar
index de27ca6..00e90e1 100644
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 935a2c9..3186bb6 100644
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ
diff --git a/src/org/mxchange/jshopcore/model/category/BaseCategory.java b/src/org/mxchange/jshopcore/model/category/BaseCategory.java
index b83b6bb..bb371cd 100644
--- a/src/org/mxchange/jshopcore/model/category/BaseCategory.java
+++ b/src/org/mxchange/jshopcore/model/category/BaseCategory.java
@@ -32,10 +32,10 @@ public abstract class BaseCategory implements Category, Comparable<Category> {
 	/**
 	 * Id number of category
 	 */
-	private Long categoryId;
+	private Long id;
 
 	/**
-	 * Parent category categoryId
+	 * Parent category id
 	 */
 	private Long parentId;
 
@@ -47,13 +47,13 @@ public abstract class BaseCategory implements Category, Comparable<Category> {
 	/**
 	 * Constructor which accepts all database fields
 	 *
-	 * @param categoryId Id number of database record
+	 * @param id Id number of database record
 	 * @param title Category title
-	 * @param parentId Parent categoryId
+	 * @param parentId Parent id
 	 */
-	protected BaseCategory (final Long categoryId, final String title, final Long parentId) {
+	protected BaseCategory (final Long id, final String title, final Long parentId) {
 		// Set all here
-		this.categoryId = categoryId;
+		this.id = id;
 		this.title = title;
 		this.parentId = parentId;
 	}
@@ -77,41 +77,41 @@ public abstract class BaseCategory implements Category, Comparable<Category> {
 			throw new NullPointerException("category is null"); //NOI18N
 		}
 
-		// Is the categoryId the same?
-		if (Objects.equals(this.getCategoryId(), category.getCategoryId())) {
-			// Same categoryId, means same category
+		// Is the id the same?
+		if (Objects.equals(this.getId(), category.getId())) {
+			// Same id, means same category
 			return 0;
-		} else if (this.getCategoryId() > category.getCategoryId()) {
-			// This categoryId is larger than compared to
+		} else if (this.getId() > category.getId()) {
+			// This id is larger than compared to
 			return -1;
 		}
 
-		// The other categoryId is larger
+		// The other id is larger
 		return 1;
 	}
 
 	/**
 	 * Id number of category
 	 *
-	 * @return the categoryId
+	 * @return the id
 	 */
 	@Override
-	public Long getCategoryId () {
-		return this.categoryId;
+	public Long getId () {
+		return this.id;
 	}
 
 	/**
 	 * Id number of category
 	 *
-	 * @param categoryId the categoryId to set
+	 * @param id the id to set
 	 */
 	@Override
-	public void setCategoryId (final Long categoryId) {
-		this.categoryId = categoryId;
+	public void setId (final Long id) {
+		this.id = id;
 	}
 
 	/**
-	 * Parent category categoryId
+	 * Parent category id
 	 *
 	 * @return the parentId
 	 */
@@ -121,7 +121,7 @@ public abstract class BaseCategory implements Category, Comparable<Category> {
 	}
 
 	/**
-	 * Parent category categoryId
+	 * Parent category id
 	 *
 	 * @param parentId the parentId to set
 	 */
diff --git a/src/org/mxchange/jshopcore/model/category/Category.java b/src/org/mxchange/jshopcore/model/category/Category.java
index a1c4962..f91422b 100644
--- a/src/org/mxchange/jshopcore/model/category/Category.java
+++ b/src/org/mxchange/jshopcore/model/category/Category.java
@@ -29,13 +29,13 @@ public interface Category extends Serializable {
 	 * Id number of category
 	 * @return the id
 	 */
-	public Long getCategoryId ();
+	public Long getId ();
 
 	/**
 	 * Id number of category
 	 * @param id the id to set
 	 */
-	public void setCategoryId (final Long id);
+	public void setId (final Long id);
 
 	/**
 	 * Parent category id
diff --git a/src/org/mxchange/jshopcore/model/item/BasketItem.java b/src/org/mxchange/jshopcore/model/item/BasketItem.java
index 0e19354..52d6d9e 100644
--- a/src/org/mxchange/jshopcore/model/item/BasketItem.java
+++ b/src/org/mxchange/jshopcore/model/item/BasketItem.java
@@ -53,7 +53,7 @@ public class BasketItem extends BaseItem implements AddableBasketItem {
 
 		// Copy all neccessary values
 		this.setItemId(product.getId());
-		this.setItemType("Product"); //NOI18N
+		this.setItemType("product"); //NOI18N
 
 		// Copy instance
 		this.setProduct(product);