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 c65212243809f11f3ffb24a9b60a199155e03c07..6160458d2a2ce3da276e245a39698c4b05cd18cb 100644 (file)
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 de27ca6829fa35a86410f5f03fb9631bbd5a801f..00e90e137a26c3f568dd22c4d0d25b25b2c1c88a 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 935a2c95c4a2c3876bdb5fbc0aa3c28141edb024..3186bb61c16482959c3c7ad77a27adedc3b145e0 100644 (file)
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 b83b6bb0435194509bc0fe373cd9fe396cffd897..bb371cdf7bc64d39cb0dd9c24eac32379ac62d1c 100644 (file)
--- 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 a1c49626e8989e3619e532e4ba63a960b6278f4a..f91422bd1f7eef97b3770bbb6fc62fcbc6b0a13f 100644 (file)
--- 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 0e19354ac49c9ad70dd07b6a39031ebbe9405e33..52d6d9e91259796d09cba542edd34e50c8c5cbee 100644 (file)
--- 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);