From a808a9fe0ac96e3768cd0d735e70c4158a6a097d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 3 Sep 2016 14:33:16 +0200 Subject: [PATCH] Please cherry-pick: - sorted members --- .../JobsUserActivityWebApplicationBean.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) 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 2be689f6..ede0071b 100644 --- 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 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 */ -- 2.39.5