[jboss-svn-commits] JBL Code SVN: r6708 - in labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects: . elements

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

Author: dejp
Date: 2006-10-09 10:49:13 -0400 (Mon, 09 Oct 2006)
New Revision: 6708

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java
Log:
addition methods to retrieve projects info

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java	2006-10-09 14:37:26 UTC (rev 6707)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java	2006-10-09 14:49:13 UTC (rev 6708)
@@ -22,12 +22,12 @@
 package org.jboss.forge.common.projects;
 
 import java.io.Serializable;
+import java.util.Map;
 import java.util.Set;
 
+import org.jboss.forge.common.navigation.Menu;
 import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.forge.common.navigation.Menu;
 import org.jboss.portal.common.context.DelegateContext;
-import org.jboss.shotoku.aop.CacheItem;
 
 /**
  * A class which manages creating project and projects descriptors for a given 
@@ -281,4 +281,12 @@
 	public IssueTracker getProjectIssueTracker(String projectId) {
 		return getProjectsDescriptor().getProjectIssueTracker(projectId);
 	}
+	
+	public Map<String, String> getProjectsNameId() {
+		return getProjectsDescriptor().getProjectsNameId();
+	}
+	
+	public Set<String> getProjectIds() {
+		return getProjectsDescriptor().getProjectIds();
+	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java	2006-10-09 14:37:26 UTC (rev 6707)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java	2006-10-09 14:49:13 UTC (rev 6708)
@@ -743,4 +743,30 @@
      
 		 return pd.getProjectIssueTracker();
 	}
+	
+	public Map<String, String> getProjectsNameId() {
+		
+		Map<String, String> projectsNameId = new HashMap<String, String>();
+		for (String projectId : projects.keySet()) {
+            ProjectDescriptor project = projects.get(projectId);
+            // Not adding the default project.
+            if (projectAdmissable(projectId)) {
+            	projectsNameId.put(project.getProperty("name"), projectId);
+            }			
+		}
+		return projectsNameId;
+	}
+	
+	public Set<String> getProjectIds() {
+		
+		Set<String> ret = new LinkedHashSet<String>();
+        for (String projectId : projects.keySet()) {
+            ProjectDescriptor project = projects.get(projectId);
+            // Not adding the default project.
+            if (projectAdmissable(projectId)) {
+            	ret.add(projectId);
+            }
+        }
+        return ret;		
+	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java	2006-10-09 14:37:26 UTC (rev 6707)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java	2006-10-09 14:49:13 UTC (rev 6708)
@@ -23,6 +23,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.jboss.forge.common.Constants;
 import org.jboss.forge.common.ForgeHelper;
@@ -239,4 +240,13 @@
 	public static String createPageLink(String portalName, String projectId, String page) {
 		return Constants.LINK_BASE + projectId + "/" + page;
 	}
+
+	public static Map<String, String> getProjectsNameId(String portalName) {
+		return getProjects(portalName).getProjectsNameId();
+	}
+	
+	public static Set<String> getProjectIds(String portalName) {
+		return getProjects(portalName).getProjectIds();
+	}
+
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java	2006-10-09 14:37:26 UTC (rev 6707)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java	2006-10-09 14:49:13 UTC (rev 6708)
@@ -278,6 +278,7 @@
 				if (n.getNodeName().equals(elementName)) {
 					ElementDescriptor ed = new ElementDescriptor(n, xht, ph,
 							epm, opm);
+					
 					elements.put(ed.getId(), ed);
 				}
 			}