summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2015-04-02 21:18:30 (GMT)
committerKevin Smith <git@kismith.co.uk>2015-04-02 21:18:30 (GMT)
commita20ca7ba40d837abe228462be0aba5d32d6831e3 (patch)
tree7d094a2bcd3cbd4eec0aaac010eb8cf69baf46a8 /src
parentba594c6d3192b048737952b248e6ee2b8584ec88 (diff)
downloadstroke-a20ca7ba40d837abe228462be0aba5d32d6831e3.zip
stroke-a20ca7ba40d837abe228462be0aba5d32d6831e3.tar.bz2
Fix copyright header on DateTime
Change-Id: I97fa434712eb32ad2c56558434a09fe5b1e3fb92
Diffstat (limited to 'src')
-rw-r--r--src/com/isode/stroke/base/DateTime.java17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/com/isode/stroke/base/DateTime.java b/src/com/isode/stroke/base/DateTime.java
index 5f22cc3..8a8e31a 100644
--- a/src/com/isode/stroke/base/DateTime.java
+++ b/src/com/isode/stroke/base/DateTime.java
@@ -1,12 +1,7 @@
/*
-* Copyright (c) 2014 Kevin Smith and Remko Tronçon
-* All rights reserved.
-*/
-
-/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
+ * Copyright (c) 2014-2015, Isode Limited, London, England.
+ * All rights reserved.
+ */
package com.isode.stroke.base;
@@ -19,7 +14,7 @@ import java.util.TimeZone;
public class DateTime {
public static Date stringToDate(String date) {
SimpleDateFormat parser = new SimpleDateFormat(format, Locale.US);
- parser.setTimeZone(TimeZone.getTimeZone("UTC"));
+ parser.setTimeZone(TimeZone.getTimeZone("UTC"));
try {
return parser.parse(date);
} catch (ParseException e) {
@@ -29,9 +24,9 @@ public class DateTime {
public static String dateToString(Date date) {
SimpleDateFormat parser = new SimpleDateFormat(format, Locale.US);
- parser.setTimeZone(TimeZone.getTimeZone("UTC"));
+ parser.setTimeZone(TimeZone.getTimeZone("UTC"));
return parser.format(date);
}
-
+
static private String format = "yyyy-MM-dd'T'HH:mm:ss'Z'";
}