Author: tyrell
Date: Fri Jan 25 02:44:58 2008
New Revision: 12890
Log:
Restructuring friendly date generation to use java Calendar api. Fixing
MASHUP-586
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/utils/QueryParamUtils.java
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/utils/QueryParamUtils.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/utils/QueryParamUtils.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/utils/QueryParamUtils.java
Fri Jan 25 02:44:58 2008
@@ -17,69 +17,41 @@
import org.wso2.mashup.MashupConstants;
-import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
public class QueryParamUtils {
- private static long ONEMINUTE = 60*1000;
- private static long ONEHOUR = 60*ONEMINUTE;
- private static long ONEDAY = 24*ONEHOUR;
- public static String friendlyDate(java.util.Date date) {
- java.util.Date now = new java.util.Date();
+ private static long ONEMINUTE = 60 * 1000;
+ private static long ONEHOUR = 60 * ONEMINUTE;
+ private static long ONEDAY = 24 * ONEHOUR;
+
+ public static String friendlyDate(java.util.Date dateToParse) {
+ Calendar now = Calendar.getInstance();
+ Calendar date = Calendar.getInstance();
+ date.setTime(dateToParse);
+
String value = "";
- if (now.getTime() - date.getTime() < QueryParamUtils.ONEDAY) {
+ if (now.getTimeInMillis() - date.getTimeInMillis() <
QueryParamUtils.ONEDAY) {
long hours = 0;
- if (now.getTime() - date.getTime() > QueryParamUtils.ONEHOUR) {
- hours = ((now.getTime() - date.getTime()) /
QueryParamUtils.ONEHOUR);
+ if (now.getTimeInMillis() - date.getTimeInMillis() >
QueryParamUtils.ONEHOUR) {
+ hours = ((now.getTimeInMillis() - date.getTimeInMillis()) /
QueryParamUtils
+ .ONEHOUR);
value += hours + "h ";
}
if (hours < 6) {
- long minutes = ((now.getTime() - date.getTime()) /
QueryParamUtils.ONEMINUTE);
- value += (minutes - hours*60) + "m ago";
+ long minutes = ((now.getTimeInMillis() -
date.getTimeInMillis()) / QueryParamUtils
+ .ONEMINUTE);
+ value += (minutes - hours * 60) + "m ago";
}
} else {
- value = date.getDay() + " ";
- switch (date.getMonth()) {
- case 0:
- value += "Jan";
- break;
- case 1:
- value += "Feb";
- break;
- case 2:
- value += "Mar";
- break;
- case 3:
- value += "Apr";
- break;
- case 4:
- value += "May";
- break;
- case 5:
- value += "Jun";
- break;
- case 6:
- value += "Jul";
- break;
- case 7:
- value += "Aug";
- break;
- case 8:
- value += "Sep";
- break;
- case 9:
- value += "Oct";
- break;
- case 10:
- value += "Nov";
- break;
- case 11:
- value += "Dec";
- break;
- }
- if (date.getYear() != now.getYear()) {
- value += " " + date.getYear();
+ SimpleDateFormat formatter = new SimpleDateFormat("dd MMM");
+ value = formatter.format(dateToParse);
+
+ if (date.get(Calendar.YEAR) != now.get(Calendar.YEAR)) {
+ formatter = new SimpleDateFormat("yyyy");
+ value += " " + formatter.format(dateToParse);
}
}
return value;
@@ -115,9 +87,10 @@
if (params[2] != null) {
queryString += "&scope=" + params[2];
}
- queryString += "&activity=" + params[1] + "&period="+ params[3];
+ queryString += "&activity=" + params[1] + "&period=" + params[3];
- } else if (path.equals(MashupConstants.COMMENTS_QUERY_PATH) ||
path.equals(MashupConstants.MY_COMMENTS_QUERY_PATH)) {
+ } else if (path.equals(MashupConstants.COMMENTS_QUERY_PATH) ||
+ path.equals(MashupConstants.MY_COMMENTS_QUERY_PATH)) {
queryString = "query=comments";
if (path.equals(MashupConstants.MY_COMMENTS_QUERY_PATH)) {
queryString += "&scope=" + params[1];
@@ -127,7 +100,8 @@
}
- } else if (path.equals(MashupConstants.CUSTOM_QUERY_PATH) ||
path.equals(MashupConstants.MY_CUSTOM_QUERY_PATH)) {
+ } else if (path.equals(MashupConstants.CUSTOM_QUERY_PATH) ||
+ path.equals(MashupConstants.MY_CUSTOM_QUERY_PATH)) {
queryString = "query=mashups";
if (path.equals(MashupConstants.MY_CUSTOM_QUERY_PATH)) {
queryString += "&scope=" + params[3];
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
