From 80fa19e6d4bfc5f559bd7aa182cc27c367d1f56a Mon Sep 17 00:00:00 2001 From: znek Date: Thu, 6 Apr 2006 17:44:57 +0000 Subject: [PATCH] added "url" property to iCalEntityObject git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1245 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-ical/NGiCal/ChangeLog | 10 ++++++++++ .../NGiCal/NGiCal.xcodeproj/project.pbxproj | 16 ++++++++-------- sope-ical/NGiCal/Version | 2 +- sope-ical/NGiCal/iCalEntityObject.h | 5 +++++ sope-ical/NGiCal/iCalEntityObject.m | 19 ++++++++++++++++++- sope-ical/NGiCal/iCalEvent.m | 4 ++-- sope-ical/NGiCal/iCalRepeatableEntityObject.m | 4 ++-- sope-ical/NGiCal/iCalToDo.m | 4 ++-- 8 files changed, 48 insertions(+), 16 deletions(-) diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog index 1090cb80..82a6137f 100644 --- a/sope-ical/NGiCal/ChangeLog +++ b/sope-ical/NGiCal/ChangeLog @@ -1,3 +1,13 @@ +2006-04-06 Marcus Mueller + + * 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 * 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 d22fe7b5..82801efd 100644 --- 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 fe04776f..020e1921 100644 --- 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 42d1dae9..5dd2051a 100644 --- 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 5b9950d1..9d3fecbf 100644 --- 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 39749a77..ba48b0a3 100644 --- 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 b04f2814..0339dd01 100644 --- 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 dc17e204..4c8d08af 100644 --- 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]); } -- 2.39.2