Revision: 14157
http://sourceforge.net/p/skim-app/code/14157
Author: hofman
Date: 2024-03-29 15:45:05 +0000 (Fri, 29 Mar 2024)
Log Message:
-----------
rename template methods
Modified Paths:
--------------
trunk/SKTemplateParser.h
trunk/SKTemplateParser.m
trunk/SKTemplateTag.m
Modified: trunk/SKTemplateParser.h
===================================================================
--- trunk/SKTemplateParser.h 2024-03-29 10:35:17 UTC (rev 14156)
+++ trunk/SKTemplateParser.h 2024-03-29 15:45:05 UTC (rev 14157)
@@ -45,12 +45,12 @@
@interface SKTemplateParser : NSObject
+ (NSString *)stringByParsingTemplateString:(NSString *)templateString
usingObject:(id)object;
-+ (NSArray<__kindof SKTemplateTag *> *)arrayByParsingTemplateString:(NSString
*)templateString isSubtemplate:(BOOL)isSubtemplate;
-+ (NSString *)stringFromTemplateArray:(NSArray<__kindof SKTemplateTag *>
*)templateArray usingObject:(id)object atIndex:(NSInteger)anIndex;
++ (NSArray<__kindof SKTemplateTag *>
*)templateByParsingTemplateString:(NSString *)templateString
isSubtemplate:(BOOL)isSubtemplate;
++ (NSString *)stringFromTemplate:(NSArray<__kindof SKTemplateTag *>
*)templateArray usingObject:(id)object atIndex:(NSInteger)anIndex;
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString usingObject:(id)object;
-+ (NSArray<__kindof SKTemplateTag *>
*)arrayByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString isSubtemplate:(BOOL)isSubtemplate;
-+ (NSAttributedString *)attributedStringFromTemplateArray:(NSArray<__kindof
SKTemplateTag *> *)templateArray usingObject:(id)object
atIndex:(NSInteger)anIndex;
++ (NSArray<__kindof SKTemplateTag *>
*)templateByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString isSubtemplate:(BOOL)isSubtemplate;
++ (NSAttributedString *)attributedStringFromTemplate:(NSArray<__kindof
SKTemplateTag *> *)templateArray usingObject:(id)object
atIndex:(NSInteger)anIndex;
@end
Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m 2024-03-29 10:35:17 UTC (rev 14156)
+++ trunk/SKTemplateParser.m 2024-03-29 15:45:05 UTC (rev 14157)
@@ -345,10 +345,10 @@
#pragma mark Parsing string templates
+ (NSString *)stringByParsingTemplateString:(NSString *)template
usingObject:(id)object {
- return [self stringFromTemplateArray:[self
arrayByParsingTemplateString:template isSubtemplate:NO] usingObject:object
atIndex:0];
+ return [self stringFromTemplate:[self
templateByParsingTemplateString:template isSubtemplate:NO] usingObject:object
atIndex:0];
}
-+ (NSArray *)arrayByParsingTemplateString:(NSString *)template
isSubtemplate:(BOOL)isSubtemplate {
++ (NSArray *)templateByParsingTemplateString:(NSString *)template
isSubtemplate:(BOOL)isSubtemplate {
NSScanner *scanner = [[NSScanner alloc] initWithString:template];
NSMutableArray *result = [[NSMutableArray alloc] init];
__kindof SKTemplateTag *currentTag = nil;
@@ -487,7 +487,7 @@
return result;
}
-+ (NSString *)stringFromTemplateArray:(NSArray *)template
usingObject:(id)object atIndex:(NSInteger)anIndex {
++ (NSString *)stringFromTemplate:(NSArray *)template usingObject:(id)object
atIndex:(NSInteger)anIndex {
NSMutableString *result = [[NSMutableString alloc] init];
for (__kindof SKTemplateTag *tag in template) {
@@ -518,7 +518,7 @@
if (prevItem) {
if (itemTemplate == nil)
itemTemplate = [[tag itemTemplate]
arrayByAddingObjectsFromArray:[tag separatorTemplate]];
- keyValue = [self
stringFromTemplateArray:itemTemplate usingObject:prevItem atIndex:idx++];
+ keyValue = [self stringFromTemplate:itemTemplate
usingObject:prevItem atIndex:idx++];
if (keyValue != nil)
[result appendString:keyValue];
}
@@ -530,7 +530,7 @@
}
if (prevItem) {
itemTemplate = [tag itemTemplate];
- keyValue = [self stringFromTemplateArray:itemTemplate
usingObject:prevItem atIndex:idx];
+ keyValue = [self stringFromTemplate:itemTemplate
usingObject:prevItem atIndex:idx];
if (keyValue != nil)
[result appendString:keyValue];
}
@@ -554,7 +554,7 @@
if (subtemplate == nil && [tag countOfSubtemplates] > count)
subtemplate = [tag objectInSubtemplatesAtIndex:count];
if (subtemplate != nil) {
- if ((keyValue = [self stringFromTemplateArray:subtemplate
usingObject:object atIndex:anIndex]))
+ if ((keyValue = [self stringFromTemplate:subtemplate
usingObject:object atIndex:anIndex]))
[result appendString:keyValue];
}
@@ -569,10 +569,10 @@
#pragma mark Parsing attributed string templates
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)template usingObject:(id)object {
- return [self attributedStringFromTemplateArray:[self
arrayByParsingTemplateAttributedString:template isSubtemplate:NO]
usingObject:object atIndex:0];
+ return [self attributedStringFromTemplate:[self
templateByParsingTemplateAttributedString:template isSubtemplate:NO]
usingObject:object atIndex:0];
}
-+ (NSArray *)arrayByParsingTemplateAttributedString:(NSAttributedString
*)template isSubtemplate:(BOOL)isSubtemplate {
++ (NSArray *)templateByParsingTemplateAttributedString:(NSAttributedString
*)template isSubtemplate:(BOOL)isSubtemplate {
NSString *templateString = [template string];
NSScanner *scanner = [[NSScanner alloc] initWithString:templateString];
NSMutableArray *result = [[NSMutableArray alloc] init];
@@ -729,7 +729,7 @@
}
+ (id)attributeFromTemplate:(SKAttributeTemplate *)attributeTemplate
usingObject:(id)object atIndex:(NSInteger)anIndex {
- id anAttribute = [self stringFromTemplateArray:[attributeTemplate
template] usingObject:object atIndex:anIndex];
+ id anAttribute = [self stringFromTemplate:[attributeTemplate template]
usingObject:object atIndex:anIndex];
if (anAttribute && [[attributeTemplate attributeClass]
isSubclassOfClass:[NSURL class]]) {
anAttribute = [anAttribute
stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet
URLGenericAllowedCharacterSet]];
anAttribute = [NSURL URLWithString:anAttribute];
@@ -737,7 +737,7 @@
return anAttribute;
}
-+ (NSAttributedString *)attributedStringFromTemplateArray:(NSArray *)template
usingObject:(id)object atIndex:(NSInteger)anIndex {
++ (NSAttributedString *)attributedStringFromTemplate:(NSArray *)template
usingObject:(id)object atIndex:(NSInteger)anIndex {
NSMutableAttributedString *result = [[NSMutableAttributedString alloc]
init];
for (__kindof SKTemplateTag *tag in template) {
@@ -798,7 +798,7 @@
if (prevItem) {
if (itemTemplate == nil)
itemTemplate = [[tag itemTemplate]
arrayByAddingObjectsFromArray:[tag separatorTemplate]];
- tmpAttrStr = [self
attributedStringFromTemplateArray:itemTemplate usingObject:prevItem
atIndex:idx++];
+ tmpAttrStr = [self
attributedStringFromTemplate:itemTemplate usingObject:prevItem atIndex:idx++];
if (tmpAttrStr != nil)
[result appendAttributedString:tmpAttrStr];
}
@@ -810,7 +810,7 @@
}
if (prevItem) {
itemTemplate = [tag itemTemplate];
- tmpAttrStr = [self
attributedStringFromTemplateArray:itemTemplate usingObject:prevItem
atIndex:idx];
+ tmpAttrStr = [self
attributedStringFromTemplate:itemTemplate usingObject:prevItem atIndex:idx];
if (tmpAttrStr != nil)
[result appendAttributedString:tmpAttrStr];
}
@@ -835,7 +835,7 @@
if (subtemplate == nil && [tag countOfSubtemplates] > count)
subtemplate = [tag objectInSubtemplatesAtIndex:count];
if (subtemplate != nil) {
- NSAttributedString *tmpAttrStr = [self
attributedStringFromTemplateArray:subtemplate usingObject:object
atIndex:anIndex];
+ NSAttributedString *tmpAttrStr = [self
attributedStringFromTemplate:subtemplate usingObject:object atIndex:anIndex];
if (tmpAttrStr != nil)
[result appendAttributedString:tmpAttrStr];
}
Modified: trunk/SKTemplateTag.m
===================================================================
--- trunk/SKTemplateTag.m 2024-03-29 10:35:17 UTC (rev 14156)
+++ trunk/SKTemplateTag.m 2024-03-29 15:45:05 UTC (rev 14157)
@@ -45,7 +45,7 @@
if ([aLink isKindOfClass:[NSURL class]])
aLink = [[aLink absoluteString] stringByRemovingPercentEncoding];
if ([aLink isKindOfClass:[NSString class]]) {
- NSArray *template = [SKTemplateParser
arrayByParsingTemplateString:aLink isSubtemplate:NO];
+ NSArray *template = [SKTemplateParser
templateByParsingTemplateString:aLink isSubtemplate:NO];
if ([template count] > 1 || ([template count] == 1 && [(SKTemplateTag
*)[template lastObject] type] != SKTemplateTagText))
linkTemplate = [[SKAttributeTemplate alloc]
initWithTemplate:template range:range attributeClass:aClass];
}
@@ -135,13 +135,13 @@
- (NSArray *)itemTemplate {
if (itemTemplate == nil && itemTemplateString)
- itemTemplate = [SKTemplateParser
arrayByParsingTemplateString:itemTemplateString isSubtemplate:YES];
+ itemTemplate = [SKTemplateParser
templateByParsingTemplateString:itemTemplateString isSubtemplate:YES];
return itemTemplate;
}
- (NSArray *)separatorTemplate {
if (separatorTemplate == nil && separatorTemplateString)
- separatorTemplate = [SKTemplateParser
arrayByParsingTemplateString:separatorTemplateString isSubtemplate:YES];
+ separatorTemplate = [SKTemplateParser
templateByParsingTemplateString:separatorTemplateString isSubtemplate:YES];
return separatorTemplate;
}
@@ -168,13 +168,13 @@
- (NSArray *)itemTemplate {
if (itemTemplate == nil && itemTemplateAttributedString)
- itemTemplate = [SKTemplateParser
arrayByParsingTemplateAttributedString:itemTemplateAttributedString
isSubtemplate:YES];
+ itemTemplate = [SKTemplateParser
templateByParsingTemplateAttributedString:itemTemplateAttributedString
isSubtemplate:YES];
return itemTemplate;
}
- (NSArray *)separatorTemplate {
if (separatorTemplate == nil && separatorTemplateAttributedString)
- separatorTemplate = [SKTemplateParser
arrayByParsingTemplateAttributedString:separatorTemplateAttributedString
isSubtemplate:YES];
+ separatorTemplate = [SKTemplateParser
templateByParsingTemplateAttributedString:separatorTemplateAttributedString
isSubtemplate:YES];
return separatorTemplate;
}
@@ -205,7 +205,7 @@
- (NSArray *)objectInSubtemplatesAtIndex:(NSUInteger)anIndex {
id subtemplate = [subtemplates objectAtIndex:anIndex];
if ([subtemplate isKindOfClass:[NSArray class]] == NO) {
- subtemplate = [SKTemplateParser
arrayByParsingTemplateString:subtemplate isSubtemplate:YES];
+ subtemplate = [SKTemplateParser
templateByParsingTemplateString:subtemplate isSubtemplate:YES];
[subtemplates replaceObjectAtIndex:anIndex withObject:subtemplate];
}
return subtemplate;
@@ -220,7 +220,7 @@
- (NSArray *)objectInSubtemplatesAtIndex:(NSUInteger)anIndex {
id subtemplate = [subtemplates objectAtIndex:anIndex];
if ([subtemplate isKindOfClass:[NSArray class]] == NO) {
- subtemplate = [SKTemplateParser
arrayByParsingTemplateAttributedString:subtemplate isSubtemplate:YES];
+ subtemplate = [SKTemplateParser
templateByParsingTemplateAttributedString:subtemplate isSubtemplate:YES];
[subtemplates replaceObjectAtIndex:anIndex withObject:subtemplate];
}
return subtemplate;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
