From a234bad5f3152ddcefe352efdec11b37f9cea05e Mon Sep 17 00:00:00 2001
From: Stefan Bidigaray <stefanbidi@gmail.com>
Date: Thu, 3 Feb 2011 02:15:16 +0000
Subject: [PATCH] Implemented doesRelativeDateFormatting methods.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31994 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                |  5 +++++
 Source/NSDateFormatter.m | 28 ++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a51147c0..fbae55b6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-02  Stefan Bidigaray <stefanbidi@gmail.com>
+
+	* Source/NSDateFormatter.m: ([-doesRelativeDateFormatting])
+	([-setDoesRelativeDateFormatting:]) Implemented methods.
+
 2011-02-01  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSPointerArray.m: ([-allObjects]) implement missing method.
diff --git a/Source/NSDateFormatter.m b/Source/NSDateFormatter.m
index cb77cf659..8c487d367 100644
--- a/Source/NSDateFormatter.m
+++ b/Source/NSDateFormatter.m
@@ -43,6 +43,8 @@
 
 
 
+// This is defined to be the same as UDAT_RELATIVE
+#define FormatterDoesRelativeDateFormatting (1<<16)
 #define BUFFER_SIZE 1024
 
 @interface NSDateFormatter (PrivateMethods)
@@ -54,18 +56,20 @@
 static inline NSInteger _NSToUDateFormatStyle (NSDateFormatterStyle style)
 {
 #if GS_USE_ICU == 1
+  NSInteger relative =
+    (style & FormatterDoesRelativeDateFormatting) ? UDAT_RELATIVE : 0;
   switch (style)
     {
       case NSDateFormatterNoStyle:
-        return UDAT_NONE;
+        return (relative | UDAT_NONE);
       case NSDateFormatterShortStyle: 
-        return UDAT_SHORT;
+        return (relative | UDAT_SHORT);
       case NSDateFormatterMediumStyle: 
-        return UDAT_MEDIUM;
+        return (relative | UDAT_MEDIUM);
       case NSDateFormatterLongStyle:
-        return UDAT_LONG;
+        return (relative | UDAT_LONG);
       case NSDateFormatterFullStyle: 
-        return UDAT_FULL;
+        return (relative | UDAT_FULL);
     }
 #endif
   return -1;
@@ -257,12 +261,12 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
 
 - (BOOL) generatesCalendarDates
 {
-  return NO;
+  return NO; // FIXME
 }
 
 - (void) setGeneratesCalendarDates: (BOOL) flag
 {
-  return;
+  return; // FIXME
 }
 
 - (BOOL) isLenient
@@ -359,7 +363,7 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
                   range: (inout NSRange *) range
                   error: (out NSError **) error
 {
-  return NO;
+  return NO; // FIXME
 }
 
 - (void) setDateFormat: (NSString *) string
@@ -427,12 +431,12 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
 
 - (NSDate *) defaultDate
 {
-  return nil;
+  return nil;  // FIXME
 }
 
 - (void) setDefaultDate: (NSDate *) date
 {
-  return;
+  return; // FIXME
 }
 
 - (NSLocale *) locale
@@ -888,12 +892,12 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
 
 - (BOOL) doesRelativeDateFormatting
 {
-  return NO;
+  return (_dateStyle & FormatterDoesRelativeDateFormatting) ? YES : NO;
 }
 
 - (void) setDoesRelativeDateFormatting: (BOOL) flag
 {
-  return;
+  _dateStyle |= FormatterDoesRelativeDateFormatting;
 }
 @end