[Jboss-svn-commits] JBL Code SVN: r801 - in trunk/forge/jira-extensions: developersinvolvement-report/src/etc/templates/developersinvolvementreport developersinvolvement-report/src/java/pl/net/mamut/jira developersperproject-report/src/java/br/ufrj/jira

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

Author: adamw
Date: 2005-08-10 12:04:40 -0400 (Wed, 10 Aug 2005)
New Revision: 801

Modified:
   trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm
   trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java
   trunk/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java
Log:
NPE fix


Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm
===================================================================
--- trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm	2005-08-10 15:31:21 UTC (rev 800)
+++ trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm	2005-08-10 16:04:40 UTC (rev 801)
@@ -36,7 +36,8 @@
 		<td>$barKey</td> ##$userName.getStatuses()
 		<td height="15"><table border="0" cellspacing="0" cellpadding="0"><tr>
 		#foreach ($row in $bar.getRows())
-			<td width="$row.getStatuses()" bgcolor="$row.getColour()"><img src="/images/border/spacer.gif" height=10 width="$row.getStatuses()" title="$row.getDescription()" border="0"></td>
+			<td width="$row.getStatuses()" bgcolor="$row.getColour()">
+			<img src="/images/border/spacer.gif" height=0 width="$row.getStatuses()" title="$row.getDescription()" border="0"></td>
 		#end
 		</tr></table></td>
 		<td>$topTenSum.get($barKey)</td>
@@ -59,7 +60,8 @@
 	#set($proNum = $sum.get($key) * $GRAPH_MULT)
 	<tr><td>$key</td><td>
 	<table border="0" cellspacing="0" cellpadding="0"><tr>
-	<td width="$proNum" bgcolor="$colours.get($colourIt)"><img src="/images/border/spacer.gif" height=10 width="$proNum" title="$key" border="0"></td>
+	<td width="$proNum" bgcolor="$colours.get($colourIt)">
+	<img src="/images/border/spacer.gif" height=0 width="$proNum" title="$key" border="0"></td>
 	</tr></table>
 	</td><td>$sum.get($key)</td></tr>
 	#end

Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java
===================================================================
--- trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java	2005-08-10 15:31:21 UTC (rev 800)
+++ trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java	2005-08-10 16:04:40 UTC (rev 801)
@@ -304,6 +304,9 @@
 				}
 				
 				if (before != null) {
+					if (after.get("newvalue") == null)
+						continue;
+					
 					user = before.get("newvalue").toString();
 				}
 				else if (after != null) {

Modified: trunk/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java
===================================================================
--- trunk/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java	2005-08-10 15:31:21 UTC (rev 800)
+++ trunk/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java	2005-08-10 16:04:40 UTC (rev 801)
@@ -56,7 +56,7 @@
 			GenericValue changeGroup = (GenericValue)changeGroups.next();
 			String author = changeGroup.getString("author");
 			Timestamp created = changeGroup.getTimestamp("created");
-			System.out.println("created: "+created.toString());
+			//System.out.println("created: "+created.toString());
 			if(created.after(startDate) && created.before(endDate)) {
 				//System.out.println("created = "+changeGroup.get("created")+" object type "+changeGroup.get("created").getClass().getName());
 
@@ -77,18 +77,18 @@
 
     private boolean isSelectedProject(Map params, Long projectId)
     {
-    	System.out.println("ProjectID: "+projectId+" is being compared!");
+    	//System.out.println("ProjectID: "+projectId+" is being compared!");
         try {
         	String[] projectsId = (String [])params.get("projects");
             for(int i = 0; i < projectsId.length; i++ ) {
             	Long l = new Long(projectsId[i]);
-            	System.out.println("ProjectID: trying "+projectsId[i]);
+            	//System.out.println("ProjectID: trying "+projectsId[i]);
             	if(l.equals(projectId));
             		return true;
             }
         } catch (ClassCastException e1) {
         	String projectsId = (String)params.get("projects");
-        	System.out.println("ProjectID: trying a "+projectsId);
+        	//System.out.println("ProjectID: trying a "+projectsId);
         	Long l = new Long(projectsId);
         	if(l.equals(projectId))
         		return true;
@@ -148,7 +148,7 @@
 
 				Iterator issues = project.getRelated("ChildIssue").iterator();
 
-				System.out.println("Processing project "+project.getString("name"));
+				//System.out.println("Processing project "+project.getString("name"));
 				while(issues.hasNext()) {
 					GenericValue issue = (GenericValue)issues.next();
 					HashSet authors = getAuthorsClosedIssue(issue,startDate,realEndDate);