[Jboss-svn-commits] JBL Code SVN: r1691 - trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects

[<jbo...@li...>]

Author: unibrew
Date: 2005-12-05 09:17:28 -0500 (Mon, 05 Dec 2005)
New Revision: 1691

Modified:
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java
Log:
[DownloadCounters] Small security update.

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java	2005-12-03 23:08:40 UTC (rev 1690)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java	2005-12-05 14:17:28 UTC (rev 1691)
@@ -102,22 +102,17 @@
 			return ctx;
 		}
 		
-		// Getting the counters.
-		Map<String,Counter> values = desc.getCountersMap();
+		// Getting the counters values.
+		Map<String,String> values = desc.getValuesForPortlet(projectId);
 		
 		// Filling the context for portlet.
 		DelegateContext counters = ctx.next("counters");
 		for (String keyLink:values.keySet()) {
-			// Getting project ID from the counter
-			String counterProjectId = values.get(keyLink).getProjectId();
-			
-			if (counterProjectId!=null && counterProjectId.compareTo(projectId)==0) {
-				DelegateContext counter = counters.next("counter");
-				// Resolving the file name.
-				String fileName = keyLink.split(File.separator)[keyLink.split(File.separator).length-1];
-				counter.put("link",fileName);
-				counter.put("value",Long.toString(values.get(keyLink).getValue()));
-			}
+			DelegateContext counter = counters.next("counter");
+			// Resolving the file name.
+			String fileName = keyLink.split(File.separator)[keyLink.split(File.separator).length-1];
+			counter.put("link",fileName);
+			counter.put("value",values.get(keyLink));
 		}
 		return ctx;
 	}

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java	2005-12-03 23:08:40 UTC (rev 1690)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java	2005-12-05 14:17:28 UTC (rev 1691)
@@ -315,6 +315,15 @@
 		return links;
 	}
 	
+	public synchronized Map<String,String> getValuesForPortlet (String projectId) {
+		List<String> links = getProjectLinks(projectId);
+		Map<String,String> values = new Hashtable<String,String>(links.size());
+		for (String link : links) {
+			values.put(link,Long.toString(downloadCounters.get(link).getValue()));
+		}
+		return values;
+	}
+	
 	/**
 	 * Method synchronizes the downloadCounters Map with a main download counters descriptor file.
 	 *