[jboss-svn-commits] JBL Code SVN: r16566 - 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-11-13 05:39:27 -0500 (Tue, 13 Nov 2007)
New Revision: 16566

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
Log:
little clean up in code

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml	2007-11-13 09:20:00 UTC (rev 16565)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml	2007-11-13 10:39:27 UTC (rev 16566)
@@ -184,5 +184,11 @@
             <artifactId>jgroups</artifactId>
             <jar>jgroups.jar</jar>
         </dependency>
+        
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.9</version>
+        </dependency>
     </dependencies>
 </project>

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-11-13 09:20:00 UTC (rev 16565)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java	2007-11-13 10:39:27 UTC (rev 16566)
@@ -44,6 +44,8 @@
 import org.jboss.portlet.JBossRenderRequest;
 import org.jboss.portlet.JBossRenderResponse;
 
+import static org.jboss.forge.projects.downloads.DownloadsConstants.*;
+
 /**
  * A portlet for project downloads.
  * 
@@ -69,7 +71,7 @@
 
 			// show bar if not on project page
 			if (ProjectsHelper.getSelectedProjectId(request, false) == null) {
-				request.setAttribute(DownloadsConstants.NOPROJECT, "NOPROJECT");
+				request.setAttribute(NOPROJECT, "NOPROJECT");
 			}
 
 			if (projectId == null) {
@@ -132,9 +134,9 @@
 						files = f.getFile();
                         
                         if (f.isVisible()) {
-                            request.setAttribute(DownloadsConstants.FILES_VISIBLE, Boolean.TRUE);
+                            request.setAttribute(FILES_VISIBLE, Boolean.TRUE);
                         } else {
-                            request.setAttribute(DownloadsConstants.FILES_VISIBLE, Boolean.FALSE);
+                            request.setAttribute(FILES_VISIBLE, Boolean.FALSE);
                         }
 					}
 
@@ -174,9 +176,9 @@
 						files = f.getFile();
                     
                         if (f.isVisible()) {
-                            request.setAttribute(DownloadsConstants.FILES_VISIBLE, Boolean.TRUE);
+                            request.setAttribute(FILES_VISIBLE, Boolean.TRUE);
                         } else {
-                            request.setAttribute(DownloadsConstants.FILES_VISIBLE, Boolean.FALSE);
+                            request.setAttribute(FILES_VISIBLE, Boolean.FALSE);
                         }
                     }
 
@@ -186,7 +188,7 @@
 					desc = cat.getDescription();
 					name = cat.getName();
 
-					request.setAttribute(DownloadsConstants.CATEGORY, cat);
+					request.setAttribute(CATEGORY, cat);
 				}
 
 				if (files != null) {
@@ -198,11 +200,11 @@
 				}
 			}
             
-			request.setAttribute(DownloadsConstants.DESCRIPTION, desc);
-			request.setAttribute(DownloadsConstants.CATEGORYNAME, name);
-			request.setAttribute(DownloadsConstants.FILES, files);
-			request.setAttribute(DownloadsConstants.CATEGORIES, categories);
-			request.setAttribute(DownloadsConstants.BUTTONCAT, buttoncat);
+			request.setAttribute(DESCRIPTION, desc);
+			request.setAttribute(CATEGORYNAME, name);
+			request.setAttribute(FILES, files);
+			request.setAttribute(CATEGORIES, categories);
+			request.setAttribute(BUTTONCAT, buttoncat);
 
 			// Setting the attributes
 			request.setAttribute(ProjectsHelper.PROJECT_ID, projectId);
@@ -228,9 +230,9 @@
 
                 if (c != null) {
                     if (c.isVisible()) {
-                        request.setAttribute(DownloadsConstants.COUNTERS_VISIBLE, Boolean.TRUE);
+                        request.setAttribute(COUNTERS_VISIBLE, Boolean.TRUE);
                     } else {
-                        request.setAttribute(DownloadsConstants.COUNTERS_VISIBLE, Boolean.FALSE);
+                        request.setAttribute(COUNTERS_VISIBLE, Boolean.FALSE);
                     }
                 }
                 
@@ -238,7 +240,7 @@
                 Map<String, org.jboss.forge.common.projects.Counter> countersMap = 
                     downloadCountersDB.getCountersMapForProject(projectId);
                 
-                request.setAttribute(DownloadsConstants.COUNTERS_MAP, countersMap);
+                request.setAttribute(COUNTERS_MAP, countersMap);
                 
 				rd = getPortletContext().getRequestDispatcher(
 						ForgeHelper.createRepoAccessPath(portalName,