Added timezone to PiwikDate

Author: bcsorba

src/org/piwik/java/PiwikDate.java

@@ -8,21 +8,24 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.TimeZone;
 
 /**
- * A datetime object that will return the datetime in the format {@code yyyy-MM-dd hh:mm:ss }.
+ * A datetime object that will return the datetime in the format {@code yyyy-MM-dd hh:mm:ss}.
  * 
  * @author brettcsorba
  */
 public class PiwikDate extends Date{
-    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+    SimpleDateFormat format;
 
     /**
      * Allocates a Date object and initializes it so that it represents the time
      * at which it was allocated, measured to the nearest millisecond.
      */
     public PiwikDate(){
         super();
+        format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        format.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
     /**
@@ -33,11 +36,23 @@ public PiwikDate(){
      */
     public PiwikDate(long date){
         super(date);
+        format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        format.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
+    
+    /**
+     * Sets the time zone of the String that will be returned by {@link toString()}.
+     * Defaults to UTC.
+     * @param zone the TimeZone to set
+     */
+    public void setTimeZone(TimeZone zone){
+        format.setTimeZone(zone);
+    }
+    
     /**
      * Converts this PiwikDate object to a String of the form:<br>
      * <br>
-     * {@code yyyy-MM-dd hh:mm:ss }.
+     * {@code yyyy-MM-dd hh:mm:ss}.
      * @return a string representation of this PiwikDate
      */
     @Override

test/org/piwik/java/PiwikDateTest.java

@@ -6,6 +6,7 @@
  */
 package org.piwik.java;
 
+import java.util.TimeZone;
 import org.junit.After;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertEquals;
@@ -53,14 +54,19 @@ public void testConstructor1(){
         PiwikDate date = new PiwikDate(1433186085092L);
 
         assertNotNull(date);
+        
+        assertEquals("2015-06-01 07:14:45", date.toString());
     }
+    
     /**
-     * Test of toString method, of class PiwikDate.
+     * Test of setTimeZone method, of class PiwikDate.
      */
     @Test
-    public void testToString(){
+    public void testSetTimeZone(){
         PiwikDate date = new PiwikDate(1433186085092L);
 
+        date.setTimeZone(TimeZone.getTimeZone("America/New_York"));
+        
         assertEquals("2015-06-01 03:14:45", date.toString());
     }