Revision: 15669
http://sourceforge.net/p/skim-app/code/15669
Author: hofman
Date: 2025-08-17 16:15:03 +0000 (Sun, 17 Aug 2025)
Log Message:
-----------
make methods to get string from template array private
Modified Paths:
--------------
trunk/SKTemplateParser.h
trunk/SKTemplateParser.m
Modified: trunk/SKTemplateParser.h
===================================================================
--- trunk/SKTemplateParser.h 2025-08-17 15:34:24 UTC (rev 15668)
+++ trunk/SKTemplateParser.h 2025-08-17 16:15:03 UTC (rev 15669)
@@ -45,12 +45,10 @@
@interface SKTemplateParser : NSObject
+ (NSString *)stringByParsingTemplateString:(NSString *)templateString
usingObject:(id)object;
++ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString usingObject:(id)object;
+
+ (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 *>
*)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 2025-08-17 15:34:24 UTC (rev 15668)
+++ trunk/SKTemplateParser.m 2025-08-17 16:15:03 UTC (rev 15669)
@@ -344,10 +344,6 @@
#pragma mark Parsing string templates
-+ (NSString *)stringByParsingTemplateString:(NSString *)template
usingObject:(id)object {
- return [self stringFromTemplate:[self
templateByParsingTemplateString:template isSubtemplate:NO] usingObject:object
atIndex:0];
-}
-
+ (NSArray *)templateByParsingTemplateString:(NSString *)template
isSubtemplate:(BOOL)isSubtemplate {
NSScanner *scanner = [[NSScanner alloc] initWithString:template];
NSMutableArray *result = [[NSMutableArray alloc] init];
@@ -566,12 +562,12 @@
return result;
}
++ (NSString *)stringByParsingTemplateString:(NSString *)template
usingObject:(id)object {
+ return [self stringFromTemplate:[self
templateByParsingTemplateString:template isSubtemplate:NO] usingObject:object
atIndex:0];
+}
+
#pragma mark Parsing attributed string templates
-+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)template usingObject:(id)object {
- return [self attributedStringFromTemplate:[self
templateByParsingTemplateAttributedString:template isSubtemplate:NO]
usingObject:object atIndex:0];
-}
-
+ (NSArray *)templateByParsingTemplateAttributedString:(NSAttributedString
*)template isSubtemplate:(BOOL)isSubtemplate {
NSString *templateString = [template string];
NSScanner *scanner = [[NSScanner alloc] initWithString:templateString];
@@ -848,6 +844,10 @@
return result;
}
++ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)template usingObject:(id)object {
+ return [self attributedStringFromTemplate:[self
templateByParsingTemplateAttributedString:template isSubtemplate:NO]
usingObject:object atIndex:0];
+}
+
@end
#pragma mark -
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
