From 5b55acd09af91c24ba235525569bd1a0e8f8bdd4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 10 Sep 2015 08:44:03 +0200 Subject: [PATCH] =?utf8?q?Updated=20jcoreee.jar=20Signed-off-by:Roland=20H?= =?utf8?q?=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcoreee.jar | Bin 16448 -> 16551 bytes .../jshopcore/model/basket/BaseBasket.java | 44 ------------------ .../model/category/BaseCategory.java | 26 ----------- .../jshopcore/model/item/BaseItem.java | 29 +----------- .../jshopcore/model/item/BasketItem.java | 4 -- .../jshopcore/model/product/BaseProduct.java | 31 ++---------- .../model/product/GenericProduct.java | 5 -- 7 files changed, 5 insertions(+), 134 deletions(-) diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 15f194f7a91b08159b76c9dc361a56512e5d7865..963ff769842e10dc653a66a7c0a12233947fe660 100644 GIT binary patch delta 1987 zcmZuyS!`5Q82;{^5s{{Ni&{mc26 zb8nx~u1{)atjlIM02gqp?V{<|KWMwycu6P!l~>Kb`#H-pEu=_HYgFWd7E$C2twj-+ z-mOTlzDAMDdPnZ9w%T^*gKOX4(y5fAM&2nXmN~Z4(h37k6dQ1$#K1h1W|5mOP$sZI zcG&##X5m`7-~Nh>I64ZmV3;UCp+LC_FLF%?xa7ZXpZv@bDRod0pg~u={DcPnwT*ee2Pg8MHXuA;{mU2cYQmRS|<+aR?rT2zkT^WwX3m`L93Jp1Nrhn zmS^I;3fCrshv{}Vat5m@L+r(dMY?BaK^+W&OV8glkTXu0_Qa3Wyr7Z-Oy8EVm`_= zER`W&IWtlChUZG^H;-MfD`7G;lyc|_Lb`ytHMlA#^>Wy`$8d12Qsua+ntRjb=)*$t zGv(+*4Z#`~!B1@ML&-wQFUAt;t4j6ed9?{8zMZK8+TlYd!Ck0BHn_2V>l<2CHV6~4QM1GtR@KF28TG4_8j?td|2HjHU*j9c!UXTiq!t3!aUg{i9^ zLDqdUh7iKi37%~Y254@nDt^sFC+N4uEyoIauJ#(xNRJh_606vdiVIVXo$mgM2%6aJ zb@&-k8gWwBJ**}tDEA!=wXls_sj?o9|7gqTcaX)^o(qJKJxhM*W>O_xg;|Ww%w!AD48`cI!=dW|Oe^n{$soS^Dxu zLqJ~k=cl>?!;TzfZ|vPUUk2%aFm-3yj;HxuF8dm`WIyJ6>PEv^oBAAt!mId2k@2wg zsdz6ORGU9>lcY4#sz`sNU6JdNE=BG~Vv4ji^(%6%X{#cCH}zTvPk&V8o~R}DPISKh zjYEE2IamG=^?Q}K8J8$CI`dqe+~gv#!n#xYR_9q@m0c^jOz`R%B};L}XXG*ie7ln19WvHzT3XWy0xLWHT%A1bw_JF=cAk9S?|dZiD8h_#rocbT9tsHA T5_QT?m*>dpmLlh?VWstdOEjAI delta 1818 zcmZuyT})g>6#nMky*s;?yZp0I{^=IzuDe?(Kg-|p+p;YzWvM`^l`0CYC>8-lYfAy6 zMqflS4{G8=jaZW!6|-vkU`#cs_DvI?Oqv=^<5M4KO%sg|dSopbIv z-<|zs*im9)H#|<#_Q;`> zql}Yrhwc>x&b#7s{S9#|6ctsrXh8~6E##wsW3L4-vMrcMvM6gOLy7o8FA-O4;VL_M z1~j^9Luq6M28(o)R$U~M>9Nrod89E-d{^WyPp36I%|IbCXtb1WAQM^2+Kp^w+hgR; zZ`xKWTQ~UyMN8O9EeE^E+J;=@NfhnwBPqQbzAs^0B}K!gn}!`iYVuuo02`}y51>1C zKr<97tD>#FjsI@UYN|CK&c#+fqL$02PPJyi;UAwfDeZ$MW#8#QgyWEj!{{>6jc5{j zaKwRL6EXBTa8%A8Hqnm(2L`2#avYP$A(P5_+<`|-oWP?F40D_`sfLd^@Hoc^#}gb+ ziYZTLJjI;WGH79xV~k>P_{asvDRIm4iJ$z2{WP9pXcd#C9OX*|O*Vc}Vv z;h41W9HzvwE6X`%VHz_GZt;yPC+T@iksAvyU{?I*YASmXFIm)wDTdVXnZc2X@zKul zv5C>}xr#ZCvld>)IocAgV2krSgK==^aDR#TAU7m#Ctr;B=dCf}PaDljv^1Bhs#90; zs5=Y=k~;OW(h2H#P(=DVb&63!JY$mJWV?rUBv_;!15FGsJK(s5S;dZMr;3-)*R;!&v;%pibGW#tOL@X{?vxmBuzH zt~ExaNN(zu;zUzSicgzPO5qA0m0~13q%zn%kHwE+g-UJC*Q&Udg6@L9%S^UIFfNZhg@QCZpRu7FPC Lba2u<4RZEB3t=|p diff --git a/src/org/mxchange/jshopcore/model/basket/BaseBasket.java b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java index 1110c43..293e521 100644 --- a/src/org/mxchange/jshopcore/model/basket/BaseBasket.java +++ b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java @@ -16,11 +16,7 @@ */ package org.mxchange.jshopcore.model.basket; -import java.text.MessageFormat; import java.util.Map; -import javax.ejb.EJB; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; /** * A general basket class @@ -34,33 +30,18 @@ public abstract class BaseBasket implements Basket< */ private static final long serialVersionUID = 782_396_762_230_845_717L; - /** - * Logger instance - */ - @EJB - @Log - private LoggerBeanLocal logger; - /** * Protected constructor with session instance */ protected BaseBasket () { - // Trace message - this.getLogger().logTrace("CALLED!"); //NOI18N } @Override public void init () { - // Trace message - this.getLogger().logTrace("CALLED!"); //NOI18N } @Override - @SuppressWarnings ("unchecked") public void addItem (final T item) { - // Trace call - this.getLogger().logTrace(MessageFormat.format("item={0} - CALLED!", item)); //NOI18N - // item must not be null if (null == item) { // Then abort here @@ -72,9 +53,6 @@ public abstract class BaseBasket implements Basket< // Add item to database // TODO: ((BasketFrontend) this.getFrontend()).addItem(item, this.getSessionId()); - - // Trace call - this.getLogger().logTrace("EXIT!"); //NOI18N } @Override @@ -85,18 +63,11 @@ public abstract class BaseBasket implements Basket< } @Override - @SuppressWarnings("unchecked") public Map getAll () { - // Trace message - this.getLogger().logTrace("CALLED!"); //NOI18N - // Init map // TODO: Map map = ((BasketFrontend) this.getFrontend()).getAll(); Map map = null; - // Trace message - this.getLogger().logTrace("map=" + map); //NOI18N - // Return it return map; } @@ -117,9 +88,6 @@ public abstract class BaseBasket implements Basket< @Override public boolean isAdded (final T item) { - // Trace call - this.getLogger().logTrace(MessageFormat.format("item={0} - CALLED!", item)); //NOI18N - // item must not be null if (null == item) { // Then abort here @@ -130,19 +98,7 @@ public abstract class BaseBasket implements Basket< // TODO: boolean isAdded = ((BasketFrontend) this.getFrontend()).isAdded(item, this.getSessionId()); boolean isAdded = true; - // Trace message - this.getLogger().logTrace(MessageFormat.format("isAdded={0} - EXIT!", isAdded)); //NOI18N - // Return it return isAdded; } - - /** - * Getter for logger - * - * @return Logger instance - */ - private LoggerBeanLocal getLogger () { - return this.logger; - } } diff --git a/src/org/mxchange/jshopcore/model/category/BaseCategory.java b/src/org/mxchange/jshopcore/model/category/BaseCategory.java index 3ddcd4f..fe5f491 100644 --- a/src/org/mxchange/jshopcore/model/category/BaseCategory.java +++ b/src/org/mxchange/jshopcore/model/category/BaseCategory.java @@ -16,11 +16,7 @@ */ package org.mxchange.jshopcore.model.category; -import java.text.MessageFormat; import java.util.Objects; -import javax.ejb.EJB; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; /** * A general product category class @@ -48,13 +44,6 @@ public abstract class BaseCategory implements Category, Comparable { */ private String title; - /** - * Logger instance - */ - @EJB - @Log - private LoggerBeanLocal logger; - /** * Constructor which accepts all database fields * @@ -83,17 +72,11 @@ public abstract class BaseCategory implements Category, Comparable { */ @Override public int compareTo (final Category category) { - // Trace message - this.getLogger().logTrace(MessageFormat.format("category={0} - CALLED!", category)); //NOI18N - // category should not be null if (null == category) { throw new NullPointerException("category is null"); //NOI18N } - // Debug message - this.getLogger().logDebug(MessageFormat.format("this.id={0},category.id={1}", this.getCategoryId(), category.getCategoryId())); //NOI18N - // Is the categoryId the same? if (Objects.equals(this.getCategoryId(), category.getCategoryId())) { // Same categoryId, means same category @@ -166,13 +149,4 @@ public abstract class BaseCategory implements Category, Comparable { public void setTitle (final String title) { this.title = title; } - - /** - * Getter for logger - * - * @return Logger instance - */ - private LoggerBeanLocal getLogger () { - return this.logger; - } } diff --git a/src/org/mxchange/jshopcore/model/item/BaseItem.java b/src/org/mxchange/jshopcore/model/item/BaseItem.java index e539d5a..b788238 100644 --- a/src/org/mxchange/jshopcore/model/item/BaseItem.java +++ b/src/org/mxchange/jshopcore/model/item/BaseItem.java @@ -16,11 +16,7 @@ */ package org.mxchange.jshopcore.model.item; -import java.text.MessageFormat; import java.util.Objects; -import javax.ejb.EJB; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.product.Product; @@ -31,6 +27,7 @@ import org.mxchange.jshopcore.model.product.Product; * @author Roland Haeder */ public abstract class BaseItem implements AddableBasketItem, Comparable { + /** * Serial number */ @@ -61,26 +58,13 @@ public abstract class BaseItem implements AddableBasketItem, Comparable { + /** * Serial number */ @@ -47,26 +44,13 @@ public abstract class BaseProduct implements Product, Comparable { */ private String title; - /** - * Logger instance - */ - @EJB - @Log - private LoggerBeanLocal logger; - @Override public int compareTo (final Product product) { - // Trace message - this.getLogger().logTrace(MessageFormat.format("product={0} - CALLED!", product)); //NOI18N - // category should not be null if (null == product) { throw new NullPointerException("product is null"); //NOI18N } - - // Debug message - this.getLogger().logDebug(MessageFormat.format("this.id={0},product.id={1}", this.getId(), product.getId())); //NOI18N - + // Is the id the same? if (Objects.equals(this.getId(), product.getId())) { // Same id, means same category @@ -75,7 +59,7 @@ public abstract class BaseProduct implements Product, Comparable { // This id is larger than compared to return 1; } - + // The other id is larger return -1; } @@ -129,13 +113,4 @@ public abstract class BaseProduct implements Product, Comparable { public void setTitle (final String title) { this.title = title; } - - /** - * Getter for logger - * - * @return Logger instance - */ - protected LoggerBeanLocal getLogger () { - return this.logger; - } } diff --git a/src/org/mxchange/jshopcore/model/product/GenericProduct.java b/src/org/mxchange/jshopcore/model/product/GenericProduct.java index 8ff19c4..ecd215a 100644 --- a/src/org/mxchange/jshopcore/model/product/GenericProduct.java +++ b/src/org/mxchange/jshopcore/model/product/GenericProduct.java @@ -16,8 +16,6 @@ */ package org.mxchange.jshopcore.model.product; -import java.text.MessageFormat; - /** * Generic product class * @@ -46,9 +44,6 @@ public class GenericProduct extends BaseProduct implements Product { * @param available Availability (selectable by customer) */ public GenericProduct (final Long id, final String title, final Float price, final Long categoryId, final Boolean available) { - // Trace message - this.getLogger().logTrace(MessageFormat.format("id={0},title={1},price={2},categoryId={3},available={4} - CALLED!", id, title, price, categoryId, available)); //NOI18N - // Set all here this.setId(id); this.setTitle(title); -- 2.39.5