added "url" property to iCalEntityObject

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1245 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog
index 1090cb80ba1c666188e8445e727c5aa3e914ae67..82a6137fe415a8fcb663080a3d63172f2847d387 100644 (file)
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-06  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v4.5.72
+
+       * iCalEntityObject.[hm]: added "url" property - unfortunately
+         this was missing before. Increased class version to "1".
+
+       * iCalRepeatableEntityObject.m, iCalEvent.m, iCalToDo.m: adjusted
+         super class version check.
+
 2006-01-16  Helge Hess  <helge.hess@opengroupware.org>
 
        * iCalRecurrenceRule.m: properly include NSString+Ext.h to avoid a

diff --git a/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj b/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj
index d22fe7b52ee32073abae2e9808b3560605c6ae58..82801efd4ff2435d66992ca759b8b76acc2f1298 100644 (file)
--- a/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj
+++ b/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj
@@ -582,7 +582,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.71;
+                               DYLIB_CURRENT_VERSION = 4.5.72;
                                FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\"";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -645,7 +645,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.71;
+                               DYLIB_CURRENT_VERSION = 4.5.72;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -821,7 +821,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.71;
+                               DYLIB_CURRENT_VERSION = 4.5.72;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -864,7 +864,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.71;
+                               DYLIB_CURRENT_VERSION = 4.5.72;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -909,7 +909,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.71;
+                               DYLIB_CURRENT_VERSION = 4.5.72;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -939,7 +939,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.71;
+                               DYLIB_CURRENT_VERSION = 4.5.72;
                                FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\"";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -975,7 +975,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.71;
+                               DYLIB_CURRENT_VERSION = 4.5.72;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -1013,7 +1013,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.71;
+                               DYLIB_CURRENT_VERSION = 4.5.72;
                                FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\"";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version
index fe04776f451e95dbab6a4f0e4533da3b06a6da52..020e1921c28df822dddc98328899035b6d08860c 100644 (file)
--- a/sope-ical/NGiCal/Version
+++ b/sope-ical/NGiCal/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=4
 MINOR_VERSION=5
-SUBMINOR_VERSION:=71
+SUBMINOR_VERSION:=72
 
 # v4.5.40 requires NGExtensions v4.5.145
 # v4.5.37 requires NGExtensions v4.5.140

diff --git a/sope-ical/NGiCal/iCalEntityObject.h b/sope-ical/NGiCal/iCalEntityObject.h
index 42d1dae9b63e2b8f7b160b6c080efe1473e32ee3..5dd2051a6a17724c515a9947b900e53f1d38c7a8 100644 (file)
--- a/sope-ical/NGiCal/iCalEntityObject.h
+++ b/sope-ical/NGiCal/iCalEntityObject.h
@@ -53,6 +53,7 @@
   NSString       *status;
   NSString       *categories;
   NSString       *userComment;
+  NSURL          *url;
 }
 
 /* accessors */
@@ -97,6 +98,10 @@
 - (void)setUserComment:(NSString *)_userComment;
 - (NSString *)userComment;
 
+/* url can either be set as NSString or NSURL */ 
+- (void)setUrl:(id)_value;
+- (NSURL *)url;
+  
 - (void)setOrganizer:(iCalPerson *)_organizer;
 - (iCalPerson *)organizer;
 - (BOOL)isOrganizer:(id)_email;

diff --git a/sope-ical/NGiCal/iCalEntityObject.m b/sope-ical/NGiCal/iCalEntityObject.m
index 5b9950d1f0b631d7d511588d098e445228c553bb..9d3fecbf77ba5b9c40318110ed053ec98be58468 100644 (file)
--- a/sope-ical/NGiCal/iCalEntityObject.m
+++ b/sope-ical/NGiCal/iCalEntityObject.m
@@ -30,7 +30,7 @@
 @implementation iCalEntityObject
 
 + (int)version {
-  return [super version] + 0 /* v0 */;
+  return [super version] + 1 /* v1 */;
 }
 + (void)initialize {
   NSAssert2([super version] == 0,
@@ -55,6 +55,7 @@
   [self->status       release];
   [self->categories   release];
   [self->userComment  release];
+  [self->url          release];
   [super dealloc];
 }
 
@@ -82,6 +83,7 @@
   new->status       = [self->status       copyWithZone:_zone];
   new->categories   = [self->categories   copyWithZone:_zone];
   new->userComment  = [self->userComment  copyWithZone:_zone];
+  new->url          = [self->url          copyWithZone:_zone];
 
   return new;
 }
@@ -265,6 +267,21 @@
   return self->userComment;
 }
 
+- (void)setUrl:(id)_value {
+  if (self->url != _value) {
+    [self->url autorelease];
+    if ([_value isKindOfClass:[NSString class]]) {
+      self->url = [[NSURL alloc] initWithString:_value];
+    }
+    else {
+      self->url = [_value retain];
+    }
+  }
+}
+- (NSURL *)url {
+  return self->url;
+}
+
 /* stuff */
 
 - (NSArray *)participants {

diff --git a/sope-ical/NGiCal/iCalEvent.m b/sope-ical/NGiCal/iCalEvent.m
index 39749a77134139269ba720fcb8e9ce39ad80c487..ba48b0a3aa8f926b6f85868e90ceaaa919ecd146 100644 (file)
--- a/sope-ical/NGiCal/iCalEvent.m
+++ b/sope-ical/NGiCal/iCalEvent.m
@@ -34,10 +34,10 @@
 @implementation iCalEvent
 
 + (int)version {
-  return [super version] + 0 /* v0 */;
+  return [super version] + 0 /* v1 */;
 }
 + (void)initialize {
-  NSAssert2([super version] == 0,
+  NSAssert2([super version] == 1,
             @"invalid superclass (%@) version %i !",
             NSStringFromClass([self superclass]), [super version]);
 }

diff --git a/sope-ical/NGiCal/iCalRepeatableEntityObject.m b/sope-ical/NGiCal/iCalRepeatableEntityObject.m
index b04f28149341c0e17b2513a1f442200e12aca65f..0339dd01e510124d4622757efa45c3add049ff7b 100644 (file)
--- a/sope-ical/NGiCal/iCalRepeatableEntityObject.m
+++ b/sope-ical/NGiCal/iCalRepeatableEntityObject.m
@@ -28,10 +28,10 @@
 @implementation iCalRepeatableEntityObject
 
 + (int)version {
-  return [super version] + 0 /* v0 */;
+  return [super version] + 0 /* v1 */;
 }
 + (void)initialize {
-  NSAssert2([super version] == 0,
+  NSAssert2([super version] == 1,
             @"invalid superclass (%@) version %i !",
             NSStringFromClass([self superclass]), [super version]);
 }

diff --git a/sope-ical/NGiCal/iCalToDo.m b/sope-ical/NGiCal/iCalToDo.m
index dc17e204a295cd847f0dd0d9c35e09915e82ca66..4c8d08af79f398f6de6b1dee8281d21b6b72fbfd 100644 (file)
--- a/sope-ical/NGiCal/iCalToDo.m
+++ b/sope-ical/NGiCal/iCalToDo.m
@@ -26,10 +26,10 @@
 @implementation iCalToDo
 
 + (int)version {
-  return [super version] + 0 /* v0 */;
+  return [super version] + 0 /* v1 */;
 }
 + (void)initialize {
-  NSAssert2([super version] == 0,
+  NSAssert2([super version] == 1,
             @"invalid superclass (%@) version %i !",
             NSStringFromClass([self superclass]), [super version]);
 }