You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/05/28 17:13:54 UTC
[2/3] git commit: ISIS-413: fix for null LocalDates when rendered.
ISIS-413: fix for null LocalDates when rendered.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/76d5bd62
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/76d5bd62
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/76d5bd62
Branch: refs/heads/master
Commit: 76d5bd62251598b6b8777353f0f0c28acf23de7d
Parents: b2a6e66
Author: Dan Haywood <da...@apache.org>
Authored: Tue May 28 16:11:31 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Tue May 28 16:11:31 2013 +0100
----------------------------------------------------------------------
.../rendering/domainobjects/JsonValueEncoder.java | 25 ++++++++++-----
1 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/76d5bd62/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index c7c85e0..dc59306 100644
--- a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -309,9 +309,14 @@ public final class JsonValueEncoder {
@Override
public void appendValueAndFormat(ObjectAdapter objectAdapter, JsonRepresentation repr) {
- final LocalDate date = (LocalDate) unwrap(objectAdapter);
- final String dateStr = yyyyMMdd.print(date.toDateTimeAtStartOfDay());
- append(repr, dateStr, format, xIsisFormat);
+ final Object obj = unwrap(objectAdapter);
+ if(obj instanceof LocalDate) {
+ final LocalDate date = (LocalDate) obj;
+ final String dateStr = yyyyMMdd.print(date.toDateTimeAtStartOfDay());
+ append(repr, dateStr, format, xIsisFormat);
+ } else {
+ append(repr, obj, format, xIsisFormat);
+ }
}
});
@@ -330,15 +335,19 @@ public final class JsonValueEncoder {
}
return null;
}
-
+
@Override
public void appendValueAndFormat(ObjectAdapter objectAdapter, JsonRepresentation repr) {
- final LocalDateTime date = (LocalDateTime) unwrap(objectAdapter);
- final String dateStr = yyyyMMddHHmmss.print(date.toDateTime());
- append(repr, dateStr, format, xIsisFormat);
+ final Object obj = unwrap(objectAdapter);
+ if(obj instanceof LocalDateTime) {
+ final LocalDateTime date = (LocalDateTime) obj;
+ final String dateStr = yyyyMMddHHmmss.print(date.toDateTime());
+ append(repr, dateStr, format, xIsisFormat);
+ } else {
+ append(repr, obj, format, xIsisFormat);
+ }
}
});
-
}