Please cherry-pick:

- sorted members

diff --git a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java
index 2be689f6bbafef32891a765afc52d803436d33e7..ede0071b126b2d701861957acf8268590e38f48a 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java
@@ -443,6 +443,36 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple
                this.addUserActivity(event.getUpdatedUser(), "USER_UPDATED_PERSONAL_DATA"); //NOI18N
        }
 
+       @Override
+       public String expandAdminActivityType (final String activityType) {
+               // Is it valid?
+               if (null == activityType) {
+                       // Throw NPE
+                       throw new NullPointerException("activityType is null"); //NOI18N
+               } else if (activityType.isEmpty()) {
+                       // Is empty
+                       throw new IllegalArgumentException("activityType is empty"); //NOI18N
+               }
+
+               // Expand it
+               return "ADMIN_ACTIVITY_" + activityType; //NOI18N
+       }
+
+       @Override
+       public String expandUserActivityType (final String activityType) {
+               // Is it valid?
+               if (null == activityType) {
+                       // Throw NPE
+                       throw new NullPointerException("activityType is null"); //NOI18N
+               } else if (activityType.isEmpty()) {
+                       // Is empty
+                       throw new IllegalArgumentException("activityType is empty"); //NOI18N
+               }
+
+               // Expand it
+               return "USER_ACTIVITY_" + activityType; //NOI18N
+       }
+
        @Override
        public List<LogableUserActivity> fetchCurrentUsersActivityLog () {
                // Get user
@@ -477,36 +507,6 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple
                return list;
        }
 
-       @Override
-       public String expandAdminActivityType (final String activityType) {
-               // Is it valid?
-               if (null == activityType) {
-                       // Throw NPE
-                       throw new NullPointerException("activityType is null"); //NOI18N
-               } else if (activityType.isEmpty()) {
-                       // Is empty
-                       throw new IllegalArgumentException("activityType is empty"); //NOI18N
-               }
-
-               // Expand it
-               return "ADMIN_ACTIVITY_" + activityType; //NOI18N
-       }
-
-       @Override
-       public String expandUserActivityType (final String activityType) {
-               // Is it valid?
-               if (null == activityType) {
-                       // Throw NPE
-                       throw new NullPointerException("activityType is null"); //NOI18N
-               } else if (activityType.isEmpty()) {
-                       // Is empty
-                       throw new IllegalArgumentException("activityType is empty"); //NOI18N
-               }
-
-               // Expand it
-               return "USER_ACTIVITY_" + activityType; //NOI18N
-       }
-
        /**
         * Post-constructor method
         */