[jboss-svn-commits] JBL Code SVN: r7425 - labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor

[jboss-svn-commits at lists.jboss.org]

Author: dejp
Date: 2006-11-07 10:01:58 -0500 (Tue, 07 Nov 2006)
New Revision: 7425

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
Log:
adding multi-select box to the search panel

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java	2006-11-07 14:41:17 UTC (rev 7424)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java	2006-11-07 15:01:58 UTC (rev 7425)
@@ -48,7 +48,7 @@
 	
 	private String searchName;
 	private String searchEmail;
-	private String searchProjects;
+	private List<String> searchProjects;
 	
 	private boolean committer;
 	
@@ -187,10 +187,15 @@
 		List<ConDataBean> allData = 
 			getServer().getDesc(ConTools.getPortalName()).getData();
 		
+		for (String name : searchProjects) {
+			System.out.println(name);
+		}
+		
 		for (ConDataBean bean : allData) {
 			if ((SearchTools.searchInString(bean.getName(), SearchTools.prepareTokens(searchName, " "))) ||
-					(SearchTools.searchInString(bean.getProjects(), SearchTools.prepareTokens(searchProjects, " "))) ||
+					//(SearchTools.searchInString(bean.getProjects(), SearchTools.prepareTokens(searchProjects, " "))) ||
 					//(SearchTools.searchInString(bean.getProjects(), new String[] { searchProjects.toLowerCase().trim() })) ||
+					searchInProjectsInfo(bean.getProjectsInfo(), searchProjects) ||
 					(SearchTools.searchInString(bean.getEmail(), SearchTools.prepareTokens(searchEmail, " ")))) {
 				filteredList.add(bean);
 			}
@@ -203,6 +208,18 @@
 		return null;
 	}
 
+	private boolean searchInProjectsInfo(Map<String, String> projectsInfo, 
+			List<String> searchProjects) {
+		
+		for (String projectId : projectsInfo.keySet()) {
+			if (searchProjects.contains(projectId)) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
 	/*
 	 * GETTERS/ SETTERS
 	 */
@@ -347,11 +364,11 @@
 		this.searchName = searchName;
 	}
 
-	public String getSearchProjects() {
+	public List<String> getSearchProjects() {
 		return searchProjects;
 	}
 
-	public void setSearchProjects(String searchProjects) {
+	public void setSearchProjects(List<String> searchProjects) {
 		this.searchProjects = searchProjects;
 	}
 
@@ -395,4 +412,5 @@
 		Set<String> projectIds = ConTools.getLeadProjectIds();
 		return getServer().getDesc(ConTools.getPortalName()).getNotAcceptedByLeadData(projectIds);
 	}
+	
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java	2006-11-07 14:41:17 UTC (rev 7424)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java	2006-11-07 15:01:58 UTC (rev 7425)
@@ -554,4 +554,5 @@
 		
 		return ProjectsHelper.getProjectsNameId(ConTools.getPortalName());
 	}
+
 }
\ No newline at end of file