Continued:

[juser-activity-core.git] / src / org / mxchange / jusercore / model / user / activity / UserActivityLog.java

diff --git a/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java b/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java
index bb9f64190f5feb706fc214dcec3f89cdb592bb5e..33ccdb5daff3d2a45de0f8f5c943168efb015358 100644 (file)
--- a/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java
+++ b/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Roland Häder
+ * Copyright (C) 2016, 2017 Roland Häder
  *
  * 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
@@ -17,7 +17,7 @@
 package org.mxchange.jusercore.model.user.activity;
 
 import java.text.MessageFormat;
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -37,12 +37,12 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
-import org.mxchange.jcontacts.contact.title.PersonalTitle;
+import org.mxchange.jcontacts.model.contact.title.PersonalTitle;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
 
 /**
- * A POJO for user acitivity log
+ * A POJO for user activity log
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
@@ -53,11 +53,7 @@ import org.mxchange.jusercore.model.user.User;
 @NamedQueries (
                {
                        @NamedQuery (name = "AllUserActivityLog", query = "SELECT a FROM user_activity_log AS a ORDER BY a.activityId DESC"),
-                       @NamedQuery (name = "FindAllUsersActivity", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser ORDER BY a.activityId DESC"),
-                       @NamedQuery (name = "FindAllActivityByType", query = "SELECT a FROM user_activity_log AS a WHERE a.activityType LIKE :activityType ORDER BY a.activityId DESC"),
-                       @NamedQuery (name = "FindUsersActivityByType", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser AND a.activityType LIKE :activityType ORDER BY a.activityId DESC"),
-                       @NamedQuery (name = "FindAllActivityByMultipleTypes", query = "SELECT a FROM user_activity_log AS a WHERE a.activityType IN :activityTypes ORDER BY a.activityId DESC"),
-                       @NamedQuery (name = "FindUsersActivityByMultipleTypes", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser AND a.activityType IN :activityTypes ORDER BY a.activityId DESC")
+                       @NamedQuery (name = "SearchAllUsersActivity", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser ORDER BY a.activityId DESC")
                }
 )
 @SuppressWarnings ("PersistenceUnitPresent")
@@ -118,7 +114,7 @@ public class UserActivityLog implements LogableUserActivity {
        @Basic (optional = false)
        @Temporal (TemporalType.TIMESTAMP)
        @Column (name = "activity_timestamp", nullable = false, updatable = false)
-       private Calendar activityTimestamp;
+       private Date activityTimestamp;
 
        /**
         * Type
@@ -150,12 +146,12 @@ public class UserActivityLog implements LogableUserActivity {
        /**
         * Constructor with message, type and user
         * <p>
-        * @param activityMessage Message
-        * @param activityType Type
-        * @param activityUser User instance
+        * @param activityMessage   Message
+        * @param activityType      Type
+        * @param activityUser      User instance
         * @param activityTimestamp imestamp
         */
-       public UserActivityLog (final String activityMessage, final String activityType, final User activityUser, final Calendar activityTimestamp) {
+       public UserActivityLog (final String activityMessage, final String activityType, final User activityUser, final Date activityTimestamp) {
                // Call other constructor
                this(activityType, activityUser, activityTimestamp);
 
@@ -175,11 +171,11 @@ public class UserActivityLog implements LogableUserActivity {
        /**
         * Constructor with type, user and timestamp
         * <p>
-        * @param activityType Type
-        * @param activityUser User instance
+        * @param activityType      Type
+        * @param activityUser      User instance
         * @param activityTimestamp imestamp
         */
-       public UserActivityLog (final String activityType, final User activityUser, final Calendar activityTimestamp) {
+       public UserActivityLog (final String activityType, final User activityUser, final Date activityTimestamp) {
                // Make sure all is set
                if (null == activityType) {
                        // Throw NPE
@@ -225,13 +221,13 @@ public class UserActivityLog implements LogableUserActivity {
        /**
         * Constructor with message, type, user, timestamp and principal name
         * <p>
-        * @param activityMessage Message
-        * @param activityType Type
-        * @param activityUser User instance
+        * @param activityMessage   Message
+        * @param activityType      Type
+        * @param activityUser      User instance
         * @param activityTimestamp imestamp
-        * @param principalName Principal name
+        * @param principalName     Principal name
         */
-       public UserActivityLog (final String activityMessage, final String activityType, final User activityUser, final Calendar activityTimestamp, final String principalName) {
+       public UserActivityLog (final String activityMessage, final String activityType, final User activityUser, final Date activityTimestamp, final String principalName) {
                // Call other constructor
                this(activityMessage, activityType, activityUser, activityTimestamp);
 
@@ -242,12 +238,12 @@ public class UserActivityLog implements LogableUserActivity {
        /**
         * Consctructor with type, user, timestamp and principal name
         * <p>
-        * @param activityType Type
-        * @param activityUser User instance
+        * @param activityType      Type
+        * @param activityUser      User instance
         * @param activityTimestamp imestamp
-        * @param principalName Principal name
+        * @param principalName     Principal name
         */
-       public UserActivityLog (final String activityType, final User activityUser, final Calendar activityTimestamp, final String principalName) {
+       public UserActivityLog (final String activityType, final User activityUser, final Date activityTimestamp, final String principalName) {
                // Call other constructor
                this(activityType, activityUser, activityTimestamp);
 
@@ -346,13 +342,13 @@ public class UserActivityLog implements LogableUserActivity {
 
        @Override
        @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getActivityTimestamp () {
+       public Date getActivityTimestamp () {
                return this.activityTimestamp;
        }
 
        @Override
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setActivityTimestamp (final Calendar activityTimestamp) {
+       public void setActivityTimestamp (final Date activityTimestamp) {
                this.activityTimestamp = activityTimestamp;
        }