amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-11 03:15:10 +00:00
Code Issues Projects Releases Wiki Activity

merge of '8284970df75a548f065196f3da7fcd70bc8c47b3'

Browse Source 
and '8b5b324a1c2f984ac4755fedfc3bf7a66169a6af'

Monotone-Parent: 8284970df75a548f065196f3da7fcd70bc8c47b3
Monotone-Parent: 8b5b324a1c2f984ac4755fedfc3bf7a66169a6af
Monotone-Revision: 42650c7e11b236bf9b1b25f7089b591ad1af31aa

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-19T14:44:54
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-19 14:44:54 +00:00
parent b35a2e92cd 7e03b255fe
commit ddbbb02373
10 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/NSDictionary+BSJSONAdditions.h
+1 -1
View File
@@ -28,7 +28,7 @@ extern const int jsonDoNotIndent;
@interface NSDictionary (BSJSONAdditions)
+ (NSDictionary *)dictionaryWithJSONString:(NSString *)jsonString;
+ (NSMutableDictionary *)dictionaryWithJSONString:(NSString *)jsonString;
- (NSString *)jsonStringValue;
@end
SoObjects/SOGo/NSDictionary+BSJSONAdditions.m
+2 -2
View File
@@ -35,10 +35,10 @@ const int jsonDoNotIndent = -1;
@implementation NSDictionary (BSJSONAdditions)
+ (NSDictionary *)dictionaryWithJSONString:(NSString *)jsonString
+ (NSMutableDictionary *)dictionaryWithJSONString:(NSString *)jsonString
{
NSScanner *scanner = [[NSScanner alloc] initWithString:jsonString];
NSDictionary *dictionary = nil;
NSMutableDictionary *dictionary = nil;
[scanner scanJSONObject:&dictionary];
[scanner release];
return dictionary;
SoObjects/SOGo/NSScanner+BSJSONAdditions.h
+1 -1
View File
@@ -45,7 +45,7 @@ extern NSString *jsonNullString;
@interface NSScanner (PrivateBSJSONAdditions)
- (BOOL)scanJSONObject:(NSDictionary **)dictionary;
- (BOOL)scanJSONObject:(NSMutableDictionary **)dictionary;
- (BOOL)scanJSONArray:(NSArray **)array;
- (BOOL)scanJSONString:(NSString **)string;
- (BOOL)scanJSONValue:(id *)value;
SoObjects/SOGo/NSScanner+BSJSONAdditions.m
+1 -1
View File
@@ -48,7 +48,7 @@ NSString *jsonNullString = @"null";
@implementation NSScanner (PrivateBSJSONAdditions)
- (BOOL)scanJSONObject:(NSDictionary **)dictionary
- (BOOL)scanJSONObject:(NSMutableDictionary **)dictionary
{
//[self setCharactersToBeSkipped:nil];
SoObjects/SOGo/NSString+Utilities.h
+2
View File
@@ -65,6 +65,8 @@
// LDIF
- (BOOL) _isLDIFSafe;
- (BOOL) isJSONString;
@end
#endif /* NSSTRING_URL_H */
SoObjects/SOGo/NSString+Utilities.m
+11
View File
@@ -30,6 +30,7 @@
#import <NGExtensions/NGQuotedPrintableCoding.h>
#import "NSArray+Utilities.h"
#import "NSDictionary+BSJSONAdditions.h"
#import "NSDictionary+URL.h"
#import "NSString+Utilities.h"
@@ -422,4 +423,14 @@ static NSMutableCharacterSet *safeLDIFStartChars = nil;
return rc;
}
- (BOOL) isJSONString
{
NSDictionary *jsonData;
#warning this method is a quick and dirty way of detecting the file-format
jsonData = [NSDictionary dictionaryWithJSONString: self];
return (jsonData != nil);
}
@end