Revision: 27945
http://sourceforge.net/p/bibdesk/svn/27945
Author: hofman
Date: 2022-09-27 22:41:26 +0000 (Tue, 27 Sep 2022)
Log Message:
-----------
use options ivar directly instead of copy from accessor
Modified Paths:
--------------
trunk/bibdesk/BDSKServerInfo.m
Modified: trunk/bibdesk/BDSKServerInfo.m
===================================================================
--- trunk/bibdesk/BDSKServerInfo.m 2022-09-27 22:11:36 UTC (rev 27944)
+++ trunk/bibdesk/BDSKServerInfo.m 2022-09-27 22:41:26 UTC (rev 27945)
@@ -166,7 +166,7 @@
[coder encodeObject:database forKey:DATABASE_KEY];
[coder encodeObject:host forKey:HOST_KEY];
[coder encodeObject:port forKey:PORT_KEY];
- [coder encodeObject:[self options] forKey:OPTIONS_KEY];
+ [coder encodeObject:options forKey:OPTIONS_KEY];
}
- (id)copyWithZone:(NSZone *)aZone {
@@ -206,9 +206,9 @@
else if ([self isZoom])
isEqual = isEqualOrBothNil([self host], [other host]) &&
isEqualOrBothNil([self port], [(BDSKServerInfo *)other
port]) &&
- isEqualOrBothEmpty([self options], [(BDSKServerInfo *)other
options]);
+ isEqualOrBothEmpty(options, [(BDSKServerInfo *)other
options]);
else if ([self isISI])
- isEqual = isEqualOrBothEmpty([self options], [(BDSKServerInfo *)other
options]);
+ isEqual = isEqualOrBothEmpty(options, [(BDSKServerInfo *)other
options]);
return isEqual;
}
@@ -220,9 +220,8 @@
hash = prime * hash + [[self port] hash];
}
if ([self isZoom] || [self isISI]) {
- NSDictionary *opts = [self options];
- if ([opts count])
- hash = prime * hash + [opts hash];
+ if ([options count])
+ hash = prime * hash + [options hash];
}
return hash;
}
@@ -377,7 +376,7 @@
[components setPercentEncodedPath:[NSString stringWithFormat:@"/%@;%@",
escapeDatabaseOrName([self database]), escapeDatabaseOrName([self name])]];
if ([self isZoom]) {
NSMutableArray *query = [NSMutableArray array];
- [[self options] enumerateKeysAndObjectsUsingBlock:^(NSString *key,
NSString *value, BOOL *stop){
+ [options enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString
*value, BOOL *stop){
if ([key isEqualToString:@"removeDiacritics"])
value = [self removeDiacritics] ? @"1" : @"0";
else if ([key isEqualToString:@"username"] || [key
isEqualToString:@"password"])
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
