[Jboss-svn-commits] JBL Code SVN: r4615 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: plugins tools

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

Author: wrzep
Date: 2006-06-05 13:12:03 -0400 (Mon, 05 Jun 2006)
New Revision: 4615

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
Log:
JBLAB-599
Improved Last7DaysPlugin
-Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java	2006-06-05 16:08:11 UTC (rev 4614)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java	2006-06-05 17:12:03 UTC (rev 4615)
@@ -70,14 +70,17 @@
 	public long getValue(String projectId) {
 		
 		long currentValue = insidePlugin.getValue(projectId);
-		long prevValue;
+		long prevValue = 0;
+	
+		Calendar now = Calendar.getInstance();
 		
 		Calendar cal = Calendar.getInstance();
 		cal.add(Calendar.DAY_OF_MONTH,-7);
+	
 		
 		try {
 			prevValue = ScoresManagerSync.getValue(
-					insidePlugin.getId(), projectId, cal);
+					insidePlugin.getId(), projectId, cal, now);
 		} catch (GetScoresException e) {
 			return 0;
 		}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java	2006-06-05 16:08:11 UTC (rev 4614)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java	2006-06-05 17:12:03 UTC (rev 4615)
@@ -115,7 +115,7 @@
 			return 0;
 		}
 		
-		float r = ((float) getValue(projectId) / (float) totalScore);
+		float r = (getValue(projectId) / totalScore);
 		
 		return (int) (100.0 * r);
 	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java	2006-06-05 16:08:11 UTC (rev 4614)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java	2006-06-05 17:12:03 UTC (rev 4615)
@@ -71,9 +71,8 @@
 		}
 	}
 
-
-
 	public long getValue(String projectId) {
+		
 		int total = 0;
 		
 		for (String pluginName : plugins.getPluginIds()) {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java	2006-06-05 16:08:11 UTC (rev 4614)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java	2006-06-05 17:12:03 UTC (rev 4615)
@@ -150,6 +150,28 @@
 		
 		return service;
 	}
+
+	public static long getValue(String id, String projectId,
+			Calendar start, Calendar end) throws GetScoresException {
+		
+		long value;
+		Calendar cal = start;
+		
+		for (;;) {
+			
+			if (cal.after(end)) {
+				throw new GetScoresException();
+			}
+			
+			try {
+				value = getValue(id, projectId, cal);
+				return value;
+			} catch (GetScoresException e) {
+				// try next
+				cal.add(Calendar.DAY_OF_MONTH, 1);
+			}	
+		}
+	}
 	
 	/*
 	 * java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory