From e57e224734d35b4c6daf1d0d74d1e4e9f67b9429 Mon Sep 17 00:00:00 2001
From: Stuart Lewis <stuart@stuartlewis.com>
Date: Sun, 8 Aug 2010 09:20:34 +0000
Subject: [PATCH] [DS-469] DCDate.displayDate(false,*) displays only year

N.B. Removed reference from 1.6.1 in CHANGES as this looks like it was accidentally added in revision 4958)

git-svn-id: http://scm.dspace.org/svn/repo/dspace/branches/dspace-1_6_x@5245 9c30dcfa-912a-0410-8fc2-9e0234be79fd
---
 .../src/main/java/org/dspace/content/DCDate.java     |  6 +++---
 dspace/CHANGES                                       | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/content/DCDate.java b/dspace-api/src/main/java/org/dspace/content/DCDate.java
index 08628c2a05..9c093a1bcb 100644
--- a/dspace-api/src/main/java/org/dspace/content/DCDate.java
+++ b/dspace-api/src/main/java/org/dspace/content/DCDate.java
@@ -685,9 +685,9 @@ public class DCDate
                                      dd.getHourGMT(), dd.getMinuteGMT(), dd.getSecondGMT());
             }
         }
-        else if (granularity == DateGran.DAY)
+        else if (granularity == DateGran.YEAR)
         {
-            return String.format("%d-%s-%4d", dd.getDay(), monthName, dd.getYear());
+            return String.format("%4d", dd.getYear());
         }
         else if (granularity == DateGran.MONTH)
         {
@@ -695,7 +695,7 @@ public class DCDate
         }
         else
         {
-            return String.format("%4d", dd.getYear());
+            return String.format("%d-%s-%4d", dd.getDay(), monthName, dd.getYear());
         }
     }
 }
diff --git a/dspace/CHANGES b/dspace/CHANGES
index 41a4afcd06..9cc226b42a 100644
--- a/dspace/CHANGES
+++ b/dspace/CHANGES
@@ -1,5 +1,12 @@
+1.6.3
+=====
+
 (Flavio Botelho)
-[DS-563] Multiple spaces in between words in advanced search will make the search return nothing
+ - [DS-563] Multiple spaces in between words in advanced search will make the search return nothing
+
+(Mark Wood)
+ - [DS-469] DCDate.displayDate(false,*) displays only year
+
 
 1.6.2
 =====
@@ -82,9 +89,6 @@
  - [DS-526] ItemUpdate - script update
  - [DS-572] Batch metadata editor fails to notice change of item's owning collection
 
-(Mark Wood)
- - [DS-469] DCDate.displayDate(false,*) displays only year
-
  (Ivan Masar)
  - [DS-515] Czech localization of 1.5.2