From f3103aa5c42e98b17eefe68764791346d4d12fc9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 16 Aug 2017 23:46:31 +0200
Subject: [PATCH] updated jar(s)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
lib/juser-core.jar | Bin 66710 -> 66710 bytes
...essbookUserActivityWebApplicationBean.java | 178 +++++++++---------
2 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 47124fbd731e4d580c450ed628e41034bfbce6da..a215338d6eb209b93504d153752fbbac917e5236 100644
GIT binary patch
delta 1241
zcmZ9LZ%9*N6vp@7d%OP6DLSf^B8F`e_$Q<3(o9NI(b7!IEy1vqmX?*7X3B^{32pk4
zi-^h(S(0UFAcc`&DIrpQ2*mmj_$A$R)2W*}UAyNDOF#Xd^PKaZ`|R$%tqojj1Lt!r
zo#i}5B6pEU`OL4`N5;lEp=f1=>U%K2A`?J^NHp*`i3Q#x3BYe83E0NVsMyV$>KL9L
zWjw)CGa0~67wt?k)QxNmbxeDB{r7Cz$R2j}_R=>d_jSD;T*}(HrbM^(sc9D%4_y<d
z0NNQD)s+Nnm{Nl)-Qad{GWs;kYlF-3nXoB`PXo5`hXnTg;oCQXX!fooAiOp=F(4j^
zv(cIHt460RAQ_$BKotu!fm^Smqucg^2S*w5p13<Vr$0!I|4I|XBWb^!r@O)es95ex
ze@B(|d<r#lFyXQCBa1pBgo&L!Vz~@ADZ~3P(NcsKo!Y2TbWZJSL}x-VhR$F@GdlT+
z4^dbTPGD<1B@a`_rxkJ#tu0fIsYkMw(HYK-2GOnhfSvw=*C@)*453h-yMeRs&X-DH
zja;jA15sS>69l5NJqdq&U+3g@a5}!+#^X^Vy}sZWel_7t&G;)gPIns=!na9_4F`k?
z+F^(Q{&f06EivL}s4}KP{oIIuq0N{Lb;eW<P%|T?AE$6u(81HFi>7m-A8eM=(doD~
z9clWf>s|V@DbLkE0UUPjX))vV7&0FL&wmE@X=YBlX7DOVXA7XNnau}gOiAh7EMBQd
ziw3;MmI|O`t_s*PcMG^>9(~<>9n}5{7l7J@Yrv(2OTbcVHE_~;5vaCR!6$U`PMwaL
ztP*Om<$$5eyKAI{HVHkuh^Yn_ufU1@OE-aiOILw=mTQ4;m$g8Jy%N}MF9U|IVA3Zm
zI4@bnq)n?O&|h4|BpL@M9&?ln{{2jH88|>-k3NPFSfGDNh+63AJsAQoTVKSuoB@VF
UNPR3zAcek%CGg_(Asngr3*Z*9G5`Po
delta 1241
zcmZ9LZAepL6vy}6dz<gML`St!#IQ{QUox64&7?FHEzPvt5)4bpw5-fDQ$`d@Y14;X
zL{xsUB+GDt6h?xjgh=%v5GxS;l5XzBsna=KyXOo`KmGpaf6jC6e|Pt3YvkG*Ilp7+
zEaxo{cnSpL_k3IYr0j1O<ZUcpeGdUxr95abi2)ubalrc|0r-t10o#RAD)R898b(Nu
zGTz{+m<(W-n+_%!>LxapI*ndF|2>;Fv4`EgJ@k#qb4_nMm$G`UIniTnYTC`kL)XN~
zfeuDWH6?-Trc~fc*16rBls*ghS?99COxTnoOarzH5AoFf5q4|<(c)W0K=^EIW<Wd^
zWus%+RD(`=U@|(rK}r^8g0@^oN3->X5FAD5d*bQZoc=I1{wqz4h@$;6A>A1sNJTP#
zIv!oF`xIv8V8UzpM;3KP@)J9BBAFC7DI)qXkv&q4PF?gUI;ZwFp))BTLuW9d1)coF
zM<{FuC$Tk=l833|(+W9=)}ATD)FW9-=nUt^fap<vz)pX`YZMh{hEOQZ-N4y*=gY*f
zMy6JHfGBS83kFfuk%T|KuWM=>IGtZ^<MHT`UVm`(znXETcH$Krr@QoW{@bL*`UCs~
z?bJsCf4Y3W78~$0R2ovDer~|OaKVrbb;fiKu+$=<AE$Aa*C9sKMaEp{hnOXF)VOa|
zN16WV2Dkof%5(Qm0Eb<BTFrPphRjF63$Wn6Qp;)g3|<AvOaaujGx@-bX$hU3!7CMI
zEd}q1wGt?vtp>Kv-U4o(Ltisj4|Tx&1)zHV8qhv}30P*U0Z!R20#ysu@Clu~Q?H>W
zo0wV`a==jL-8Im{1u;Flh^Yn_ufU1@_M5;y`&HoXr8?l-B{fj)r~>vl%7J0anDpr~
z&Wl$tY4b`6^cPn!NvRVPk2x!N|3N0X3>+Y^M;l8BEYQ9rM8$Ws-VA}4tu12Q&HzIo
Uq&AKvkV30t3A{LMC`T&)0y^OHpa1{>
diff --git a/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java
index 59eb590e..9c17a283 100644
--- a/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java
@@ -94,99 +94,10 @@ public class AddressbookUserActivityWebApplicationBean extends BaseAddressbookCo
*/
@SuppressWarnings ("CollectionWithoutInitialCapacity")
public AddressbookUserActivityWebApplicationBean () {
- // Try to get EJB instance
- try {
- // Get initial context
- Context context = new InitialContext();
-
- // Try to lookup
- this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/addressbook-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N
- } catch (final NamingException e) {
- // Throw again
- throw new FaceletException(e);
- }
-
// Init cache
this.usersActivity = new LinkedHashMap<>();
}
- /**
- * Adds user activity entry with given type
- * <p>
- * @param user User instance
- * @param activityType Activity type
- */
- private void addUserActivity (final User user, final String activityType) {
- // Better re-validate
- if (null == user) {
- // Throw NPE
- throw new NullPointerException("user is null"); //NOI18N
- } else if (user.getUserId() == null) {
- // Throw again
- throw new NullPointerException("user.userId is null"); //NOI18N
- } else if (user.getUserId() < 1) {
- // Invalid id number
- throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
- } else if (null == activityType) {
- // Throw NPE again
- throw new NullPointerException("activityType is null"); //NOI18N
- } else if (activityType.isEmpty()) {
- // Is empty
- throw new IllegalArgumentException("activityType is empty"); //NOI18N
- }
-
- // Create new activity object
- LogableUserActivity userActivity = new UserActivityLog(activityType, user, new GregorianCalendar(), this.determinePrincipalName());
-
- // Call bean to add it
- this.userActivityBean.addUserActivityLog(userActivity);
-
- // Add to cache, too
- this.addUserActivityToCache(userActivity);
- }
-
- /**
- * Adds user activity log with type and message
- * <p>
- * @param user User instance
- * @param activityType Activity type
- * @param message Activity message
- */
- private void addUserActivity (final User user, final String activityType, final String message) {
- // Better re-validate
- if (null == user) {
- // Throw NPE
- throw new NullPointerException("user is null"); //NOI18N
- } else if (user.getUserId() == null) {
- // Throw again
- throw new NullPointerException("user.userId is null"); //NOI18N
- } else if (user.getUserId() < 1) {
- // Invalid id number
- throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
- } else if (null == activityType) {
- // Throw NPE again
- throw new NullPointerException("activityType is null"); //NOI18N
- } else if (activityType.isEmpty()) {
- // Is empty
- throw new IllegalArgumentException("activityType is empty"); //NOI18N
- } else if (null == message) {
- // Throw NPE again
- throw new NullPointerException("message is null"); //NOI18N
- } else if (message.isEmpty()) {
- // Is empty
- throw new IllegalArgumentException("message is empty"); //NOI18N
- }
-
- // Create new activity object
- LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new GregorianCalendar(), this.determinePrincipalName());
-
- // Call bean to add it
- this.userActivityBean.addUserActivityLog(userActivity);
-
- // Add to cache, too
- this.addUserActivityToCache(userActivity);
- }
-
/**
* Event observer for newly added users by administrator
* <p>
@@ -640,6 +551,18 @@ public class AddressbookUserActivityWebApplicationBean extends BaseAddressbookCo
*/
@PostConstruct
public void init () {
+ // Try to get EJB instance
+ try {
+ // Get initial context
+ Context context = new InitialContext();
+
+ // Try to lookup
+ this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N
+ } catch (final NamingException e) {
+ // Throw again
+ throw new FaceletException(e);
+ }
+
// Get whole list
List<LogableUserActivity> list = this.userActivityBean.fetchAllUserActivityLog();
@@ -659,6 +582,83 @@ public class AddressbookUserActivityWebApplicationBean extends BaseAddressbookCo
}
}
+ /**
+ * Adds user activity entry with given type
+ * <p>
+ * @param user User instance
+ * @param activityType Activity type
+ */
+ private void addUserActivity (final User user, final String activityType) {
+ // Better re-validate
+ if (null == user) {
+ // Throw NPE
+ throw new NullPointerException("user is null"); //NOI18N
+ } else if (user.getUserId() == null) {
+ // Throw again
+ throw new NullPointerException("user.userId is null"); //NOI18N
+ } else if (user.getUserId() < 1) {
+ // Invalid id number
+ throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
+ } else if (null == activityType) {
+ // Throw NPE again
+ throw new NullPointerException("activityType is null"); //NOI18N
+ } else if (activityType.isEmpty()) {
+ // Is empty
+ throw new IllegalArgumentException("activityType is empty"); //NOI18N
+ }
+
+ // Create new activity object
+ LogableUserActivity userActivity = new UserActivityLog(activityType, user, new GregorianCalendar(), this.determinePrincipalName());
+
+ // Call bean to add it
+ this.userActivityBean.addUserActivityLog(userActivity);
+
+ // Add to cache, too
+ this.addUserActivityToCache(userActivity);
+ }
+
+ /**
+ * Adds user activity log with type and message
+ * <p>
+ * @param user User instance
+ * @param activityType Activity type
+ * @param message Activity message
+ */
+ private void addUserActivity (final User user, final String activityType, final String message) {
+ // Better re-validate
+ if (null == user) {
+ // Throw NPE
+ throw new NullPointerException("user is null"); //NOI18N
+ } else if (user.getUserId() == null) {
+ // Throw again
+ throw new NullPointerException("user.userId is null"); //NOI18N
+ } else if (user.getUserId() < 1) {
+ // Invalid id number
+ throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
+ } else if (null == activityType) {
+ // Throw NPE again
+ throw new NullPointerException("activityType is null"); //NOI18N
+ } else if (activityType.isEmpty()) {
+ // Is empty
+ throw new IllegalArgumentException("activityType is empty"); //NOI18N
+ } else if (null == message) {
+ // Throw NPE again
+ throw new NullPointerException("message is null"); //NOI18N
+ } else if (message.isEmpty()) {
+ // Is empty
+ throw new IllegalArgumentException("message is empty"); //NOI18N
+ }
+
+ // Create new activity object
+ LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new GregorianCalendar(), this.determinePrincipalName());
+
+ // Call bean to add it
+ this.userActivityBean.addUserActivityLog(userActivity);
+
+ // Add to cache, too
+ this.addUserActivityToCache(userActivity);
+ }
+
/**
* Adds given user activity instance to "cache" (local map)
* <p>
--
2.39.5