[jboss-svn-commits] JBL Code SVN: r11318 - labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal.

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

Author: adamw
Date: 2007-04-24 17:32:05 -0400 (Tue, 24 Apr 2007)
New Revision: 11318

Modified:
   labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java
Log:
MERGE 11314:11317

Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java	2007-04-24 21:29:25 UTC (rev 11317)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java	2007-04-24 21:32:05 UTC (rev 11318)
@@ -50,7 +50,7 @@
 
 public class DownloadsFilter implements Filter {
 
-    private static final String PROJ_DOWNLOAD = "[\\w\\d-]+/downloads/([\\w\\d-]+/)*[\\w\\d-]+(\\.[\\w\\d-]+)*";
+    private static final String PROJ_DOWNLOAD = "[\\w\\d-]+/downloads/([\\.\\w\\d-]+/)*[\\.\\w\\d-]+(\\.[\\w\\d-]+)*";
 
     private static final Logger log = Logger.getLogger(DownloadsFilter.class);
 
@@ -71,8 +71,6 @@
             uri = uri.substring(1);
         }
 
-        //log.info(uri + " " + uri.matches(PROJ_DOWNLOAD));
-
         if (uri.matches(PROJ_DOWNLOAD)) {
             String projectId = uri.substring(0, uri.indexOf('/'));
 
@@ -95,7 +93,7 @@
                 tokens = current.split("/", 2);
                 cat = downl.getCategories().getCategory(tokens[0]);
                 Category newCat = cat;
-
+                
                 while (newCat != null) {
                     if (tokens.length < 2) {
                         return true;
@@ -163,13 +161,6 @@
             return "/file-access/default/members/" + uri;
         }
 
-        /*for (File f : files) {
-            if (f.getId().equals(fileName)) {
-
-                return "/file-access/default/members/" + uri;
-            }
-        }*/
-
         return null;
     }