Revision: 22447
http://sourceforge.net/p/bibdesk/svn/22447
Author: hofman
Date: 2018-07-21 20:54:33 +0000 (Sat, 21 Jul 2018)
Log Message:
-----------
No need to keep separate string blue of format. Update format prefs when it has
invalid characters.
Modified Paths:
--------------
trunk/bibdesk/BDSKFormatStringFormatter.h
trunk/bibdesk/BDSKFormatStringFormatter.m
trunk/bibdesk/BibPref_AutoFile.m
trunk/bibdesk/BibPref_CiteKey.m
Modified: trunk/bibdesk/BDSKFormatStringFormatter.h
===================================================================
--- trunk/bibdesk/BDSKFormatStringFormatter.h 2018-07-21 09:43:52 UTC (rev
22446)
+++ trunk/bibdesk/BDSKFormatStringFormatter.h 2018-07-21 20:54:33 UTC (rev
22447)
@@ -41,7 +41,6 @@
@interface BDSKFormatStringFormatter : NSFormatter {
NSString *parseField;
- NSString *string;
NSAttributedString *attributedString;
NSString *formatError;
}
Modified: trunk/bibdesk/BDSKFormatStringFormatter.m
===================================================================
--- trunk/bibdesk/BDSKFormatStringFormatter.m 2018-07-21 09:43:52 UTC (rev
22446)
+++ trunk/bibdesk/BDSKFormatStringFormatter.m 2018-07-21 20:54:33 UTC (rev
22447)
@@ -54,7 +54,6 @@
- (void)dealloc
{
BDSKDESTROY(parseField);
- BDSKDESTROY(string);
BDSKDESTROY(attributedString);
BDSKDESTROY(formatError);
[super dealloc];
@@ -76,13 +75,11 @@
NSAttributedString *attrString = nil;
NSString *errorString = nil;
- if ([obj isEqualToString:string]) {
+ if ([obj isEqualToString:[attributedString string]]) {
attrString = attributedString;
} else {
[BDSKFormatParser validateFormat:&obj attributedFormat:&attrString
forField:parseField error:&errorString];
-
- [string release];
- string = [obj copy];
+
[attributedString release];
attributedString = [attrString retain];
[formatError release];
@@ -104,8 +101,8 @@
return attrString;
}
-- (BOOL)getObjectValue:(id *)obj forString:(NSString *)aString
errorDescription:(NSString **)error{
- *obj = aString;
+- (BOOL)getObjectValue:(id *)obj forString:(NSString *)string
errorDescription:(NSString **)error{
+ *obj = string;
return YES;
}
Modified: trunk/bibdesk/BibPref_AutoFile.m
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.m 2018-07-21 09:43:52 UTC (rev 22446)
+++ trunk/bibdesk/BibPref_AutoFile.m 2018-07-21 20:54:33 UTC (rev 22447)
@@ -158,6 +158,8 @@
[previewTextField setFrame:frame];
}
[[self view] setNeedsDisplay:YES];
+ if ([formatString isEqualToString:[attrFormat string]] == NO)
+ [sud setObject:[attrFormat string] forKey:BDSKLocalFileFormatKey];
} else {
[previewTextField setStringValue:NSLocalizedString(@"Invalid
Format", @"Preview for invalid autogeneration format")];
}
Modified: trunk/bibdesk/BibPref_CiteKey.m
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.m 2018-07-21 09:43:52 UTC (rev 22446)
+++ trunk/bibdesk/BibPref_CiteKey.m 2018-07-21 20:54:33 UTC (rev 22447)
@@ -129,6 +129,8 @@
[citeKeyLine setFrame:frame];
}
[[self view] setNeedsDisplay:YES];
+ if ([citeKeyFormat isEqualToString:[attrFormat string]] == NO)
+ [sud setObject:[attrFormat string] forKey:BDSKCiteKeyFormatKey];
} else {
[citeKeyLine setStringValue:NSLocalizedString(@"Invalid
Format", @"Preview for invalid autogeneration format")];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
