Revision: 28479
http://sourceforge.net/p/bibdesk/svn/28479
Author: hofman
Date: 2023-12-28 23:38:27 +0000 (Thu, 28 Dec 2023)
Log Message:
-----------
remove some template convenience methods
Modified Paths:
--------------
trunk/bibdesk/BDSKTemplateObjectProxy.m
trunk/bibdesk/BDSKTemplateParser.h
trunk/bibdesk/BDSKTemplateParser.m
trunk/bibdesk/BDSKTemplateTag.m
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.m
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.m 2023-12-28 23:30:38 UTC (rev
28478)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.m 2023-12-28 23:38:27 UTC (rev
28479)
@@ -154,11 +154,11 @@
parsedTemplate = [parsedTemplates objectForKey:[pub pubType]];
if (parsedTemplate == nil) {
if ([template templateURLForType:[pub pubType]]) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template stringForType:[pub pubType]]];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template stringForType:[pub pubType]]
isSubtemplate:NO];
} else {
parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateDefaultItemString];
if (parsedTemplate == nil) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template
stringForType:BDSKTemplateDefaultItemString]];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template
stringForType:BDSKTemplateDefaultItemString] isSubtemplate:NO];
BDSKPRECONDITION(nil != parsedTemplate);
[parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemString];
}
@@ -181,11 +181,11 @@
parsedTemplate = [parsedTemplates objectForKey:[pub pubType]];
if (parsedTemplate == nil) {
if ([template templateURLForType:[pub pubType]]) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template attributedStringForType:[pub
pubType]]];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template attributedStringForType:[pub
pubType]] isSubtemplate:NO];
} else {
parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateDefaultItemString];
if (parsedTemplate == nil) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template
attributedStringForType:BDSKTemplateDefaultItemString]];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template
attributedStringForType:BDSKTemplateDefaultItemString] isSubtemplate:NO];
[parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemString];
}
}
Modified: trunk/bibdesk/BDSKTemplateParser.h
===================================================================
--- trunk/bibdesk/BDSKTemplateParser.h 2023-12-28 23:30:38 UTC (rev 28478)
+++ trunk/bibdesk/BDSKTemplateParser.h 2023-12-28 23:38:27 UTC (rev 28479)
@@ -65,7 +65,6 @@
+ (NSString *)stringByParsingTemplateString:(NSString *)templateString
usingObject:(id)object;
+ (NSString *)stringByParsingTemplateString:(NSString *)templateString
usingObject:(id)object delegate:(id <BDSKTemplateParserDelegate>)delegate;
-+ (NSArray *)arrayByParsingTemplateString:(NSString *)templateString;
+ (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;
@@ -72,7 +71,6 @@
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString usingObject:(id)object;
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString usingObject:(id)object delegate:(id
<BDSKTemplateParserDelegate>)delegate;
-+ (NSArray *)arrayByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString;
+ (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;
Modified: trunk/bibdesk/BDSKTemplateParser.m
===================================================================
--- trunk/bibdesk/BDSKTemplateParser.m 2023-12-28 23:30:38 UTC (rev 28478)
+++ trunk/bibdesk/BDSKTemplateParser.m 2023-12-28 23:38:27 UTC (rev 28479)
@@ -327,13 +327,9 @@
}
+ (NSString *)stringByParsingTemplateString:(NSString *)template
usingObject:(id)object delegate:(id <BDSKTemplateParserDelegate>)delegate {
- return [self stringFromTemplateArray:[self
arrayByParsingTemplateString:template] usingObject:object atIndex:0
delegate:delegate];
+ return [self stringFromTemplateArray:[self
arrayByParsingTemplateString:template isSubtemplate:NO] usingObject:object
atIndex:0 delegate:delegate];
}
-+ (NSArray *)arrayByParsingTemplateString:(NSString *)template {
- return [self arrayByParsingTemplateString:template isSubtemplate:NO];
-}
-
+ (NSArray *)arrayByParsingTemplateString:(NSString *)template
isSubtemplate:(BOOL)isSubtemplate {
NSScanner *scanner = [[NSScanner alloc] initWithString:template];
NSMutableArray *result = [[NSMutableArray alloc] init];
@@ -576,13 +572,9 @@
}
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)template usingObject:(id)object delegate:(id
<BDSKTemplateParserDelegate>)delegate {
- return [self attributedStringFromTemplateArray:[self
arrayByParsingTemplateAttributedString:template] usingObject:object atIndex:0
delegate:delegate];
+ return [self attributedStringFromTemplateArray:[self
arrayByParsingTemplateAttributedString:template isSubtemplate:NO]
usingObject:object atIndex:0 delegate:delegate];
}
-+ (NSArray *)arrayByParsingTemplateAttributedString:(NSAttributedString
*)template {
- return [self arrayByParsingTemplateAttributedString:template
isSubtemplate:NO];
-}
-
+ (NSArray *)arrayByParsingTemplateAttributedString:(NSAttributedString
*)template isSubtemplate:(BOOL)isSubtemplate {
NSString *templateString = [template string];
NSScanner *scanner = [[NSScanner alloc] initWithString:templateString];
Modified: trunk/bibdesk/BDSKTemplateTag.m
===================================================================
--- trunk/bibdesk/BDSKTemplateTag.m 2023-12-28 23:30:38 UTC (rev 28478)
+++ trunk/bibdesk/BDSKTemplateTag.m 2023-12-28 23:38:27 UTC (rev 28479)
@@ -45,7 +45,7 @@
if ([aLink isKindOfClass:[NSURL class]])
aLink = [[aLink absoluteString] stringByRemovingPercentEncoding];
if ([aLink isKindOfClass:[NSString class]]) {
- NSArray *template = [BDSKTemplateParser
arrayByParsingTemplateString:aLink];
+ NSArray *template = [BDSKTemplateParser
arrayByParsingTemplateString:aLink isSubtemplate:NO];
if ([template count] > 1 || ([template count] == 1 &&
[(BDSKTemplateTag *)[template lastObject] type] != BDSKTemplateTagText))
linkTemplate = [[BDSKAttributeTemplate alloc]
initWithTemplate:template range:range attributeClass:[aLink class]];
}
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
