opendev/gerrit
Code Issues Proposed changes

Display time next to change comments

Browse Source 
When the comment was posted yesterday, or any time older than
1 day but less than 1 year ago, display the time too. Display
"May 2 17:37" rather than just "May 2".

Bug: issue 1380
Change-Id: Ia78a20f29a0a812f0864925a094d7e225fc2631a
This commit is contained in:
Shawn O. Pearce
2012-05-09 07:19:53 -07:00
parent 7bf1f93d25
commit 229b2563dc
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
View File

@@ -25,9 +25,10 @@ import java.util.Date;
public class FormatUtil { public class FormatUtil {
private static final long ONE_YEAR = 182L * 24 * 60 * 60 * 1000; private static final long ONE_YEAR = 182L * 24 * 60 * 60 * 1000;
private static DateTimeFormat sTime = DateTimeFormat.getFormat(DateTimeFormat.PredefinedFormat.TIME_SHORT); private static DateTimeFormat sTime;
private static DateTimeFormat sDate = DateTimeFormat.getFormat("MMM d"); private static DateTimeFormat sDate;
private static DateTimeFormat mDate = DateTimeFormat.getFormat(DateTimeFormat.PredefinedFormat.DATE_MEDIUM); private static DateTimeFormat sdtFmt;
private static DateTimeFormat mDate;
private static DateTimeFormat dtfmt; private static DateTimeFormat dtfmt;
public static void setPreferences(AccountGeneralPreferences pref) { public static void setPreferences(AccountGeneralPreferences pref) {
@@ -41,10 +42,12 @@ public class FormatUtil {
} }
String fmt_sTime = pref.getTimeFormat().getFormat(); String fmt_sTime = pref.getTimeFormat().getFormat();
String fmt_sDate = pref.getDateFormat().getShortFormat();
String fmt_mDate = pref.getDateFormat().getLongFormat(); String fmt_mDate = pref.getDateFormat().getLongFormat();
sTime = DateTimeFormat.getFormat(fmt_sTime); sTime = DateTimeFormat.getFormat(fmt_sTime);
sDate = DateTimeFormat.getFormat(pref.getDateFormat().getShortFormat()); sDate = DateTimeFormat.getFormat(fmt_sDate);
sdtFmt = DateTimeFormat.getFormat(fmt_sDate + " " + fmt_sTime);
mDate = DateTimeFormat.getFormat(fmt_mDate); mDate = DateTimeFormat.getFormat(fmt_mDate);
dtfmt = DateTimeFormat.getFormat(fmt_mDate + " " + fmt_sTime); dtfmt = DateTimeFormat.getFormat(fmt_mDate + " " + fmt_sTime);
} }
@@ -75,6 +78,32 @@ public class FormatUtil {
} }
} }
/** Format a date using a really short format. */
public static String shortFormatDayTime(Date dt) {
if (dt == null) {
return "";
}
ensureInited();
final Date now = new Date();
dt = new Date(dt.getTime());
if (mDate.format(now).equals(mDate.format(dt))) {
// Same day as today, report only the time.
//
return sTime.format(dt);
} else if (Math.abs(now.getTime() - dt.getTime()) < ONE_YEAR) {
// Within the last year, show a shorter date.
//
return sdtFmt.format(dt);
} else {
// Report only date and year, its far away from now.
//
return mDate.format(dt);
}
}
/** Format a date using the locale's medium length format. */ /** Format a date using the locale's medium length format. */
public static String mediumFormat(final Date dt) { public static String mediumFormat(final Date dt) {
if (dt == null) { if (dt == null) {

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentPanel.java
View File

@@ -61,7 +61,7 @@ public class CommentPanel extends Composite implements HasDoubleClickHandlers,
setMessageText(message); setMessageText(message);
setAuthorNameText(FormatUtil.name(author)); setAuthorNameText(FormatUtil.name(author));
setDateText(FormatUtil.shortFormat(when)); setDateText(FormatUtil.shortFormatDayTime(when));
final CellFormatter fmt = header.getCellFormatter(); final CellFormatter fmt = header.getCellFormatter();
fmt.getElement(0, 0).setTitle(FormatUtil.nameEmail(author)); fmt.getElement(0, 0).setTitle(FormatUtil.nameEmail(author));