Author: evenisse
Date: Tue Jan  3 08:17:46 2006
New Revision: 365672

URL: http://svn.apache.org/viewcvs?rev=365672&view=rev
Log:
Add date formatter tag

Added:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java   (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld   (with props)
Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp

Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java?rev=365672&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java Tue Jan  3 08:17:46 2006
@@ -0,0 +1,223 @@
+package org.apache.maven.continuum.web.view.jsp.ui;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.jsp.JspException;
+
+import com.opensymphony.webwork.views.jsp.ui.TextTag;
+import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork.TextProvider;
+import com.opensymphony.xwork.util.OgnlValueStack;
+
+/**
+ * First attempt at creating a date tag for the webwork framework. The tag will
+ * format a date by using either a specified format attribute, or by falling
+ * back on to a globally defined 'webwork.date' property. 
+ * When nice="true" is specified, it will return a human readable string (in 2 hours, 3 minutes).
+ *
+ * From http://jira.opensymphony.com/browse/WW-805
+ * 
+ * @author <a href="mailto:philip.luppens@gmail.com">Philip Luppens</a>
+ */
+public class DateTag extends TextTag {
+	/*
+	 * the name of our property which we will use if the optional format
+	 * parameter is not specified.
+	 */
+	public final static String DATETAG_PROPERTY = "webwork.date";
+
+	public final static String DATETAG_PROPERTY_PAST = "webwork.date.format.past";
+	public final static String DATETAG_DEFAULT_PAST = "{0} ago";
+	public final static String DATETAG_PROPERTY_FUTURE = "webwork.date.format.future";
+	public final static String DATETAG_DEFAULT_FUTURE = "in {0}";
+
+	public final static String DATETAG_PROPERTY_SECONDS = "webwork.date.format.seconds";
+	public final static String DATETAG_DEFAULT_SECONDS = "an instant";
+	public final static String DATETAG_PROPERTY_MINUTES = "webwork.date.format.minutes";
+	public final static String DATETAG_DEFAULT_MINUTES = "{0,choice,1#one minute|1<{0} minutes}";
+	public final static String DATETAG_PROPERTY_HOURS = "webwork.date.format.hours";
+	public final static String DATETAG_DEFAULT_HOURS = "{0,choice,1#one hour|1<{0} hours}{1,choice,0#|1#, one minute|1<, {1} minutes}";
+	public final static String DATETAG_PROPERTY_DAYS = "webwork.date.format.days";
+	public final static String DATETAG_DEFAULT_DAYS = "{0,choice,1#one day|1<{0} days}{1,choice,0#|1#, one hour|1<, {1} hours}";
+	public final static String DATETAG_PROPERTY_YEARS = "webwork.date.format.years";
+	public final static String DATETAG_DEFAULT_YEARS = "{0,choice,1#one year|1<{0} years}{1,choice,0#|1#, one day|1<, {1} days}";
+
+	//our optional format parameter
+	private String format;
+	private String actualName;
+	private String nameAttr;
+	private boolean nice;
+	private Date date;
+	private TextProvider tp;
+
+	public int doEndTag() throws JspException {
+		actualName = (String) findString(nameAttr);
+		String msg = null;
+		OgnlValueStack stack = getStack();
+		//find the name on the valueStack, and cast it to a date
+		try {
+		    Object dateObj = stack.findValue(actualName);
+		    if ( dateObj instanceof Date )
+		    {
+			    date = (Date) dateObj;
+			}
+			else if ( dateObj instanceof Long )
+			{
+			    Calendar cal = Calendar.getInstance();
+			    cal.setTimeInMillis( ( (Long) dateObj).longValue() );
+			    date = cal.getTime();
+			}
+		} catch (ClassCastException e) {
+			throw new JspException("Could not cast the requested object "
+					+ nameAttr + " to a java.util.Date", e);
+		}
+		if (date == null) {
+			throw new JspException("Could not find the requested date "
+					+ nameAttr + " on the stack.");
+		}
+		tp = findProviderInStack();
+		if (tp == null) {
+			throw new JspException(
+					"Could not find a TextProvider on the stack.");
+		}
+		if (nice) {
+			msg = formatTime(date);
+		} else {
+			if (format == null) {
+				String globalFormat = null;
+				//if the format is not specified, fall back using the defined
+				// property DATETAG_PROPERTY
+
+				globalFormat = tp.getText(DATETAG_PROPERTY);
+
+				if (globalFormat != null) {
+					msg = new SimpleDateFormat(globalFormat, ActionContext
+							.getContext().getLocale()).format(date);
+				} else {
+					//fall back using the xwork date format ?
+				}
+			} else {
+				msg = new SimpleDateFormat(format).format(date);
+			}
+		}
+
+		if (msg != null) {
+			try {
+				//if we used the id attribute, we will store the formatted date
+				// in the valuestack, otherwise, we write it to the
+				// outputstream.
+				if (getId() == null) {
+					pageContext.getOut().write(msg);
+				} else {
+					stack.getContext().put(getId(), msg);
+				}
+			} catch (IOException e) {
+				throw new JspException(e);
+			}
+		}
+		return EVAL_PAGE;
+
+	}
+
+	private TextProvider findProviderInStack() {
+		for (Iterator iterator = getStack().getRoot().iterator(); iterator
+				.hasNext();) {
+			Object o = iterator.next();
+
+			if (o instanceof TextProvider) {
+				return (TextProvider) o;
+			}
+
+		}
+		return null;
+
+	}
+
+	public String formatTime(Date date) {
+		StringBuffer sb = new StringBuffer();
+		List args = new ArrayList();
+		long secs = (new Date().getTime() - date.getTime()) / 1000;
+		long mins = secs / 60;
+		int min = (int) mins % 60;
+		long hours = mins / 60;
+		int hour = (int) hours % 24;
+		int days = (int) hours / 24;
+		int day = days % 365;
+		int years = days / 365;
+
+		if (Math.abs(secs) < 60) {
+			args.add(new Long(secs));
+			args.add(sb);
+			args.add(null);
+			sb.append(tp.getText(DATETAG_PROPERTY_SECONDS,
+					DATETAG_DEFAULT_SECONDS, args));
+
+		} else if (hours == 0) {
+			args.add(new Long(min));
+			args.add(sb);
+			args.add(null);
+			sb.append(tp.getText(DATETAG_PROPERTY_MINUTES,
+					DATETAG_DEFAULT_MINUTES, args));
+
+		} else if (days == 0) {
+			args.add(new Long(hour));
+			args.add(new Long(min));
+			args.add(sb);
+			args.add(null);
+			sb.append(tp.getText(DATETAG_PROPERTY_HOURS, DATETAG_DEFAULT_HOURS,
+					args));
+		} else if (years == 0) {
+			args.add(new Long(days));
+			args.add(new Long(hour));
+			args.add(sb);
+			args.add(null);
+			sb.append(tp.getText(DATETAG_PROPERTY_DAYS, DATETAG_DEFAULT_DAYS,
+					args));
+		} else {
+			args.add(new Object[]{new Long(years)});
+			args.add(new Object[]{new Long(day)});
+			args.add(sb);
+			args.add(null);
+
+			sb.append(tp.getText(DATETAG_PROPERTY_YEARS, DATETAG_DEFAULT_YEARS,
+					args));
+		}
+		args.clear();
+		args.add(sb.toString());
+		if (date.before(new Date())) {
+			//looks like this date is passed
+			return tp
+					.getText(DATETAG_PROPERTY_PAST, DATETAG_DEFAULT_PAST, args);
+		} else {
+			return tp.getText(DATETAG_PROPERTY_FUTURE, DATETAG_DEFAULT_FUTURE,
+					args);
+		}
+	}
+	public int doStartTag() throws JspException {
+		return super.doStartTag();
+	}
+
+	public void setName(String name) {
+		this.nameAttr = name;
+	}
+
+	public String getFormat() {
+		return format;
+	}
+	public void setFormat(String format) {
+		this.format = format;
+	}
+
+	public boolean isNice() {
+		return nice;
+	}
+	public void setNice(boolean nice) {
+		this.nice = nice;
+	}
+}

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=365672&r1=365671&r2=365672&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Tue Jan  3 08:17:46 2006
@@ -1,6 +1,8 @@
 // ----------------------------------------------------------------------
 // COMMONS
 // ----------------------------------------------------------------------
+webwork.date=MMM dd, yyyy hh:mm:ss aaa z
+
 message.success = Success
 message.failed = Failed
 message.error = Error

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld?rev=365672&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld Tue Jan  3 08:17:46 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+    <tlibversion>1.1</tlibversion>
+    <jspversion>1.2</jspversion>
+    <shortname>continuum</shortname>
+    <uri>continuum</uri>
+
+	<tag>
+		<name>date</name>
+		<tagclass>org.apache.maven.continuum.web.view.jsp.ui.DateTag</tagclass>
+		<bodycontent>JSP</bodycontent>
+		<info>visitor tag</info>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>false</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>format</name>
+			<required>false</required>
+			<rtexprvalue>false</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>nice</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+</taglib>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=365672&r1=365671&r2=365672&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Tue Jan  3 08:17:46 2006
@@ -84,6 +84,11 @@
   </welcome-file-list>
 
   <taglib>
+    <taglib-uri>continuum</taglib-uri>
+    <taglib-location>/WEB-INF/continuum.tld</taglib-location>
+  </taglib>
+
+  <taglib>
     <taglib-uri>sitemesh-page</taglib-uri>
     <taglib-location>/WEB-INF/sitemesh-page.tld</taglib-location>
   </taglib>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp?rev=365672&r1=365671&r2=365672&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp Tue Jan  3 08:17:46 2006
@@ -1,6 +1,7 @@
 <%@ taglib uri="webwork" prefix="ww" %>
 <%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<%@ taglib prefix="c1" uri="continuum" %>
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
@@ -26,11 +27,11 @@
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
             <tr class="b">
               <th><ww:text name="buildResult.startTime"/></th>
-              <td>TODO<ww:property value="buildResult.startTime"/></td>
+              <td><c1:date name="buildResult.startTime"/></td>
             </tr>
             <tr class="b">
               <th><ww:text name="buildResult.endTime"/></th>
-              <td>TODO<ww:property value="buildResult.endTime"/></td>
+              <td><c1:date name="buildResult.endTime"/></td>
             </tr>
             <tr class="b">
               <th><ww:text name="buildResult.buildTrigger"/></th>