svn commit: r1676048 - in /continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ProjectViewAction.java webapp/WEB-INF/jsp/projectView.jsp

[ba...@apache.org]

Author: batkinson
Date: Sat Apr 25 18:41:18 2015
New Revision: 1676048

URL: http://svn.apache.org/r1676048
Log:
Last result date shown as beginning of epoch when in-progress.

Modified:
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=1676048&r1=1676047&r2=1676048&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Sat Apr 25 18:41:18 2015
@@ -33,17 +33,17 @@ import java.util.Date;
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  */
-@Component( role = com.opensymphony.xwork2.Action.class, hint = "projectView", instantiationStrategy = "per-lookup"  )
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "projectView", instantiationStrategy = "per-lookup" )
 public class ProjectViewAction
     extends ContinuumActionSupport
 {
-    private static final Logger logger = LoggerFactory.getLogger( ProjectViewAction.class );
+    private static final Logger log = LoggerFactory.getLogger( ProjectViewAction.class );
 
     private Project project;
 
-    private int projectId;
+    private BuildResult latestResult;
 
-    private String lastBuildDateTime;
+    private int projectId;
 
     public String execute()
         throws ContinuumException
@@ -60,19 +60,16 @@ public class ProjectViewAction
         }
 
         project = getContinuum().getProjectWithAllDetails( projectId );
-        if ( project.getLatestBuildId() > 0 )
+        int latestResultId = project.getLatestBuildId();
+        if ( latestResultId > 0 )
         {
             try
             {
-                BuildResult lastBuildResult = getContinuum().getBuildResult( project.getLatestBuildId() );
-                if ( lastBuildResult != null )
-                {
-                    this.setLastBuildDateTime( dateFormatter.format( new Date( lastBuildResult.getEndTime() ) ) );
-                }
+                latestResult = getContinuum().getBuildResult( latestResultId );
             }
             catch ( ContinuumException e )
             {
-                logger.info( "buildResult with id " + project.getLatestBuildId() + " has been deleted" );
+                log.debug( "project {} lists non-existent result {} as its latest", projectId, latestResult );
             }
         }
 
@@ -106,13 +103,32 @@ public class ProjectViewAction
         return getContinuum().getProjectGroupByProjectId( projectId );
     }
 
-    public String getLastBuildDateTime()
+    public BuildResult getLatestResult()
     {
-        return lastBuildDateTime;
+        return latestResult;
     }
 
-    public void setLastBuildDateTime( String lastBuildDateTime )
+    /**
+     * Maps the time to an alternative range.
+     *
+     * @param time the time to translate
+     * @return current time in milliseconds if time == 0, otherwise original time value
+     */
+    public long mapZeroTime( long time )
+    {
+        if ( time == 0 )
+            return System.currentTimeMillis();
+        return time;
+    }
+
+    /**
+     * Convenience method for using time values as dates in views.
+     *
+     * @param time the time to convert to a date
+     * @return a {@link Date} created with the specified time
+     */
+    public Date timeToDate( long time )
     {
-        this.lastBuildDateTime = lastBuildDateTime;
+        return new Date( time );
     }
 }

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=1676048&r1=1676047&r2=1676048&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Sat Apr 25 18:41:18 2015
@@ -78,7 +78,7 @@
             </tr>
             <tr class="b">
               <th><label class="label"><s:text name='projectView.project.lastBuildDateTime'/>:</label></th>
-              <td><s:property value="lastBuildDateTime"/></td>
+              <td><s:date name="timeToDate(mapZeroTime(latestResult.endTime))"/></td>
             </tr>
           </table>