[jboss-svn-commits] JBL Code SVN: r10580 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets/src/java/org/jboss/forge/projects/downloads and 1 other directory.

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

Author: szimano
Date: 2007-03-28 12:57:04 -0400 (Wed, 28 Mar 2007)
New Revision: 10580

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/CategoriesRW.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/CategoryRW.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/FilesRW.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
Log:
downloads

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/CategoriesRW.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/CategoriesRW.java	2007-03-28 16:26:43 UTC (rev 10579)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/CategoriesRW.java	2007-03-28 16:57:04 UTC (rev 10580)
@@ -33,6 +33,7 @@
 import javax.xml.bind.annotation.XmlType;
 
 import org.jboss.forge.common.projects.project.Categories;
+import org.jboss.forge.common.projects.project.Category;
 
 
 /**
@@ -85,10 +86,13 @@
         return this.category;
     }
     
+    
+    // added by tomek 
+ 
     @XmlTransient
-	private Map<String, CategoryRW> childCategories = new HashMap<String, CategoryRW>();
+	private Map<String, Category> childCategories = new HashMap<String, Category>();
     
-    public CategoryRW getCategory(String categoryId) {
+    public Category getCategory(String categoryId) {
 		return childCategories.get(categoryId);
 	}
     

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/CategoryRW.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/CategoryRW.java	2007-03-28 16:26:43 UTC (rev 10579)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/CategoryRW.java	2007-03-28 16:57:04 UTC (rev 10580)
@@ -172,7 +172,7 @@
 		this.categories = (CategoriesRW) value;
 	}
 
-	// tomek
+	// added by tomek
 	@XmlTransient
 	private Category parent;
 
@@ -182,7 +182,6 @@
 
 		if (files != null)
 			files.updateMaps();
-
 	}
 
 	public void setParent(Category parent) {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/FilesRW.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/FilesRW.java	2007-03-28 16:26:43 UTC (rev 10579)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/project/rw/FilesRW.java	2007-03-28 16:57:04 UTC (rev 10580)
@@ -148,10 +148,10 @@
         this.sorting = (SortingRW) value;
     }
     
-    // tomek
+    // added by tomek
     
     @XmlTransient
-	private Map<String, FileRW> childFiles = new HashMap<String, FileRW>();
+	private Map<String, File> childFiles = new HashMap<String, File>();
     
     protected void updateMaps() {
     	childFiles.clear();

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java	2007-03-28 16:26:43 UTC (rev 10579)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java	2007-03-28 16:57:04 UTC (rev 10580)
@@ -95,10 +95,14 @@
 				
 				files = cat.getFiles().getFile();
 				categories = cat.getCategories().getCategory();
+				
+				request.setAttribute(DownloadsConstants.DESCRIPTION, cat.getDescription());
+				request.setAttribute(DownloadsConstants.CATEGORYNAME, cat.getName());
 			}
 			
 			request.setAttribute(DownloadsConstants.FILES, files);
 			request.setAttribute(DownloadsConstants.CATEGORIES, categories);
+			
 
 			// Setting the attributes
 			request.setAttribute(ProjectsHelper.PROJECT_ID, projectId);

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java	2007-03-28 16:26:43 UTC (rev 10579)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java	2007-03-28 16:57:04 UTC (rev 10580)
@@ -32,4 +32,5 @@
 	public static final String CATEGORIES = "CATEGORIES";
 	public static final String FILES = "FILES";
 	public static final String DESCRIPTION = "DESCRIPTION";
+	public static final String CATEGORYNAME = "CATEGORYNAME";
 }