Revision: 28481
http://sourceforge.net/p/bibdesk/svn/28481
Author: hofman
Date: 2023-12-28 23:56:15 +0000 (Thu, 28 Dec 2023)
Log Message:
-----------
Remove some more convenience template parser methods
Modified Paths:
--------------
trunk/bibdesk/BDSKTemplateObjectProxy.m
trunk/bibdesk/BDSKTemplateParser.h
trunk/bibdesk/BDSKTemplateParser.m
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.m
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.m 2023-12-28 23:51:07 UTC (rev
28480)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.m 2023-12-28 23:56:15 UTC (rev
28481)
@@ -168,7 +168,7 @@
[parsedTemplates setObject:parsedTemplate forKey:[pub
pubType]];
}
[pub prepareForTemplateParsing];
- [returnString appendString:[BDSKTemplateParser
stringFromTemplateArray:parsedTemplate usingObject:pub atIndex:++currentIndex]];
+ [returnString appendString:[BDSKTemplateParser
stringFromTemplateArray:parsedTemplate usingObject:pub atIndex:++currentIndex
delegate:nil]];
[pub cleanupAfterTemplateParsing];
[pool release];
}
@@ -192,7 +192,7 @@
[parsedTemplates setObject:parsedTemplate forKey:[pub
pubType]];
}
[pub prepareForTemplateParsing];
- [returnString appendAttributedString:[BDSKTemplateParser
attributedStringFromTemplateArray:parsedTemplate usingObject:pub
atIndex:++currentIndex]];
+ [returnString appendAttributedString:[BDSKTemplateParser
attributedStringFromTemplateArray:parsedTemplate usingObject:pub
atIndex:++currentIndex delegate:nil]];
[pub cleanupAfterTemplateParsing];
[pool release];
}
Modified: trunk/bibdesk/BDSKTemplateParser.h
===================================================================
--- trunk/bibdesk/BDSKTemplateParser.h 2023-12-28 23:51:07 UTC (rev 28480)
+++ trunk/bibdesk/BDSKTemplateParser.h 2023-12-28 23:56:15 UTC (rev 28481)
@@ -65,12 +65,10 @@
+ (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 delegate:(id
<BDSKTemplateParserDelegate>)delegate;
+ (NSArray *)arrayByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString isSubtemplate:(BOOL)isSubtemplate;
-+ (NSAttributedString *)attributedStringFromTemplateArray:(NSArray
*)templateArray usingObject:(id)object atIndex:(NSInteger)anIndex;
+ (NSAttributedString *)attributedStringFromTemplateArray:(NSArray
*)templateArray usingObject:(id)object atIndex:(NSInteger)anIndex delegate:(id
<BDSKTemplateParserDelegate>)delegate;
@end
Modified: trunk/bibdesk/BDSKTemplateParser.m
===================================================================
--- trunk/bibdesk/BDSKTemplateParser.m 2023-12-28 23:51:07 UTC (rev 28480)
+++ trunk/bibdesk/BDSKTemplateParser.m 2023-12-28 23:56:15 UTC (rev 28481)
@@ -474,10 +474,6 @@
return [result autorelease];
}
-+ (NSString *)stringFromTemplateArray:(NSArray *)template
usingObject:(id)object atIndex:(NSInteger)anIndex {
- return [self stringFromTemplateArray:template usingObject:object
atIndex:anIndex delegate:nil];
-}
-
+ (NSString *)stringFromTemplateArray:(NSArray *)template
usingObject:(id)object atIndex:(NSInteger)anIndex delegate:(id
<BDSKTemplateParserDelegate>)delegate {
NSMutableString *result = [[NSMutableString alloc] init];
@@ -730,10 +726,6 @@
return [result autorelease];
}
-+ (NSAttributedString *)attributedStringFromTemplateArray:(NSArray *)template
usingObject:(id)object atIndex:(NSInteger)anIndex {
- return [self attributedStringFromTemplateArray:template usingObject:object
atIndex:anIndex delegate:nil];
-}
-
+ (NSAttributedString *)attributedStringFromTemplateArray:(NSArray *)template
usingObject:(id)object atIndex:(NSInteger)anIndex delegate:(id
<BDSKTemplateParserDelegate>)delegate {
NSMutableAttributedString *result = [[NSMutableAttributedString alloc]
init];
@@ -749,7 +741,7 @@
NSMutableAttributedString *tmpMutAttrStr = [tmpAttrStr
mutableCopy];
for (BDSKAttributeTemplate *linkTemplate in linkTemplates) {
NSRange range = [linkTemplate range];
- id aLink = [self stringFromTemplateArray:[linkTemplate
template] usingObject:object atIndex:anIndex];
+ id aLink = [self stringFromTemplateArray:[linkTemplate
template] usingObject:object atIndex:anIndex delegate:delegate];
if ([[linkTemplate attributeClass]
isSubclassOfClass:[NSURL class]])
aLink = [NSURL
URLWithStringByNormalizingPercentEscapes:aLink];
if (aLink)
@@ -776,7 +768,7 @@
BDSKAttributeTemplate *linkTemplate =
[(BDSKRichValueTemplateTag *)tag linkTemplate];
if (linkTemplate) {
NSMutableDictionary *tmpAttrs = [attrs mutableCopy];
- id aLink = [self stringFromTemplateArray:[linkTemplate
template] usingObject:object atIndex:anIndex];
+ id aLink = [self stringFromTemplateArray:[linkTemplate
template] usingObject:object atIndex:anIndex delegate:delegate];
if ([[linkTemplate attributeClass]
isSubclassOfClass:[NSURL class]])
aLink = [NSURL
URLWithStringByNormalizingPercentEscapes:aLink];
[tmpAttrs setValue:aLink forKey:NSLinkAttributeName];
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
