[jboss-svn-commits] JBL Code SVN: r32546 - labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 13 07:54:53 EDT 2010
Author: lkrzyzanek
Date: 2010-04-13 07:54:52 -0400 (Tue, 13 Apr 2010)
New Revision: 32546
Added:
labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/NonRHMemberFilter.java
Removed:
labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/RHMemberFilter.java
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/TopExtMembersWidget.java
Log:
Changed RHMemberFilter to NonRHMemberFilter
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/NonRHMemberFilter.java (from rev 32545, labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/RHMemberFilter.java)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/NonRHMemberFilter.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/NonRHMemberFilter.java 2010-04-13 11:54:52 UTC (rev 32546)
@@ -0,0 +1,102 @@
+/*
+ * JBoss Community http://jboss.org/
+ *
+ * Copyright (c) 2010 Red Hat Middleware, LLC. All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT A WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License, v.2.1 along with this distribution; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * Red Hat Author(s): Libor Krzyzanek
+ */
+package org.jboss.labs.sbs.plugin.topextmembers;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import com.jivesoftware.base.User;
+import com.jivesoftware.community.user.profile.ProfileFieldValue;
+import com.jivesoftware.community.user.profile.ProfileManager;
+
+/**
+ * Filter for RH members
+ *
+ * @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
+ */
+public class NonRHMemberFilter implements MemberFilter {
+
+ /** ID of profile file 'hire date' */
+ public static final long HIRE_DATE_ID = 10;
+
+ /** ID of profile file 'leave date' */
+ public static final long LEAVE_DATE_ID = 5005;
+
+ protected ProfileManager profileManager;
+
+ public NonRHMemberFilter(ProfileManager profileManager) {
+ this.profileManager = profileManager;
+ }
+
+ @Override
+ public boolean accpet(User u) {
+ return !isRHEmployee(u);
+ }
+
+ /**
+ * Check if member is RH employee
+ *
+ * @param u
+ * @return
+ */
+ public boolean isRHEmployee(User u) {
+ Map<Long, ProfileFieldValue> profile = profileManager.getProfile(u);
+
+ ProfileFieldValue hireDate = profile.get(HIRE_DATE_ID);
+ ProfileFieldValue leaveDate = profile.get(LEAVE_DATE_ID);
+ Date now = new Date();
+
+ if (hireDate != null && hireDate.getValue() != null) {
+ Date hd;
+ try {
+ hd = convertProfileDate(hireDate.getValue());
+ } catch (ParseException e) {
+ return false;
+ }
+ if (hd.after(now)) {
+ return false;
+ }
+ if (leaveDate != null && leaveDate.getValue() != null) {
+ Date ld;
+ try {
+ ld = (Date) convertProfileDate(leaveDate.getValue());
+ } catch (ParseException e) {
+ return false;
+ }
+ if (ld.after(now)) {
+ return true;
+ }
+ } else {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ protected Date convertProfileDate(String value) throws ParseException {
+ SimpleDateFormat df = new SimpleDateFormat("MM/dd/yyyy");
+ return df.parse(value);
+ }
+}
Property changes on: labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/NonRHMemberFilter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/RHMemberFilter.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/RHMemberFilter.java 2010-04-13 11:52:38 UTC (rev 32545)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/RHMemberFilter.java 2010-04-13 11:54:52 UTC (rev 32546)
@@ -1,96 +0,0 @@
-/*
- * JBoss Community http://jboss.org/
- *
- * Copyright (c) 2010 Red Hat Middleware, LLC. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT A WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License, v.2.1 along with this distribution; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * Red Hat Author(s): Libor Krzyzanek
- */
-package org.jboss.labs.sbs.plugin.topextmembers;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
-import com.jivesoftware.base.User;
-import com.jivesoftware.community.user.profile.ProfileFieldValue;
-import com.jivesoftware.community.user.profile.ProfileManager;
-
-/**
- * Filter for RH members
- *
- * @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
- */
-public class RHMemberFilter implements MemberFilter {
-
- /** ID of profile file 'hire date' */
- public static final long HIRE_DATE_ID = 10;
-
- /** ID of profile file 'leave date' */
- public static final long LEAVE_DATE_ID = 5005;
-
- protected ProfileManager profileManager;
-
- public RHMemberFilter(ProfileManager profileManager) {
- this.profileManager = profileManager;
- }
-
- @Override
- public boolean accpet(User u) {
- return isRHEmployee(u);
- }
-
- protected boolean isRHEmployee(User u) {
- Map<Long, ProfileFieldValue> profile = profileManager.getProfile(u);
-
- ProfileFieldValue hireDate = profile.get(HIRE_DATE_ID);
- ProfileFieldValue leaveDate = profile.get(LEAVE_DATE_ID);
- Date now = new Date();
-
- if (hireDate != null && hireDate.getValue() != null) {
- Date hd;
- try {
- hd = convertProfileDate(hireDate.getValue());
- } catch (ParseException e) {
- return false;
- }
- if (hd.after(now)) {
- return false;
- }
- if (leaveDate != null && leaveDate.getValue() != null) {
- Date ld;
- try {
- ld = (Date) convertProfileDate(leaveDate.getValue());
- } catch (ParseException e) {
- return false;
- }
- if (ld.after(now)) {
- return true;
- }
- } else {
- return true;
- }
- }
-
- return false;
- }
-
- protected Date convertProfileDate(String value) throws ParseException {
- SimpleDateFormat df = new SimpleDateFormat("MM/dd/yyyy");
- return df.parse(value);
- }
-}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/TopExtMembersWidget.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/TopExtMembersWidget.java 2010-04-13 11:52:38 UTC (rev 32545)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-topextmembers/trunk/src/main/java/org/jboss/labs/sbs/plugin/topextmembers/TopExtMembersWidget.java 2010-04-13 11:54:52 UTC (rev 32546)
@@ -89,7 +89,7 @@
LinkedList<User> nonRHTopMembers = new LinkedList<User>();
int topMembersCount = 0;
for (User user : topMembers) {
- if (!memberFilter.accpet(user)) {
+ if (memberFilter.accpet(user)) {
nonRHTopMembers.add(user);
}
topMembersCount++;
@@ -111,7 +111,7 @@
nextTopMembers = statusLevelManager.getLeaders(container, currentIndex, FETCH_COUNT);
}
for (User user : nextTopMembers) {
- if (!memberFilter.accpet(user)) {
+ if (memberFilter.accpet(user)) {
nonRHTopMembers.add(user);
}
if (nonRHTopMembers.size() >= getNumResults()) {
@@ -127,7 +127,7 @@
public void setProfileManager(ProfileManager profileManager) {
this.profileManager = profileManager;
- setMemberFilter(new RHMemberFilter(this.profileManager));
+ setMemberFilter(new NonRHMemberFilter(this.profileManager));
}
public void setMemberFilter(MemberFilter memberFilter) {
More information about the jboss-svn-commits
mailing list