Revision: 28480
http://sourceforge.net/p/bibdesk/svn/28480
Author: hofman
Date: 2023-12-28 23:51:07 +0000 (Thu, 28 Dec 2023)
Log Message:
-----------
Remove some more convenience template parser methods, no need to pass template
to delegate method
Modified Paths:
--------------
trunk/bibdesk/BDSKBibDeskProtocol.m
trunk/bibdesk/BDSKTemplateObjectProxy.m
trunk/bibdesk/BDSKTemplateParser.h
trunk/bibdesk/BDSKTemplateParser.m
trunk/bibdesk/BibItem.m
Modified: trunk/bibdesk/BDSKBibDeskProtocol.m
===================================================================
--- trunk/bibdesk/BDSKBibDeskProtocol.m 2023-12-28 23:38:27 UTC (rev 28479)
+++ trunk/bibdesk/BDSKBibDeskProtocol.m 2023-12-28 23:51:07 UTC (rev 28480)
@@ -148,7 +148,7 @@
- (NSData *)HTMLDataUsingTemplateFile:(NSString *)template
usingObject:(id)object {
NSString *templateStringPath = [[NSBundle mainBundle]
pathForResource:template ofType:@"html"];
NSString *templateString = [NSString
stringWithContentsOfFile:templateStringPath encoding:NSUTF8StringEncoding
error:NULL];
- NSString *string = [BDSKTemplateParser
stringByParsingTemplateString:templateString usingObject:object];
+ NSString *string = [BDSKTemplateParser
stringByParsingTemplateString:templateString usingObject:object delegate:nil];
return [string dataUsingEncoding:NSUTF8StringEncoding];
}
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.m
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.m 2023-12-28 23:38:27 UTC (rev
28479)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.m 2023-12-28 23:51:07 UTC (rev
28480)
@@ -207,12 +207,12 @@
- (NSDate *)currentDate{ return [NSDate date]; }
// BDSKTemplateParserDelegate protocol
-- (void)templateParserWillParseTemplate:(id)template usingObject:(id)anObject {
+- (void)templateParserWillParseTemplateUsingObject:(id)anObject {
if ([anObject respondsToSelector:@selector(prepareForTemplateParsing)])
[(BibItem *)anObject prepareForTemplateParsing];
}
-- (void)templateParserDidParseTemplate:(id)template usingObject:(id)anObject {
+- (void)templateParserDidParseTemplateUsingObject:(id)anObject {
if ([anObject respondsToSelector:@selector(cleanupAfterTemplateParsing)])
[(BibItem *)anObject cleanupAfterTemplateParsing];
}
Modified: trunk/bibdesk/BDSKTemplateParser.h
===================================================================
--- trunk/bibdesk/BDSKTemplateParser.h 2023-12-28 23:38:27 UTC (rev 28479)
+++ trunk/bibdesk/BDSKTemplateParser.h 2023-12-28 23:51:07 UTC (rev 28480)
@@ -41,8 +41,8 @@
@protocol BDSKTemplateParserDelegate
-- (void)templateParserWillParseTemplate:(id)template usingObject:(id)object;
-- (void)templateParserDidParseTemplate:(id)template usingObject:(id)object;
+- (void)templateParserWillParseTemplateUsingObject:(id)object;
+- (void)templateParserDidParseTemplateUsingObject:(id)object;
@end
@@ -63,13 +63,11 @@
*/
@interface BDSKTemplateParser : NSObject
-+ (NSString *)stringByParsingTemplateString:(NSString *)templateString
usingObject:(id)object;
+ (NSString *)stringByParsingTemplateString:(NSString *)templateString
usingObject:(id)object delegate:(id <BDSKTemplateParserDelegate>)delegate;
+ (NSArray *)arrayByParsingTemplateString:(NSString *)templateString
isSubtemplate:(BOOL)isSubtemplate;
+ (NSString *)stringFromTemplateArray:(NSArray *)templateArray
usingObject:(id)object atIndex:(NSInteger)anIndex;
+ (NSString *)stringFromTemplateArray:(NSArray *)templateArray
usingObject:(id)object atIndex:(NSInteger)anIndex delegate:(id
<BDSKTemplateParserDelegate>)delegate;
-+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString usingObject:(id)object;
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString usingObject:(id)object delegate:(id
<BDSKTemplateParserDelegate>)delegate;
+ (NSArray *)arrayByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString isSubtemplate:(BOOL)isSubtemplate;
+ (NSAttributedString *)attributedStringFromTemplateArray:(NSArray
*)templateArray usingObject:(id)object atIndex:(NSInteger)anIndex;
Modified: trunk/bibdesk/BDSKTemplateParser.m
===================================================================
--- trunk/bibdesk/BDSKTemplateParser.m 2023-12-28 23:38:27 UTC (rev 28479)
+++ trunk/bibdesk/BDSKTemplateParser.m 2023-12-28 23:51:07 UTC (rev 28480)
@@ -322,10 +322,6 @@
#pragma mark Parsing string templates
-+ (NSString *)stringByParsingTemplateString:(NSString *)template
usingObject:(id)object {
- return [self stringByParsingTemplateString:template usingObject:object
delegate:nil];
-}
-
+ (NSString *)stringByParsingTemplateString:(NSString *)template
usingObject:(id)object delegate:(id <BDSKTemplateParserDelegate>)delegate {
return [self stringFromTemplateArray:[self
arrayByParsingTemplateString:template isSubtemplate:NO] usingObject:object
atIndex:0 delegate:delegate];
}
@@ -513,9 +509,9 @@
if (prevItem) {
if (itemTemplate == nil)
itemTemplate = [[tag itemTemplate]
arrayByAddingObjectsFromArray:[tag separatorTemplate]];
- [delegate
templateParserWillParseTemplate:itemTemplate usingObject:prevItem];
+ [delegate
templateParserWillParseTemplateUsingObject:prevItem];
keyValue = [self
stringFromTemplateArray:itemTemplate usingObject:prevItem atIndex:idx++
delegate:delegate];
- [delegate
templateParserDidParseTemplate:itemTemplate usingObject:prevItem];
+ [delegate
templateParserDidParseTemplateUsingObject:prevItem];
if (keyValue != nil)
[result appendString:keyValue];
}
@@ -527,9 +523,9 @@
}
if (prevItem) {
itemTemplate = [tag itemTemplate];
- [delegate templateParserWillParseTemplate:itemTemplate
usingObject:prevItem];
+ [delegate
templateParserWillParseTemplateUsingObject:prevItem];
keyValue = [self stringFromTemplateArray:itemTemplate
usingObject:prevItem atIndex:idx delegate:delegate];
- [delegate templateParserDidParseTemplate:itemTemplate
usingObject:prevItem];
+ [delegate
templateParserDidParseTemplateUsingObject:prevItem];
if (keyValue != nil)
[result appendString:keyValue];
}
@@ -567,10 +563,6 @@
#pragma mark Parsing attributed string templates
-+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)template usingObject:(id)object {
- return [self attributedStringByParsingTemplateAttributedString:template
usingObject:object delegate:nil];
-}
-
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)template usingObject:(id)object delegate:(id
<BDSKTemplateParserDelegate>)delegate {
return [self attributedStringFromTemplateArray:[self
arrayByParsingTemplateAttributedString:template isSubtemplate:NO]
usingObject:object atIndex:0 delegate:delegate];
}
@@ -809,9 +801,9 @@
if (prevItem) {
if (itemTemplate == nil)
itemTemplate = [[tag itemTemplate]
arrayByAddingObjectsFromArray:[tag separatorTemplate]];
- [delegate
templateParserWillParseTemplate:itemTemplate usingObject:prevItem];
+ [delegate
templateParserWillParseTemplateUsingObject:prevItem];
tmpAttrStr = [self
attributedStringFromTemplateArray:itemTemplate usingObject:prevItem
atIndex:idx++ delegate:delegate];
- [delegate
templateParserDidParseTemplate:itemTemplate usingObject:prevItem];
+ [delegate
templateParserDidParseTemplateUsingObject:prevItem];
if (tmpAttrStr != nil)
[result appendAttributedString:tmpAttrStr];
}
@@ -823,9 +815,9 @@
}
if (prevItem) {
itemTemplate = [tag itemTemplate];
- [delegate templateParserWillParseTemplate:itemTemplate
usingObject:prevItem];
+ [delegate
templateParserWillParseTemplateUsingObject:prevItem];
tmpAttrStr = [self
attributedStringFromTemplateArray:itemTemplate usingObject:prevItem atIndex:idx
delegate:delegate];
- [delegate templateParserDidParseTemplate:itemTemplate
usingObject:prevItem];
+ [delegate
templateParserDidParseTemplateUsingObject:prevItem];
if (tmpAttrStr != nil)
[result appendAttributedString:tmpAttrStr];
}
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2023-12-28 23:38:27 UTC (rev 28479)
+++ trunk/bibdesk/BibItem.m 2023-12-28 23:51:07 UTC (rev 28480)
@@ -2506,7 +2506,7 @@
NSParameterAssert(nil != template);
NSString *string = nil;
[self prepareForTemplateParsing];
- string = [BDSKTemplateParser stringByParsingTemplateString:[template
stringForType:[self pubType]] usingObject:self];
+ string = [BDSKTemplateParser stringByParsingTemplateString:[template
stringForType:[self pubType]] usingObject:self delegate:nil];
[self cleanupAfterTemplateParsing];
return string;
}
@@ -2515,7 +2515,7 @@
NSParameterAssert(nil != template);
NSAttributedString *string = nil;
[self prepareForTemplateParsing];
- string = [BDSKTemplateParser
attributedStringByParsingTemplateAttributedString:[template
attributedStringForType:[self pubType]] usingObject:self];
+ string = [BDSKTemplateParser
attributedStringByParsingTemplateAttributedString:[template
attributedStringForType:[self pubType]] usingObject:self delegate:nil];
[self cleanupAfterTemplateParsing];
return string;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
