From: <ho...@us...> - 2009-11-30 11:16:52
|
Revision: 16218 http://bibdesk.svn.sourceforge.net/bibdesk/?rev=16218&view=rev Author: hofman Date: 2009-11-30 11:16:43 +0000 (Mon, 30 Nov 2009) Log Message: ----------- Create last import group using the class itself. Set web group name in its creation method. Modified Paths: -------------- trunk/bibdesk/BDSKParentGroup.m trunk/bibdesk/BDSKStaticGroup.h trunk/bibdesk/BDSKStaticGroup.m trunk/bibdesk/BDSKWebGroup.m Modified: trunk/bibdesk/BDSKParentGroup.m =================================================================== --- trunk/bibdesk/BDSKParentGroup.m 2009-11-30 11:07:12 UTC (rev 16217) +++ trunk/bibdesk/BDSKParentGroup.m 2009-11-30 11:16:43 UTC (rev 16218) @@ -211,7 +211,7 @@ URLGroupCount = 0; scriptGroupCount = 0; searchGroupCount = 0; - BDSKWebGroup *webGroup = [[BDSKWebGroup alloc] initWithName:NSLocalizedString(@"Web", @"")]; + BDSKWebGroup *webGroup = [[BDSKWebGroup alloc] init]; [self insertChild:webGroup atIndex:0]; [webGroup release]; } @@ -399,7 +399,7 @@ if ([pubs count]) { if (hasLastImportGroup == NO) { hasLastImportGroup = YES; - BDSKStaticGroup *group = [[BDSKStaticGroup alloc] initWithLastImport:pubs]; + BDSKLastImportGroup *group = [[BDSKLastImportGroup alloc] initWithLastImport:pubs]; [self insertChild:group atIndex:0]; [group release]; } else { Modified: trunk/bibdesk/BDSKStaticGroup.h =================================================================== --- trunk/bibdesk/BDSKStaticGroup.h 2009-11-30 11:07:12 UTC (rev 16217) +++ trunk/bibdesk/BDSKStaticGroup.h 2009-11-30 11:16:43 UTC (rev 16218) @@ -56,14 +56,6 @@ - (id)initWithName:(id)aName publications:(NSArray *)array; /*! - @method initForLastImport: - @abstract Initializes and returns a new Last Import group. - @discussion - - @param array The publications for the static group. -*/ -- (id)initWithLastImport:(NSArray *)array; - -/*! @method publications @abstract Returns the publications in the group. @discussion - @@ -116,4 +108,13 @@ @interface BDSKLastImportGroup : BDSKStaticGroup + +/*! + @method initWithLastImport: + @abstract Initializes and returns a new Last Import group. + @discussion - + @param array The publications for the static group. +*/ +- (id)initWithLastImport:(NSArray *)array; + @end Modified: trunk/bibdesk/BDSKStaticGroup.m =================================================================== --- trunk/bibdesk/BDSKStaticGroup.m 2009-11-30 11:07:12 UTC (rev 16217) +++ trunk/bibdesk/BDSKStaticGroup.m 2009-11-30 11:16:43 UTC (rev 16218) @@ -46,20 +46,6 @@ @implementation BDSKStaticGroup -static NSString *BDSKLastImportLocalizedString = nil; - -+ (void)initialize{ - BDSKINITIALIZE; - BDSKLastImportLocalizedString = [NSLocalizedString(@"Last Import", @"Group name for last import") copy]; -} - -- (id)initWithLastImport:(NSArray *)array { - NSZone *zone = [self zone]; - [[super init] release]; - self = [[BDSKLastImportGroup allocWithZone:zone] initWithName:BDSKLastImportLocalizedString publications:array]; - return self; -} - // designated initializer - (id)initWithName:(id)aName publications:(NSArray *)array { if (self = [super initWithName:aName]) { @@ -177,6 +163,18 @@ @implementation BDSKLastImportGroup +static NSString *BDSKLastImportLocalizedString = nil; + ++ (void)initialize{ + BDSKINITIALIZE; + BDSKLastImportLocalizedString = [NSLocalizedString(@"Last Import", @"Group name for last import") copy]; +} + +- (id)initWithLastImport:(NSArray *)array { + self = [self initWithName:BDSKLastImportLocalizedString publications:array]; + return self; +} + - (NSImage *)icon { static NSImage *importGroupImage = nil; if (importGroupImage == nil) { Modified: trunk/bibdesk/BDSKWebGroup.m =================================================================== --- trunk/bibdesk/BDSKWebGroup.m 2009-11-30 11:07:12 UTC (rev 16217) +++ trunk/bibdesk/BDSKWebGroup.m 2009-11-30 11:16:43 UTC (rev 16218) @@ -46,6 +46,19 @@ @implementation BDSKWebGroup +static NSString *BDSKWebLocalizedString = nil; + ++ (void)initialize { + BDSKINITIALIZE; + BDSKWebLocalizedString = [NSLocalizedString(@"Web", @"Group name for web") copy]; +} + +- (id)init { + self = [super initWithName:BDSKWebLocalizedString]; + return self; +} + +// web groups don't initiate loading themselves - (BOOL)shouldRetrievePublications { return NO; } #pragma mark BDSKGroup overrides This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |