From 5c725fc7ac069df381900518020ffe310a410f88 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Fri, 10 Jan 2014 20:52:47 +0100
Subject: [PATCH] changed the date formatter a bit
---
.../java/com/xeiam/xchart/internal/chartpart/DateFormatter.java | 2 +-
xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/DateFormatter.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/DateFormatter.java
index 514b7258..db0dd73b 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/DateFormatter.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/DateFormatter.java
@@ -99,7 +99,7 @@ public class DateFormatter {
datePattern = "HH:mm";
}
else if (timeUnit == HOUR_SCALE) {
- datePattern = "dd-HH";
+ datePattern = "HH:mm";
}
else if (timeUnit == DAY_SCALE) {
datePattern = "MM-dd";
diff --git a/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java b/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
index 6fd730f4..f298fbe3 100644
--- a/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
+++ b/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
@@ -91,7 +91,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("13-21"));
+ assertThat(stringValue, equalTo("21:25"));
// week
value = 1358112317000L;
--
GitLab