[jboss-svn-commits] JBL Code SVN: r10284 - labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin.

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

Author: wrzep
Date: 2007-03-16 16:34:31 -0400 (Fri, 16 Mar 2007)
New Revision: 10284

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminTools.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoAdminBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoTypesBean.java
Log:
JBLAB-780
final cleanup


Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminTools.java	2007-03-16 19:47:56 UTC (rev 10283)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminTools.java	2007-03-16 20:34:31 UTC (rev 10284)
@@ -25,7 +25,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import javax.faces.model.SelectItem;
 import javax.management.MalformedObjectNameException;
@@ -33,10 +32,11 @@
 import org.jboss.forge.common.ejb3.LabsServices;
 import org.jboss.forge.common.ejb3.ProjectsService;
 import org.jboss.forge.common.ejb3.ProjectsServiceRW;
-import org.jboss.forge.common.projects.project.Documentation;
 import org.jboss.forge.common.projects.project.DocumentationType;
 import org.jboss.forge.common.projects.project.Project;
+import org.jboss.forge.common.projects.project.rw.DocumentationTypeRW;
 import org.jboss.forge.common.exceptions.ServiceRetrievalException;
+
 import org.jboss.logging.Logger;
 
 
@@ -96,42 +96,18 @@
 		projectsServiceRW.persistProject(project);
 	}
 	
-	//////////////////////////////
+	public static List<DocumentationType> getDocumentationTypes() {
 		
-	public static List<Documentation> getAllDocumentation(Project prj) {
+		List<DocumentationType> list = new ArrayList<DocumentationType>();
 		
-		Map<DocumentationType,Documentation> docMap = getDocumentationMap(prj);	
-		List<Documentation> ret = new ArrayList<Documentation>();
-		/*
-		for (DocumentationType dt : DocumentationType.values()) {
-			
-			Documentation d = docMap.get(dt);
-			if (d != null) {
-				ret.add(d);
-			} else {
-				d = new Documentation();
-				d.setType(dt);
-				ret.add(d);
-			}
-		}
-		*/
-		return ret;
-	}
-	
-	public static Map<DocumentationType, Documentation> getDocumentationMap(Project project) {
-
-		return null;
+		list.add(DocumentationTypeRW.FAQ);
+		list.add(DocumentationTypeRW.INSTALLATION);
+		list.add(DocumentationTypeRW.JAVADOC);
+		list.add(DocumentationTypeRW.MANUAL);
+		list.add(DocumentationTypeRW.QUICK_START);
+		list.add(DocumentationTypeRW.WIKI);
 		
-		/*
-		Map<DocumentationType, Documentation> map = 
-					new EnumMap<DocumentationType, Documentation>(DocumentationType.class);
-		
-		List<Documentation> docList = project.getDocumentation();
-		for (Documentation d : docList) {
-			map.put(d.getType(), d);
-		}
-		
-		return map; */
+		return list;
 	}
 		
 	private ProjectAdminTools() {	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoAdminBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoAdminBean.java	2007-03-16 19:47:56 UTC (rev 10283)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoAdminBean.java	2007-03-16 20:34:31 UTC (rev 10284)
@@ -25,9 +25,6 @@
 import java.util.List;
 
 import org.jboss.forge.common.FacesTools;
-import org.jboss.forge.common.projects.project.BuildResult;
-import org.jboss.forge.common.projects.project.BuildType;
-import org.jboss.forge.common.projects.project.Documentation;
 import org.jboss.forge.common.projects.project.Project;
 
 
@@ -51,8 +48,6 @@
 							//TODO get projectId by parameter
 
 		jems = project.getJems();
-		
-		//documentation = ProjectInfoTools.getAllDocumentation(project);
 	}
 	
 	/* Business methods */

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoTypesBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoTypesBean.java	2007-03-16 19:47:56 UTC (rev 10283)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoTypesBean.java	2007-03-16 20:34:31 UTC (rev 10284)
@@ -23,6 +23,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.faces.model.SelectItem;
 
 import org.jboss.forge.common.projects.project.rw.BuildTypeRW;
@@ -89,14 +90,7 @@
 		return list;
 	}
 	
-	/*
-	public Map<String,DocumentationType> getDocumentationTypes() {
-		
-		Map<String,DocumentationType> typesMap = new HashMap<String,DocumentationType>();
-		for (DocumentationType ft : DocumentationType.values()) {
-			typesMap.put(ft.value(), ft);
-		}
-		return typesMap;
-	}
-	*/
+
+	
+
 }