Revision: 29926
http://sourceforge.net/p/bibdesk/svn/29926
Author: hofman
Date: 2025-12-01 15:43:25 +0000 (Mon, 01 Dec 2025)
Log Message:
-----------
userdefault fields don't depend on the type
Modified Paths:
--------------
trunk/bibdesk/BDSKFieldInfo.m
trunk/bibdesk/BDSKTemplateDocument.m
trunk/bibdesk/BDSKTypeManager.h
trunk/bibdesk/BDSKTypeManager.m
trunk/bibdesk/BibItem.m
Modified: trunk/bibdesk/BDSKFieldInfo.m
===================================================================
--- trunk/bibdesk/BDSKFieldInfo.m 2025-12-01 15:38:19 UTC (rev 29925)
+++ trunk/bibdesk/BDSKFieldInfo.m 2025-12-01 15:43:25 UTC (rev 29926)
@@ -73,7 +73,7 @@
}
- (BOOL)isDefaultField {
- return [[[BDSKTypeManager sharedManager] userDefaultFieldsForType:@""]
containsObject:[self name]];
+ return [[[BDSKTypeManager sharedManager] userDefaultFields]
containsObject:[self name]];
}
- (NSInteger)kind {
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2025-12-01 15:38:19 UTC (rev
29925)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2025-12-01 15:43:25 UTC (rev
29926)
@@ -186,7 +186,7 @@
[tmpFonts insertObject:@{@"fontName":@"<None>",
@"displayName":NSLocalizedString(@"Same as body", @"Inerited font message in
popup")} atIndex:0];
tokenFonts = [tmpFonts copy];
- [defaultTokens setArray:[self tokensForFields:[[BDSKTypeManager
sharedManager] userDefaultFieldsForType:nil]]];
+ [defaultTokens setArray:[self tokensForFields:[[BDSKTypeManager
sharedManager] userDefaultFields]]];
[specialTokens setArray:[self tokensForFields:@[BDSKPubTypeString,
BDSKCiteKeyString, BDSKLocalFileString, BDSKRemoteURLString,
BDSKItemNumberString, BDSKRichTextString, BDSKDateAddedString,
BDSKDateModifiedString, BDSKPubDateString]]];
}
return self;
Modified: trunk/bibdesk/BDSKTypeManager.h
===================================================================
--- trunk/bibdesk/BDSKTypeManager.h 2025-12-01 15:38:19 UTC (rev 29925)
+++ trunk/bibdesk/BDSKTypeManager.h 2025-12-01 15:43:25 UTC (rev 29926)
@@ -123,7 +123,7 @@
// BibTeX
- (NSArray<NSString *> *)requiredFieldsForType:(NSString *)type;
- (NSArray<NSString *> *)optionalFieldsForType:(NSString *)type;
-- (NSArray<NSString *> *)userDefaultFieldsForType:(nullable NSString *)type;
+@property (nonatomic, readonly) NSArray<NSString *> *userDefaultFields;
- (NSArray<NSString *> *)regularFieldsForType:(NSString *)type;
@property (nonatomic, readonly) NSArray<NSString *> *types;
Modified: trunk/bibdesk/BDSKTypeManager.m
===================================================================
--- trunk/bibdesk/BDSKTypeManager.m 2025-12-01 15:38:19 UTC (rev 29925)
+++ trunk/bibdesk/BDSKTypeManager.m 2025-12-01 15:43:25 UTC (rev 29926)
@@ -83,6 +83,7 @@
@implementation BDSKTypeManager
@synthesize types, defaultFieldsForTypes, defaultTypes, localFileFieldsSet,
remoteURLFieldsSet, allURLFieldsSet, noteFieldsSet, numericFieldsSet,
titleFieldsSet, containerFieldsSet, personFieldsSet, booleanFieldsSet,
triStateFieldsSet, ratingFieldsSet, integerFieldsSet, citationFieldsSet,
invalidGroupFieldsSet, singleValuedGroupFieldsSet, allFieldsSet,
requiredFieldsForCiteKey, requiredFieldsForLocalFile,
invalidFieldNameCharacterSet=invalidCiteKeyCharSet,
fragileCiteKeyCharacterSet=fragileCiteKeyCharSet;
+@dynamic userDefaultFields;
static BDSKTypeManager *sharedManager = nil;
@@ -293,7 +294,7 @@
return [[fieldsForTypesDict objectForKey:type]
objectForKey:OPTIONAL_KEY] ?: @[];
}
-- (NSArray *)userDefaultFieldsForType:(NSString *)type{
+- (NSArray *)userDefaultFields{
return [[NSUserDefaults standardUserDefaults]
stringArrayForKey:BDSKDefaultFieldsKey];
}
@@ -303,7 +304,7 @@
NSMutableArray *tmpArray = [NSMutableArray array];
[tmpArray addObjectsFromArray:[self requiredFieldsForType:type]];
[tmpArray addObjectsFromArray:[self optionalFieldsForType:type]];
- [tmpArray addNonDuplicateObjectsFromArray:[self
userDefaultFieldsForType:type]];
+ [tmpArray addNonDuplicateObjectsFromArray:[self userDefaultFields]];
array = [tmpArray copy];
[regularFieldsForTypes setObject:array forKey:type];
}
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2025-12-01 15:38:19 UTC (rev 29925)
+++ trunk/bibdesk/BibItem.m 2025-12-01 15:43:25 UTC (rev 29926)
@@ -350,7 +350,7 @@
[keys removeObject:BDSKLocalUrlString];
}
- [keys addObjectsFromArray:[btm userDefaultFieldsForType:[self
pubType]]];
+ [keys addObjectsFromArray:[btm userDefaultFields]];
// @@ remove TeX? case-sensitive?
for (NSString *key in keys) {
@@ -2549,7 +2549,7 @@
}
- (id)defaultFields{
- return [[self fields] fieldsWithNames:[[BDSKTypeManager sharedManager]
userDefaultFieldsForType:[self pubType]]];
+ return [[self fields] fieldsWithNames:[[BDSKTypeManager sharedManager]
userDefaultFields]];
}
- (id)allFields{
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
