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 514b725826fd71177b6ce8ee106bef4722e66dae..db0dd73b601a5f8bb2a6879522bd91bc596cf3af 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 6fd730f45b8e4b755127c98afb75da1337cd8119..f298fbe3e9634a3ad60d9788d2443cc2f69240ce 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;