You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by pw...@apache.org on 2013/02/11 10:53:49 UTC
svn commit: r1444698 [1/4] - in /chemistry/objectivecmis/trunk: ./
ObjectiveCMIS/Bindings/ ObjectiveCMIS/Bindings/AtomPub/
ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/
ObjectiveCMIS/Bindings/AtomPub/Objects/ ObjectiveCMIS/Client/
ObjectiveCMIS/Common/...
Author: pweschmidt
Date: Mon Feb 11 09:53:47 2013
New Revision: 1444698
URL: http://svn.apache.org/r1444698
Log:
merged changes from branch. contains general code cleanup: comments; removal of @synthesize; consistent use of curly brackets
Modified:
chemistry/objectivecmis/trunk/ (props changed)
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBinding.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomCollection.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomLink.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISLinkRelations.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISWorkspace.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBinding.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingFactory.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingFactory.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISDiscoveryService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISNavigationService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISObjectList.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISObjectService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISPropertyDefinition.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISRenditionData.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISRenditionData.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISRepositoryService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISTypeDefinition.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISTypeDefinition.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISVersioningService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISCollection.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISCollection.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFileableObject.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFileableObject.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObjectId.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObjectId.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISOperationContext.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISOperationContext.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRequest.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRequest.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISAllowableActions.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISAllowableActions.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISAuthenticationProvider.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISEnums.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISExtensionData.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISExtensionElement.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISExtensionElement.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISNetworkProvider.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISObjectData.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISProperties.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISProperties.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISRepositoryInfo.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISRepositoryInfo.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISDateUtil.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISDateUtil.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISFileUtil.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISFileUtil.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISObjectConverter.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISStringInOutParameter.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.m
chemistry/objectivecmis/trunk/ObjectiveCMISTests/CMISBaseTest.m
chemistry/objectivecmis/trunk/ObjectiveCMISTests/ObjectiveCMISTests+Environment.m
chemistry/objectivecmis/trunk/ObjectiveCMISTests/ObjectiveCMISTests.m
Propchange: chemistry/objectivecmis/trunk/
------------------------------------------------------------------------------
Merged /chemistry/objectivecmis/branches/mdm:r1437323-1443374,1443377-1444693
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.h Mon Feb 11 09:53:47 2013
@@ -33,11 +33,15 @@
@interface CMISAllowableActionsParser : CMISAtomPubExtensionDataParserBase <NSXMLParserDelegate>
@property (nonatomic, strong) CMISAllowableActions *allowableActions;
-// Designated Initializer
+/// Designated Initializer
- (id)initWithData:(NSData*)atomData;
+
+/**
+ parse method. returns NO if unsuccessful
+ */
- (BOOL)parseAndReturnError:(NSError **)error;
-// Delegates parsing to child parser, ensure that the Element is 'allowableActions'
+/// Delegates parsing to child parser, ensure that the Element is 'allowableActions'
+ (id)allowableActionsParserWithParentDelegate:(id<NSXMLParserDelegate, CMISAllowableActionsParserDelegate>)parentDelegate parser:(NSXMLParser *)parser;
@end
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAllowableActionsParser.m Mon Feb 11 09:53:47 2013
@@ -34,20 +34,13 @@
@implementation CMISAllowableActionsParser
-@synthesize internalAllowableActionsDict = _internalAllowableActionsDict;
-@synthesize parentDelegate = _parentDelegate;
-@synthesize string = _string;
-@synthesize atomData = _atomData;
-@synthesize allowableActions;
-
#pragma mark -
#pragma mark Init/Create methods
- (id)initWithParentDelegate:(id<NSXMLParserDelegate, CMISAllowableActionsParserDelegate>)parentDelegate parser:(NSXMLParser *)parser
{
self = [self initWithData:nil];
- if (self)
- {
+ if (self) {
self.parentDelegate = parentDelegate;
self.internalAllowableActionsDict = [[NSMutableDictionary alloc] init];
@@ -69,8 +62,7 @@
- (id)initWithData:(NSData*)atomData
{
self = [super init];
- if (self)
- {
+ if (self) {
self.atomData = atomData;
}
@@ -88,10 +80,8 @@
parseSuccessful = [parser parse];
- if (!parseSuccessful)
- {
- if (error)
- {
+ if (!parseSuccessful) {
+ if (error) {
*error = [parser parserError];
}
}
@@ -106,23 +96,18 @@
namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName
attributes:(NSDictionary *)attributeDict
{
- if ([namespaceURI isEqualToString:kCMISNamespaceCmis])
- {
+ if ([namespaceURI isEqualToString:kCMISNamespaceCmis]) {
- if ([elementName isEqualToString:kCMISAtomEntryAllowableActions])
- {
+ if ([elementName isEqualToString:kCMISAtomEntryAllowableActions]) {
[self setInternalAllowableActionsDict:[NSMutableDictionary dictionary]];
self.allowableActions = [[CMISAllowableActions alloc] init];
[self pushNewCurrentExtensionData:self.allowableActions];
- }
- else
- {
+ } else {
self.string = [NSMutableString string];
}
}
- else
- {
+ else {
self.childParserDelegate = [CMISAtomPubExtensionElementParser extensionElementParserWithElementName:elementName namespaceUri:namespaceURI
attributes:attributeDict parentDelegate:self parser:parser];
}
@@ -135,19 +120,15 @@
- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
{
- if ([namespaceURI isEqualToString:kCMISNamespaceCmis])
- {
- if ([elementName isEqualToString:kCMISAtomEntryAllowableActions])
- {
+ if ([namespaceURI isEqualToString:kCMISNamespaceCmis]) {
+ if ([elementName isEqualToString:kCMISAtomEntryAllowableActions]) {
// Set the parsed dictionary of allowable actions
[self.allowableActions setAllowableActionsWithDictionary:[self.internalAllowableActionsDict copy]];
// Save the extension data
[self saveCurrentExtensionsAndPushPreviousExtensionData];
- if (self.parentDelegate)
- {
- if ([self.parentDelegate respondsToSelector:@selector(allowableActionsParser:didFinishParsingAllowableActions:)])
- {
+ if (self.parentDelegate) {
+ if ([self.parentDelegate respondsToSelector:@selector(allowableActionsParser:didFinishParsingAllowableActions:)]) {
[self.parentDelegate performSelector:@selector(allowableActionsParser:didFinishParsingAllowableActions:) withObject:self withObject:self.allowableActions];
}
@@ -155,9 +136,7 @@
[parser setDelegate:self.parentDelegate];
self.parentDelegate = nil;
}
- }
- else
- {
+ } else {
[self.internalAllowableActionsDict setObject:self.string forKey:elementName];
}
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.h Mon Feb 11 09:53:47 2013
@@ -33,11 +33,12 @@
@property (nonatomic, strong, readonly) CMISObjectData *objectData;
-// Designated Initializer
+/// Designated Initializer
- (id)initWithData:(NSData *)atomData;
+/// parse method. returns NO if unsuccessful
- (BOOL)parseAndReturnError:(NSError **)error;
-// Initializes a child parser for an Atom Entry and takes over parsing control while parsing the Atom Entry
+/// Initializes a child parser for an Atom Entry and takes over parsing control while parsing the Atom Entry
+ (id)atomEntryParserWithAtomEntryAttributes:(NSDictionary *)attributes parentDelegate:(id<NSXMLParserDelegate, CMISAtomEntryParserDelegate>)parentDelegate parser:(NSXMLParser *)parser;
@end
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m Mon Feb 11 09:53:47 2013
@@ -49,25 +49,12 @@
@implementation CMISAtomEntryParser
-@synthesize objectData = _objectData;
-@synthesize atomData = _atomData;
-@synthesize currentPropertyType = _currentPropertyType;
-@synthesize currentPropertyData = _currentPropertyData;
-@synthesize propertyValues = _propertyValues;
-@synthesize currentObjectProperties = _currentObjectProperties;
-@synthesize currentLinkRelations = _currentLinkRelations;
-@synthesize parentDelegate = _parentDelegate;
-@synthesize entryAttributesDict = _entryAttributesDict;
-@synthesize currentRendition = _currentRendition;
-@synthesize currentRenditions = _currentRenditions;
-@synthesize string = _string;
// Designated Initializer
- (id)init
{
self = [super init];
- if (self)
- {
+ if (self) {
self.currentLinkRelations = [NSMutableSet set];
}
return self;
@@ -76,8 +63,7 @@
- (id)initWithData:(NSData *)atomData
{
self = [self init];
- if (self)
- {
+ if (self) {
self.atomData = atomData;
}
@@ -98,10 +84,8 @@
parseSuccessful = [parser parse];
- if (!parseSuccessful)
- {
- if (error)
- {
+ if (!parseSuccessful){
+ if (error) {
*error = [parser parserError];
}
}
@@ -112,8 +96,7 @@
- (id)initWithAtomEntryAttributes:(NSDictionary *)attributes parentDelegate:(id<NSXMLParserDelegate, CMISAtomEntryParserDelegate>)parentDelegate parser:(NSXMLParser *)parser
{
self = [self init];
- if (self)
- {
+ if (self) {
self.objectData = [[CMISObjectData alloc] init];
self.entryAttributesDict = attributes;
self.parentDelegate = parentDelegate;
@@ -137,8 +120,7 @@
- (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI
qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
{
- if ([namespaceURI isEqualToString:kCMISNamespaceCmis])
- {
+ if ([namespaceURI isEqualToString:kCMISNamespaceCmis]) {
if ([elementName isEqualToString:kCMISAtomEntryPropertyId] ||
[elementName isEqualToString:kCMISAtomEntryPropertyString] ||
[elementName isEqualToString:kCMISAtomEntryPropertyInteger] ||
@@ -146,8 +128,7 @@
[elementName isEqualToString:kCMISAtomEntryPropertyBoolean] ||
[elementName isEqualToString:kCMISAtomEntryPropertyUri] ||
[elementName isEqualToString:kCMISAtomEntryPropertyHtml] ||
- [elementName isEqualToString:kCMISAtomEntryPropertyDecimal])
- {
+ [elementName isEqualToString:kCMISAtomEntryPropertyDecimal]) {
self.propertyValues = [NSMutableArray array];
// store attribute values in CMISPropertyData object
self.currentPropertyType = elementName;
@@ -155,57 +136,38 @@
self.currentPropertyData.identifier = [attributeDict objectForKey:kCMISAtomEntryPropertyDefId];
self.currentPropertyData.queryName = [attributeDict objectForKey:kCMISAtomEntryQueryName];
self.currentPropertyData.displayName = [attributeDict objectForKey:kCMISAtomEntryDisplayName];
- }
- else if ([elementName isEqualToString:kCMISCoreProperties])
- {
+ } else if ([elementName isEqualToString:kCMISCoreProperties]) {
// create the CMISProperties object to hold all property data
self.currentObjectProperties = [[CMISProperties alloc] init];
// Set ObjectProperties as the current extensionData object
[self pushNewCurrentExtensionData:self.currentObjectProperties];
- }
- else if ([elementName isEqualToString:kCMISCoreRendition])
- {
+ } else if ([elementName isEqualToString:kCMISCoreRendition]) {
self.currentRendition = [[CMISRenditionData alloc] init];
- }
- else if ([elementName isEqualToString:kCMISAtomEntryAllowableActions])
- {
+ } else if ([elementName isEqualToString:kCMISAtomEntryAllowableActions]) {
// Delegate parsing to child parser for allowableActions element
self.childParserDelegate = [CMISAllowableActionsParser allowableActionsParserWithParentDelegate:self parser:parser];
}
- }
- else if ([namespaceURI isEqualToString:kCMISNamespaceCmisRestAtom])
- {
- if ([elementName isEqualToString:kCMISAtomEntryObject])
- {
+ } else if ([namespaceURI isEqualToString:kCMISNamespaceCmisRestAtom]) {
+ if ([elementName isEqualToString:kCMISAtomEntryObject]) {
// Set object data as the current extensionData object
[self pushNewCurrentExtensionData:self.objectData];
}
- }
- else if ([namespaceURI isEqualToString:kCMISNamespaceAtom])
- {
- if ([elementName isEqualToString:kCMISAtomEntryLink])
- {
+ } else if ([namespaceURI isEqualToString:kCMISNamespaceAtom]) {
+ if ([elementName isEqualToString:kCMISAtomEntryLink]) {
NSString *linkType = [attributeDict objectForKey:kCMISAtomEntryType];
NSString *rel = [attributeDict objectForKey:kCMISAtomEntryRel];
NSString *href = [attributeDict objectForKey:kCMISAtomEntryHref];
CMISAtomLink *link = [[CMISAtomLink alloc] initWithRelation:rel type:linkType href:href];
[self.currentLinkRelations addObject:link];
- }
- else if ([elementName isEqualToString:kCMISAtomEntryContent])
- {
+ } else if ([elementName isEqualToString:kCMISAtomEntryContent]) {
self.objectData.contentUrl = [NSURL URLWithString:[attributeDict objectForKey:kCMISAtomEntrySrc]];
}
- }
- else if ([namespaceURI isEqualToString:kCMISNamespaceApp])
- {
+ } else if ([namespaceURI isEqualToString:kCMISNamespaceApp]) {
// Nothing to do in this namespace
- }
- else
- {
- if (self.currentExtensionData != nil)
- {
+ } else {
+ if (self.currentExtensionData != nil) {
self.childParserDelegate = [CMISAtomPubExtensionElementParser extensionElementParserWithElementName:elementName namespaceUri:namespaceURI
attributes:attributeDict parentDelegate:self parser:parser];
}
@@ -223,48 +185,29 @@
- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
{
- if ([elementName isEqualToString:kCMISAtomEntryValue])
- {
+ if ([elementName isEqualToString:kCMISAtomEntryValue]) {
[CMISAtomParserUtil parsePropertyValue:self.string withPropertyType:self.currentPropertyType addToArray:self.propertyValues];
- }
- else if (self.currentRendition != nil)
- {
- if ([elementName isEqualToString:kCMISCoreStreamId])
- {
+ } else if (self.currentRendition != nil) {
+ if ([elementName isEqualToString:kCMISCoreStreamId]) {
self.currentRendition.streamId = self.string;
- }
- else if ([elementName isEqualToString:kCMISCoreMimetype])
- {
+ } else if ([elementName isEqualToString:kCMISCoreMimetype]) {
self.currentRendition.mimeType = self.string;
- }
- else if ([elementName isEqualToString:kCMISCoreLength])
- {
+ } else if ([elementName isEqualToString:kCMISCoreLength]) {
self.currentRendition.length = [NSNumber numberWithInteger:[self.string integerValue]];
- }
- else if ([elementName isEqualToString:kCMISCoreTitle])
- {
+ } else if ([elementName isEqualToString:kCMISCoreTitle]) {
self.currentRendition.title = self.string;
- }
- else if ([elementName isEqualToString:kCMISCoreKind])
- {
+ } else if ([elementName isEqualToString:kCMISCoreKind]) {
self.currentRendition.kind = self.string;
- }
- else if ([elementName isEqualToString:kCMISCoreHeight])
- {
+ } else if ([elementName isEqualToString:kCMISCoreHeight]) {
self.currentRendition.height = [NSNumber numberWithInteger:[self.string integerValue]];
- }
- else if ([elementName isEqualToString:kCMISCoreWidth])
- {
+ } else if ([elementName isEqualToString:kCMISCoreWidth]) {
self.currentRendition.width = [NSNumber numberWithInteger:[self.string integerValue]];
- }
- else if ([elementName isEqualToString:kCMISCoreRenditionDocumentId])
- {
+ } else if ([elementName isEqualToString:kCMISCoreRenditionDocumentId]) {
self.currentRendition.renditionDocumentId = self.string;
}
}
- if ([namespaceURI isEqualToString:kCMISNamespaceCmis])
- {
+ if ([namespaceURI isEqualToString:kCMISNamespaceCmis]) {
if ([elementName isEqualToString:kCMISAtomEntryPropertyId] ||
[elementName isEqualToString:kCMISAtomEntryPropertyString] ||
[elementName isEqualToString:kCMISAtomEntryPropertyInteger] ||
@@ -272,33 +215,24 @@
[elementName isEqualToString:kCMISAtomEntryPropertyBoolean] ||
[elementName isEqualToString:kCMISAtomEntryPropertyUri] ||
[elementName isEqualToString:kCMISAtomEntryPropertyHtml] ||
- [elementName isEqualToString:kCMISAtomEntryPropertyDecimal])
- {
+ [elementName isEqualToString:kCMISAtomEntryPropertyDecimal]) {
// add the property to the properties dictionary
self.currentPropertyData.values = self.propertyValues;
self.propertyValues = nil;
[self.currentObjectProperties addProperty:self.currentPropertyData];
self.currentPropertyData = nil;
- }
- else if ([elementName isEqualToString:kCMISCoreProperties])
- {
+ } else if ([elementName isEqualToString:kCMISCoreProperties]) {
// Finished parsing Properties & its ExtensionData
[self saveCurrentExtensionsAndPushPreviousExtensionData];
- }
- else if ([elementName isEqualToString:kCMISCoreRendition])
- {
- if (self.currentRenditions == nil)
- {
+ } else if ([elementName isEqualToString:kCMISCoreRendition]) {
+ if (self.currentRenditions == nil) {
self.currentRenditions = [[NSMutableArray alloc] init];
}
[self.currentRenditions addObject:self.currentRendition];
self.currentRendition = nil;
}
- }
- else if ([namespaceURI isEqualToString:kCMISNamespaceAtom])
- {
- if ( [elementName isEqualToString:kCMISAtomEntry])
- {
+ } else if ([namespaceURI isEqualToString:kCMISNamespaceAtom]) {
+ if ( [elementName isEqualToString:kCMISAtomEntry]) {
// set the properties on the objectData object
self.objectData.properties = self.currentObjectProperties;
@@ -315,12 +249,9 @@
// set the objectData baseType
CMISPropertyData *baseTypeProperty = [self.currentObjectProperties.propertiesDictionary objectForKey:kCMISPropertyBaseTypeId];
NSString *baseType = [baseTypeProperty firstValue];
- if ([baseType isEqualToString:kCMISPropertyObjectTypeIdValueDocument])
- {
+ if ([baseType isEqualToString:kCMISPropertyObjectTypeIdValueDocument]) {
self.objectData.baseType = CMISBaseTypeDocument;
- }
- else if ([baseType isEqualToString:kCMISPropertyObjectTypeIdValueFolder])
- {
+ } else if ([baseType isEqualToString:kCMISPropertyObjectTypeIdValueFolder]) {
self.objectData.baseType = CMISBaseTypeFolder;
}
@@ -329,10 +260,8 @@
self.currentObjectProperties = nil;
- if (self.parentDelegate)
- {
- if ([self.parentDelegate respondsToSelector:@selector(cmisAtomEntryParser:didFinishParsingCMISObjectData:)])
- {
+ if (self.parentDelegate) {
+ if ([self.parentDelegate respondsToSelector:@selector(cmisAtomEntryParser:didFinishParsingCMISObjectData:)]) {
// Message the parent delegate the parsed ObjectData
[self.parentDelegate performSelector:@selector(cmisAtomEntryParser:didFinishParsingCMISObjectData:)
withObject:self withObject:self.objectData];
@@ -343,13 +272,9 @@
self.parentDelegate = nil;
}
}
- }
- else if ([namespaceURI isEqualToString:kCMISNamespaceApp])
- {
+ } else if ([namespaceURI isEqualToString:kCMISNamespaceApp]) {
// Nothing to do in this namespace
- }
- else
- {
+ } else {
// TODO other namespaces?
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.h Mon Feb 11 09:53:47 2013
@@ -41,7 +41,9 @@
*/
@property (readonly) NSInteger numItems;
+/// designated initialiser
- (id)initWithData:(NSData*)feedData;
+/// parses the atom XML data. returns NO if unsuccessful
- (BOOL)parseAndReturnError:(NSError **)error;
@end
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomFeedParser.m Mon Feb 11 09:53:47 2013
@@ -31,18 +31,11 @@
@implementation CMISAtomFeedParser
-@synthesize feedData = _feedData;
-@synthesize internalEntries = _internalEntries;
-@synthesize numItems = _numItems;
-@synthesize feedLinkRelations = _feedLinkRelations;
-@synthesize childParserDelegate = _childParserDelegate;
-@synthesize string = _string;
- (id)initWithData:(NSData*)feedData
{
self = [super init];
- if (self)
- {
+ if (self) {
self.feedData = feedData;
self.feedLinkRelations = [NSMutableSet set];
}
@@ -52,12 +45,9 @@
- (NSArray *)entries
{
- if (self.internalEntries != nil)
- {
+ if (self.internalEntries != nil) {
return [NSArray arrayWithArray:self.internalEntries];
- }
- else
- {
+ } else {
return nil;
}
}
@@ -80,10 +70,8 @@
[parser setDelegate:self];
parseSuccessful = [parser parse];
- if (!parseSuccessful)
- {
- if (error)
- {
+ if (!parseSuccessful) {
+ if (error) {
*error = [parser parserError];
}
}
@@ -96,13 +84,10 @@
- (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
{
- if ([elementName isEqualToString:kCMISAtomEntry])
- {
+ if ([elementName isEqualToString:kCMISAtomEntry]) {
// Delegate parsing of AtomEntry element to the entry child parser
self.childParserDelegate = [CMISAtomEntryParser atomEntryParserWithAtomEntryAttributes:attributeDict parentDelegate:self parser:parser];
- }
- else if ([elementName isEqualToString:kCMISAtomEntryLink])
- {
+ } else if ([elementName isEqualToString:kCMISAtomEntryLink]) {
CMISAtomLink *link = [[CMISAtomLink alloc] init];
[link setValuesForKeysWithDictionary:attributeDict];
[self.feedLinkRelations addObject:link];
@@ -119,8 +104,7 @@
- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
{
- if ([elementName isEqualToString:kCMISAtomFeedNumItems])
- {
+ if ([elementName isEqualToString:kCMISAtomFeedNumItems]) {
self.numItems = [self.string integerValue];
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h Mon Feb 11 09:53:47 2013
@@ -27,8 +27,14 @@
@interface CMISAtomParserUtil : NSObject
+/**
+ * converts an atomPubType to a CMISPropertyType object
+ */
+ (CMISPropertyType)atomPubTypeToInternalType:(NSString *)atomPubType;
+/**
+ * parses the property value and adds it to an array
+ */
+ (void)parsePropertyValue:(NSString *)stringValue withPropertyType:(NSString *)propertyType addToArray:(NSMutableArray*)array;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m Mon Feb 11 09:53:47 2013
@@ -29,40 +29,23 @@
+ (CMISPropertyType)atomPubTypeToInternalType:(NSString *)atomPubType
{
- if([atomPubType isEqualToString:kCMISAtomEntryPropertyId])
- {
+ if([atomPubType isEqualToString:kCMISAtomEntryPropertyId]) {
return CMISPropertyTypeId;
- }
- else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyString])
- {
+ } else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyString]) {
return CMISPropertyTypeString;
- }
- else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyInteger])
- {
+ } else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyInteger]) {
return CMISPropertyTypeInteger;
- }
- else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyBoolean])
- {
+ } else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyBoolean]) {
return CMISPropertyTypeBoolean;
- }
- else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyDateTime])
- {
+ } else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyDateTime]) {
return CMISPropertyTypeDateTime;
- }
- else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyDecimal])
- {
+ } else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyDecimal]) {
return CMISPropertyTypeDecimal;
- }
- else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyHtml])
- {
+ } else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyHtml]) {
return CMISPropertyTypeHtml;
- }
- else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyUri])
- {
+ } else if ([atomPubType isEqualToString:kCMISAtomEntryPropertyUri]) {
return CMISPropertyTypeUri;
- }
- else
- {
+ } else {
log(@"Unknow property type %@. Go tell a developer to fix this.", atomPubType);
return CMISPropertyTypeString;
}
@@ -72,32 +55,19 @@
{
if ([propertyType isEqualToString:kCMISAtomEntryPropertyString] ||
[propertyType isEqualToString:kCMISAtomEntryPropertyId] ||
- [propertyType isEqualToString:kCMISAtomEntryPropertyHtml])
- {
+ [propertyType isEqualToString:kCMISAtomEntryPropertyHtml]) {
[array addObject:stringValue];
- }
- else if ([propertyType isEqualToString:kCMISAtomEntryPropertyInteger])
- {
+ } else if ([propertyType isEqualToString:kCMISAtomEntryPropertyInteger]) {
[array addObject:[NSNumber numberWithInt:[stringValue intValue]]];
- }
- else if ([propertyType isEqualToString:kCMISAtomEntryPropertyBoolean])
- {
+ } else if ([propertyType isEqualToString:kCMISAtomEntryPropertyBoolean]) {
[array addObject:[NSNumber numberWithBool:[stringValue isEqualToString:kCMISAtomEntryValueTrue]]];
- }
- else if ([propertyType isEqualToString:kCMISAtomEntryPropertyDateTime])
- {
+ } else if ([propertyType isEqualToString:kCMISAtomEntryPropertyDateTime]) {
[array addObject:[CMISDateUtil dateFromString:stringValue]];
- }
- else if ([propertyType isEqualToString:kCMISAtomEntryPropertyDecimal])
- {
+ } else if ([propertyType isEqualToString:kCMISAtomEntryPropertyDecimal]) {
[array addObject:[NSDecimalNumber decimalNumberWithString:stringValue]];
- }
- else if ([propertyType isEqualToString:kCMISAtomEntryPropertyUri])
- {
+ } else if ([propertyType isEqualToString:kCMISAtomEntryPropertyUri]) {
[array addObject:[NSURL URLWithString:stringValue]];
- }
- else
- {
+ } else {
log(@"Unknow property type %@. Go tell a developer to fix this.", propertyType);
}
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.h Mon Feb 11 09:53:47 2013
@@ -30,9 +30,11 @@
- (id)init;
-// Saves the current extensionData and extensions state and sets the messaged object as the new current extensionData object
+/// Saves the current extensionData and extensions state and sets the messaged object as the new current extensionData object
+
- (void)pushNewCurrentExtensionData:(CMISExtensionData *)extensionDataObject;
-// Saves the current extensions on the extensionData object and makes the previous extensionData and extensions the current objects
+
+/// Saves the current extensions on the extensionData object and makes the previous extensionData and extensions the current objects
- (void)saveCurrentExtensionsAndPushPreviousExtensionData;
@end
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionDataParserBase.m Mon Feb 11 09:53:47 2013
@@ -21,10 +21,6 @@
@implementation CMISAtomPubExtensionDataParserBase
-@synthesize childParserDelegate = _childParserDelegate;
-@synthesize currentExtensions = _currentExtensions;
-@synthesize currentExtensionData = _currentExtensionData;
-@synthesize previousExtensionDataArray = _previousExtensionDataArray;
#pragma mark -
#pragma mark Initializers
@@ -33,8 +29,7 @@
- (id)init
{
self = [super init];
- if (self)
- {
+ if (self) {
self.previousExtensionDataArray = [NSMutableArray array];
}
return self;
@@ -46,10 +41,8 @@
- (void)pushNewCurrentExtensionData:(CMISExtensionData *)extensionDataObject
{
// Save the current state of the extensionData objects used for parsing
- if (self.currentExtensionData)
- {
- if (self.currentExtensions)
- {
+ if (self.currentExtensionData) {
+ if (self.currentExtensions) {
self.currentExtensionData.extensions = [self.currentExtensions copy];
}
@@ -73,8 +66,7 @@
self.currentExtensions = [self.currentExtensionData.extensions mutableCopy];
// if previous actually existed, remove last object
- if (self.currentExtensionData)
- {
+ if (self.currentExtensionData) {
[self.previousExtensionDataArray removeLastObject];
}
}
@@ -86,8 +78,7 @@
{
// TODO Should abstract the ExtensionData parsing as this pattern is repeated everywhere ExtensionData is getting parsed.
- if (self.currentExtensions == nil)
- {
+ if (self.currentExtensions == nil) {
self.currentExtensions = [[NSMutableArray alloc] init];
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.h Mon Feb 11 09:53:47 2013
@@ -24,12 +24,13 @@
@protocol CMISAtomPubExtensionElementParserDelegate <NSObject>
@required
+/// parses extension element
- (void)extensionElementParser:(CMISAtomPubExtensionElementParser *)parser didFinishParsingExtensionElement:(CMISExtensionElement *)extensionElement;
@end
@interface CMISAtomPubExtensionElementParser : NSObject <NSXMLParserDelegate, CMISAtomPubExtensionElementParserDelegate>
-
+/// extension element parser. returns parsed element
+ (id)extensionElementParserWithElementName:(NSString *)elementName namespaceUri:(NSString *)namespaceUri attributes:(NSDictionary *)attributes parentDelegate:(id<NSXMLParserDelegate, CMISAtomPubExtensionElementParserDelegate>)parentDelegate parser:(NSXMLParser *)parser;
@end
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubExtensionElementParser.m Mon Feb 11 09:53:47 2013
@@ -38,13 +38,6 @@
@implementation CMISAtomPubExtensionElementParser
-@synthesize childDelegate = _childDelegate;
-@synthesize parentDelegate = _parentDelegate;
-@synthesize extensionName = _extensionName;
-@synthesize extensionNamespaceUri = _extensionNamespaceUri;
-@synthesize extensionValue = _extensionValue;
-@synthesize extensionAttributes = _extensionAttributes;
-@synthesize extensionChildren = _extensionChildren;
#pragma mark -
#pragma mark Initializers
@@ -52,8 +45,7 @@
- (id)initWithElementName:(NSString *)elementName namespaceUri:(NSString *)namespaceUri attributes:(NSDictionary *)attributes parentDelegate:(id<NSXMLParserDelegate, CMISAtomPubExtensionElementParserDelegate>)parentDelegate parser:(NSXMLParser *)parser
{
self = [super init];
- if (self)
- {
+ if (self) {
self.extensionName = elementName;
self.extensionNamespaceUri = namespaceUri;
self.extensionAttributes = attributes;
@@ -80,8 +72,7 @@
- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
{
- if (nil == self.extensionValue)
- {
+ if (nil == self.extensionValue) {
self.extensionValue = [[NSMutableString alloc] init];
}
[self.extensionValue appendString:string];
@@ -89,18 +80,14 @@
- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
{
- if ([elementName isEqualToString:self.extensionName] && [namespaceURI isEqualToString:self.extensionNamespaceUri])
- {
+ if ([elementName isEqualToString:self.extensionName] && [namespaceURI isEqualToString:self.extensionNamespaceUri]) {
CMISExtensionElement *extElement = nil;
- if ([self.extensionChildren count] > 0)
- {
+ if ([self.extensionChildren count] > 0) {
extElement = [[CMISExtensionElement alloc] initNodeWithName:self.extensionName
namespaceUri:self.extensionNamespaceUri
attributes:self.extensionAttributes
children:self.extensionChildren];
- }
- else
- {
+ } else {
extElement = [[CMISExtensionElement alloc] initLeafWithName:self.extensionName
namespaceUri:self.extensionNamespaceUri
attributes:self.extensionAttributes
@@ -119,8 +106,7 @@
- (void)extensionElementParser:(CMISAtomPubExtensionElementParser *)parser didFinishParsingExtensionElement:(CMISExtensionElement *)extensionElement
{
- if (self.extensionChildren == nil)
- {
+ if (self.extensionChildren == nil) {
self.extensionChildren = [[NSMutableArray alloc] init];
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.h Mon Feb 11 09:53:47 2013
@@ -24,7 +24,7 @@
@interface CMISPropertyDefinitionParser : NSObject <NSXMLParserDelegate>
-// Initializes a child parser for an Atom Entry and takes over parsing control while parsing the Atom Entry
+/// Initializes a child parser for an Atom Entry and takes over parsing control while parsing the Atom Entry
+ (id)parserForPropertyDefinition:(NSString *)propertyDefinitionElementName
withParentDelegate:(id<NSXMLParserDelegate, CMISPropertyDefinitionDelegate>)parentDelegate
parser:(NSXMLParser *)parser;
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISPropertyDefinitionParser.m Mon Feb 11 09:53:47 2013
@@ -35,15 +35,11 @@
@implementation CMISPropertyDefinitionParser
-@synthesize propertyDefinition = _propertyDefinition;
-@synthesize currentString = _currentString;
-@synthesize parentDelegate = _parentDelegate;
- (id)init
{
self = [super init];
- if (self)
- {
+ if (self) {
self.propertyDefinition = [[CMISPropertyDefinition alloc] init];
}
return self;
@@ -54,36 +50,24 @@
parser:(NSXMLParser *)parser
{
self = [self init];
- if (self)
- {
+ if (self) {
self.parentDelegate = parentDelegate;
// Setting ourself, the entry parser, as the delegate, we reset back to our parent when we're done
[parser setDelegate:self];
// Select type based on element name that is passed
- if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyStringDefinition])
- {
+ if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyStringDefinition]) {
self.propertyDefinition.propertyType = CMISPropertyTypeString;
- }
- else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyIdDefinition])
- {
+ } else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyIdDefinition]) {
self.propertyDefinition.propertyType = CMISPropertyTypeId;
- }
- else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyBooleanDefinition])
- {
+ } else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyBooleanDefinition]) {
self.propertyDefinition.propertyType = CMISPropertyTypeBoolean;
- }
- else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyDateTimeDefinition])
- {
+ } else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyDateTimeDefinition]) {
self.propertyDefinition.propertyType = CMISPropertyTypeDateTime;
- }
- else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyIntegerDefinition])
- {
+ } else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyIntegerDefinition]) {
self.propertyDefinition.propertyType = CMISPropertyTypeInteger;
- }
- else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyDecimalDefinition])
- {
+ } else if ([propertyDefinitionElementName isEqualToString:kCMISCorePropertyDecimalDefinition]) {
self.propertyDefinition.propertyType = CMISPropertyTypeDecimal;
}
}
@@ -104,11 +88,9 @@
- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
{
NSString *cleanedString = [string stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
- if (!self.currentString)
- {
+ if (!self.currentString) {
self.currentString = cleanedString;
- }
- else {
+ } else {
self.currentString = [self.currentString stringByAppendingString:cleanedString];
}
}
@@ -120,12 +102,9 @@
|| [elementName isEqualToString:kCMISCorePropertyBooleanDefinition]
|| [elementName isEqualToString:kCMISCorePropertyIntegerDefinition]
|| [elementName isEqualToString:kCMISCorePropertyDateTimeDefinition]
- || [elementName isEqualToString:kCMISCorePropertyDecimalDefinition])
- {
- if (self.parentDelegate)
- {
- if ([self.parentDelegate respondsToSelector:@selector(propertyDefinitionParser:didFinishParsingPropertyDefinition:)])
- {
+ || [elementName isEqualToString:kCMISCorePropertyDecimalDefinition]) {
+ if (self.parentDelegate) {
+ if ([self.parentDelegate respondsToSelector:@selector(propertyDefinitionParser:didFinishParsingPropertyDefinition:)]) {
[self.parentDelegate performSelector:@selector(propertyDefinitionParser:didFinishParsingPropertyDefinition:) withObject:self withObject:self.propertyDefinition];
}
@@ -133,88 +112,48 @@
parser.delegate = self.parentDelegate;
self.parentDelegate = nil;
}
- }
- else if ([elementName isEqualToString:kCMISCoreId])
- {
+ } else if ([elementName isEqualToString:kCMISCoreId]) {
self.propertyDefinition.id = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreLocalName])
- {
+ } else if ([elementName isEqualToString:kCMISCoreLocalName]) {
self.propertyDefinition.localName = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreLocalNamespace])
- {
+ } else if ([elementName isEqualToString:kCMISCoreLocalNamespace]) {
self.propertyDefinition.localNamespace = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreDisplayName])
- {
+ } else if ([elementName isEqualToString:kCMISCoreDisplayName]) {
self.propertyDefinition.displayName = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreQueryName])
- {
+ } else if ([elementName isEqualToString:kCMISCoreQueryName]) {
self.propertyDefinition.queryName = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreDescription])
- {
+ } else if ([elementName isEqualToString:kCMISCoreDescription]) {
self.propertyDefinition.description = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreCardinality])
- {
- if ([self.currentString isEqualToString:@"multi"])
- {
+ } else if ([elementName isEqualToString:kCMISCoreCardinality]) {
+ if ([self.currentString isEqualToString:@"multi"]) {
self.propertyDefinition.cardinality = CMISCardinalityMulti;
- }
- else if ([self.currentString isEqualToString:@"single"])
- {
+ } else if ([self.currentString isEqualToString:@"single"]) {
self.propertyDefinition.cardinality = CMISCardinalitySingle;
- }
- else
- {
+ } else {
log(@"Invalid value for property definition cardinality : '%@'", self.currentString);
}
- }
- else if ([elementName isEqualToString:kCMISCoreUpdatability])
- {
- if ([self.currentString.lowercaseString isEqualToString:@"readonly"])
- {
+ } else if ([elementName isEqualToString:kCMISCoreUpdatability]) {
+ if ([self.currentString.lowercaseString isEqualToString:@"readonly"]) {
self.propertyDefinition.updatability = CMISUpdatabilityReadOnly;
- }
- else if ([self.currentString.lowercaseString isEqualToString:@"readwrite"])
- {
+ } else if ([self.currentString.lowercaseString isEqualToString:@"readwrite"]) {
self.propertyDefinition.updatability = CMISUpdatabilityReadWrite;
- }
- else if ([self.currentString.lowercaseString isEqualToString:@"whencheckedout"])
- {
+ } else if ([self.currentString.lowercaseString isEqualToString:@"whencheckedout"]) {
self.propertyDefinition.updatability = CMISUpdatabilityWhenCheckedOut;
- }
- else if ([self.currentString.lowercaseString isEqualToString:@"oncreate"])
- {
+ } else if ([self.currentString.lowercaseString isEqualToString:@"oncreate"]) {
self.propertyDefinition.updatability = CMISUpdatabilityOnCreate;
- }
- else
- {
+ } else {
log(@"Invalid value for property definition updatability : '%@'", self.currentString);
}
- }
- else if ([elementName isEqualToString:kCMISCoreInherited])
- {
+ } else if ([elementName isEqualToString:kCMISCoreInherited]) {
self.propertyDefinition.inherited = [self parseBooleanValue:self.currentString];
- }
- else if ([elementName isEqualToString:kCMISCoreRequired])
- {
+ } else if ([elementName isEqualToString:kCMISCoreRequired]) {
self.propertyDefinition.required = [self parseBooleanValue:self.currentString];
- }
- else if ([elementName isEqualToString:kCMISCoreQueryable])
- {
+ } else if ([elementName isEqualToString:kCMISCoreQueryable]) {
self.propertyDefinition.queryable = [self parseBooleanValue:self.currentString];
- }
- else if ([elementName isEqualToString:kCMISCoreOrderable])
- {
+ } else if ([elementName isEqualToString:kCMISCoreOrderable]) {
self.propertyDefinition.orderable = [self parseBooleanValue:self.currentString];
- }
- else if ([elementName isEqualToString:kCMISCoreOpenChoice])
- {
+ } else if ([elementName isEqualToString:kCMISCoreOpenChoice]) {
self.propertyDefinition.openChoice = [self parseBooleanValue:self.currentString];
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.h Mon Feb 11 09:53:47 2013
@@ -25,6 +25,7 @@
@protocol CMISRepositoryInfoParserDelegate <NSObject>
@required
+/// parses repository info delegate method
- (void)repositoryInfoParser:(CMISRepositoryInfoParser *)epositoryInfoParser didFinishParsingRepositoryInfo:(CMISRepositoryInfo *)repositoryInfo;
@end
@@ -33,7 +34,9 @@
@property (nonatomic, strong, readonly) CMISRepositoryInfo *currentRepositoryInfo;
+/// designated initialiser
- (id)initRepositoryInfoParserWithParentDelegate:(id<NSXMLParserDelegate, CMISRepositoryInfoParserDelegate>)parentDelegate parser:(NSXMLParser *)parser;
+/// parses repository info
+ (id)repositoryInfoParserWithParentDelegate:(id<NSXMLParserDelegate, CMISRepositoryInfoParserDelegate>)parentDelegate parser:(NSXMLParser *)parser;
@end
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISRepositoryInfoParser.m Mon Feb 11 09:53:47 2013
@@ -37,19 +37,12 @@
@implementation CMISRepositoryInfoParser
-@synthesize currentRepositoryInfo = _currentRepositoryInfo;
-@synthesize parentDelegate = _parentDelegate;
-@synthesize currentString = _currentString;
-@synthesize currentCollection = _currentCollection;
-@synthesize currentCapabilities = _currentCapabilities;
-@synthesize parsingExtensionElement = _parsingExtensionElement;
- (id)initRepositoryInfoParserWithParentDelegate:(id<NSXMLParserDelegate, CMISRepositoryInfoParserDelegate>)parentDelegate parser:(NSXMLParser *)parser
{
self = [super init];
- if (self)
- {
+ if (self) {
self.currentString = [[NSMutableString alloc] init];
self.currentRepositoryInfo = [[CMISRepositoryInfo alloc] init];
self.parentDelegate = parentDelegate;
@@ -75,16 +68,12 @@
{
self.currentString = [[NSMutableString alloc] init];
- if ([namespaceURI isEqualToString:kCMISNamespaceCmis])
- {
- if ([elementName isEqualToString:kCMISCoreCapabilities])
- {
+ if ([namespaceURI isEqualToString:kCMISNamespaceCmis]) {
+ if ([elementName isEqualToString:kCMISCoreCapabilities]) {
self.currentCapabilities = [NSMutableDictionary dictionaryWithCapacity:14];
}
- }
- else if ( ![namespaceURI isEqualToString:kCMISNamespaceCmis] && ![namespaceURI isEqualToString:kCMISNamespaceApp]
- && ![namespaceURI isEqualToString:kCMISNamespaceAtom] && ![namespaceURI isEqualToString:kCMISNamespaceCmisRestAtom])
- {
+ } else if ( ![namespaceURI isEqualToString:kCMISNamespaceCmis] && ![namespaceURI isEqualToString:kCMISNamespaceApp]
+ && ![namespaceURI isEqualToString:kCMISNamespaceAtom] && ![namespaceURI isEqualToString:kCMISNamespaceCmisRestAtom]) {
self.parsingExtensionElement = YES;
self.childParserDelegate = [CMISAtomPubExtensionElementParser extensionElementParserWithElementName:elementName namespaceUri:namespaceURI attributes:attributeDict parentDelegate:self parser:parser];
}
@@ -103,59 +92,35 @@
- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
{
- if ([namespaceURI isEqualToString:kCMISNamespaceCmis])
- {
- if ([elementName isEqualToString:kCMISCoreRepositoryId])
- {
+ if ([namespaceURI isEqualToString:kCMISNamespaceCmis]) {
+ if ([elementName isEqualToString:kCMISCoreRepositoryId]) {
self.currentRepositoryInfo.identifier = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreRepositoryName])
- {
+ } else if ([elementName isEqualToString:kCMISCoreRepositoryName]) {
self.currentRepositoryInfo.name = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreRepositoryDescription])
- {
+ } else if ([elementName isEqualToString:kCMISCoreRepositoryDescription]) {
self.currentRepositoryInfo.desc = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreVendorName])
- {
+ } else if ([elementName isEqualToString:kCMISCoreVendorName]) {
self.currentRepositoryInfo.vendorName = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreProductName])
- {
+ } else if ([elementName isEqualToString:kCMISCoreProductName]) {
self.currentRepositoryInfo.productName = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreProductVersion])
- {
+ } else if ([elementName isEqualToString:kCMISCoreProductVersion]) {
self.currentRepositoryInfo.productVersion = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreRootFolderId])
- {
+ } else if ([elementName isEqualToString:kCMISCoreRootFolderId]) {
self.currentRepositoryInfo.rootFolderId = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISCoreCmisVersionSupported])
- {
+ } else if ([elementName isEqualToString:kCMISCoreCmisVersionSupported]) {
self.currentRepositoryInfo.cmisVersionSupported = self.currentString;
- }
- else if ([elementName hasPrefix:_kCMISCoreCapabilityPrefix] && self.currentCapabilities)
- {
+ } else if ([elementName hasPrefix:_kCMISCoreCapabilityPrefix] && self.currentCapabilities) {
[self.currentCapabilities setValue:self.currentString forKeyPath:elementName];
- }
- else if ([elementName isEqualToString:kCMISCoreCapabilities])
- {
+ } else if ([elementName isEqualToString:kCMISCoreCapabilities]) {
self.currentRepositoryInfo.repositoryCapabilities = self.currentCapabilities;
self.currentCapabilities = nil;
- }
- else if ([elementName isEqualToString:kCMISCoreAclCapability] || [elementName isEqualToString:kCMISCorePermission]
+ } else if ([elementName isEqualToString:kCMISCoreAclCapability] || [elementName isEqualToString:kCMISCorePermission]
|| [elementName isEqualToString:kCMISCorePermissions]|| [elementName isEqualToString:kCMISCoreMapping]
|| [elementName isEqualToString:kCMISCoreKey]|| [elementName isEqualToString:kCMISCoreSupportedPermissions]
- || [elementName isEqualToString:kCMISCorePropagation] || [elementName isEqualToString:kCMISCoreDescription])
- {
+ || [elementName isEqualToString:kCMISCorePropagation] || [elementName isEqualToString:kCMISCoreDescription]) {
// TODO Handle ACL Capability tree
- }
- else
- {
+ } else {
/*
TODO Parse these into the repoItem object
kCMISCoreSupportedPermissions;
@@ -169,11 +134,8 @@
//log(@"TODO Cmis-Core Element was ignored: ElementName=%@, Value=%@",elementName, self.currentString);
}
- }
- else if ([namespaceURI isEqualToString:kCMISNamespaceCmisRestAtom])
- {
- if ([elementName isEqualToString:kCMISRestAtomRepositoryInfo] && self.parentDelegate)
- {
+ } else if ([namespaceURI isEqualToString:kCMISNamespaceCmisRestAtom]) {
+ if ([elementName isEqualToString:kCMISRestAtomRepositoryInfo] && self.parentDelegate) {
// Finished parsing Properties & its ExtensionData
[self saveCurrentExtensionsAndPushPreviousExtensionData];
@@ -182,13 +144,9 @@
parser.delegate = self.parentDelegate;
self.parentDelegate = nil;
}
- }
- else if ([namespaceURI isEqualToString:kCMISNamespaceApp] || [namespaceURI isEqualToString:kCMISNamespaceAtom])
- {
+ } else if ([namespaceURI isEqualToString:kCMISNamespaceApp] || [namespaceURI isEqualToString:kCMISNamespaceAtom]) {
log(@"WARNING: We should not get here");
- }
- else if (self.isParsingExtensionElement)
- {
+ } else if (self.isParsingExtensionElement) {
self.parsingExtensionElement = NO;
}
@@ -200,8 +158,7 @@
- (void)extensionElementParser:(CMISAtomPubExtensionElementParser *)parser didFinishParsingExtensionElement:(CMISExtensionElement *)extensionElement
{
- if (self.currentExtensions == nil)
- {
+ if (self.currentExtensions == nil) {
self.currentExtensions = [[NSMutableArray alloc] init];
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.h Mon Feb 11 09:53:47 2013
@@ -22,10 +22,12 @@
@interface CMISServiceDocumentParser : NSObject <NSXMLParserDelegate, CMISRepositoryInfoParserDelegate>
-// Available after parsing the service document
+/// Available after parsing the service document
@property (nonatomic, strong, readonly) NSArray *workspaces;
- (id)initWithData:(NSData*)atomData;
+
+/// parses the service document. returns NO if unsuccessful
- (BOOL)parseAndReturnError:(NSError **)error;
@end
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISServiceDocumentParser.m Mon Feb 11 09:53:47 2013
@@ -59,8 +59,7 @@
- (id)initWithData:(NSData*)atomData
{
self = [super init];
- if (self)
- {
+ if (self){
self.atomData = atomData;
}
@@ -78,8 +77,7 @@
[parser setDelegate:self];
BOOL parseSuccessful = [parser parse];
- if (!parseSuccessful)
- {
+ if (!parseSuccessful){
NSError *parserError = [parser parserError];
log(@"Parsing error : %@", parserError);
if (error) {
@@ -101,23 +99,15 @@
{
self.currentString = [[NSMutableString alloc] init];
- if ([elementName isEqualToString:kCMISAppWorkspace])
- {
+ if ([elementName isEqualToString:kCMISAppWorkspace]) {
self.currentWorkSpace = [[CMISWorkspace alloc] init];
- }
- else if ([elementName isEqualToString:kCMISRestAtomRepositoryInfo])
- {
+ } else if ([elementName isEqualToString:kCMISRestAtomRepositoryInfo]) {
self.childParserDelegate = [CMISRepositoryInfoParser repositoryInfoParserWithParentDelegate:self parser:parser];
- }
- else if ([elementName isEqualToString:kCMISAppCollection])
- {
+ } else if ([elementName isEqualToString:kCMISAppCollection]) {
self.currentCollection = [[CMISAtomCollection alloc] init];
self.currentCollection.href = [attributeDict objectForKey:kCMISAtomLinkAttrHref];
- }
- else if ([elementName isEqualToString:kCMISAtomLink])
- {
- if (self.currentAtomLinks == nil)
- {
+ } else if ([elementName isEqualToString:kCMISAtomLink]) {
+ if (self.currentAtomLinks == nil) {
self.currentAtomLinks = [[NSMutableSet alloc] init];
}
@@ -141,63 +131,38 @@
{
// TODO: parser needs refactoring!
- if ([elementName isEqualToString:kCMISAppWorkspace])
- {
+ if ([elementName isEqualToString:kCMISAppWorkspace]) {
self.currentWorkSpace.linkRelations = [[CMISLinkRelations alloc] initWithLinkRelationSet:[self.currentAtomLinks copy]];
self.currentAtomLinks = nil;
[self.internalWorkspaces addObject:self.currentWorkSpace];
- }
- else if ([elementName isEqualToString:kCMISRestAtomUritemplate])
- {
- if ([self.currentType isEqualToString:kCMISUriTemplateObjectById])
- {
+ } else if ([elementName isEqualToString:kCMISRestAtomUritemplate]) {
+ if ([self.currentType isEqualToString:kCMISUriTemplateObjectById]) {
self.currentWorkSpace.objectByIdUriTemplate = self.currentTemplate;
- }
- else if ([self.currentType isEqualToString:kCMISUriTemplateObjectByPath])
- {
+ } else if ([self.currentType isEqualToString:kCMISUriTemplateObjectByPath]) {
self.currentWorkSpace.objectByPathUriTemplate = self.currentTemplate;
- }
- else if ([self.currentType isEqualToString:kCMISUriTemplateTypeById])
- {
+ } else if ([self.currentType isEqualToString:kCMISUriTemplateTypeById]) {
self.currentWorkSpace.typeByIdUriTemplate = self.currentTemplate;
- }
- else if ([self.currentType isEqualToString:kCMISUriTemplateQuery])
- {
+ } else if ([self.currentType isEqualToString:kCMISUriTemplateQuery]) {
self.currentWorkSpace.queryUriTemplate = self.currentTemplate;
}
- }
- else if ([elementName isEqualToString:kCMISRestAtomTemplate])
- {
+ } else if ([elementName isEqualToString:kCMISRestAtomTemplate]) {
self.currentTemplate = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISRestAtomType])
- {
+ } else if ([elementName isEqualToString:kCMISRestAtomType]) {
self.currentType = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISRestAtomMediaType])
- {
+ } else if ([elementName isEqualToString:kCMISRestAtomMediaType]) {
self.currentMediaType = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISAppCollection])
- {
- if (self.currentWorkSpace.collections == nil)
- {
+ } else if ([elementName isEqualToString:kCMISAppCollection]) {
+ if (self.currentWorkSpace.collections == nil) {
self.currentWorkSpace.collections = [[NSMutableArray alloc] init];
}
[self.currentWorkSpace.collections addObject:self.currentCollection];
self.currentCollection = nil;
- }
- else if ([elementName isEqualToString:kCMISAtomTitle])
- {
+ } else if ([elementName isEqualToString:kCMISAtomTitle]) {
self.currentCollection.title = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISAppAccept])
- {
+ } else if ([elementName isEqualToString:kCMISAppAccept]) {
self.currentCollection.accept = self.currentString;
- }
- else if ([elementName isEqualToString:kCMISRestAtomCollectionType])
- {
+ } else if ([elementName isEqualToString:kCMISRestAtomCollectionType]) {
self.currentCollection.type = self.currentString;
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.h Mon Feb 11 09:53:47 2013
@@ -31,6 +31,7 @@
@property (nonatomic, strong, readonly) CMISTypeDefinition *typeDefinition;
- (id)initWithData:(NSData *)atomData;
+/// parses the type definition. returns NO if unsuccessful
- (BOOL)parseAndReturnError:(NSError **)error;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.m?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISTypeDefinitionAtomEntryParser.m Mon Feb 11 09:53:47 2013
@@ -36,17 +36,11 @@
@implementation CMISTypeDefinitionAtomEntryParser
-@synthesize typeDefinition = _typeDefinition;
-@synthesize isParsingTypeDefinition = _isParsingTypeDefinition;
-@synthesize atomData = _atomData;
-@synthesize currentString = _currentString;
-@synthesize childParserDelegate = _childParserDelegate;
- (id)initWithData:(NSData *)atomData
{
self = [self init];
- if (self)
- {
+ if (self) {
self.atomData = atomData;
}
@@ -64,10 +58,8 @@
parseSuccessful = [parser parse];
- if (!parseSuccessful)
- {
- if (error)
- {
+ if (!parseSuccessful) {
+ if (error) {
*error = [parser parserError];
}
}
@@ -77,18 +69,15 @@
- (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
{
- if ([elementName isEqualToString:kCMISRestAtomType])
- {
+ if ([elementName isEqualToString:kCMISRestAtomType]) {
self.typeDefinition = [[CMISTypeDefinition alloc] init];
self.isParsingTypeDefinition = YES;
- }
- else if ([elementName isEqualToString:kCMISCorePropertyStringDefinition]
+ } else if ([elementName isEqualToString:kCMISCorePropertyStringDefinition]
|| [elementName isEqualToString:kCMISCorePropertyIdDefinition]
|| [elementName isEqualToString:kCMISCorePropertyBooleanDefinition]
|| [elementName isEqualToString:kCMISCorePropertyIntegerDefinition]
|| [elementName isEqualToString:kCMISCorePropertyDateTimeDefinition]
- || [elementName isEqualToString:kCMISCorePropertyDecimalDefinition])
- {
+ || [elementName isEqualToString:kCMISCorePropertyDecimalDefinition]) {
self.childParserDelegate = [CMISPropertyDefinitionParser parserForPropertyDefinition:elementName withParentDelegate:self parser:parser];
}
}
@@ -97,123 +86,75 @@
- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
{
NSString *cleanedString = [string stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
- if (!self.currentString)
- {
+ if (!self.currentString) {
self.currentString = cleanedString;
- }
- else {
+ } else {
self.currentString = [self.currentString stringByAppendingString:cleanedString];
}
}
- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
{
- if ([elementName isEqualToString:kCMISRestAtomType])
- {
+ if ([elementName isEqualToString:kCMISRestAtomType]) {
self.isParsingTypeDefinition = NO;
- }
- else if ([elementName isEqualToString:kCMISCoreId])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreId]) {
+ if (self.isParsingTypeDefinition){
self.typeDefinition.id = self.currentString;
}
- }
- else if ([elementName isEqualToString:kCMISCoreLocalName])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreLocalName]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.localName = self.currentString;
}
- }
- else if ([elementName isEqualToString:kCMISCoreLocalNamespace])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreLocalNamespace]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.localNameSpace = self.currentString;
}
- }
- else if ([elementName isEqualToString:kCMISCoreDisplayName])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreDisplayName]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.displayName = self.currentString;
}
- }
- else if ([elementName isEqualToString:kCMISCoreQueryName])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreQueryName]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.queryName = self.currentString;
}
- }
- else if ([elementName isEqualToString:kCMISCoreDescription])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreDescription]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.description = self.currentString;
}
- }
- else if ([elementName isEqualToString:kCMISCoreBaseId])
- {
- if (self.isParsingTypeDefinition)
- {
- if ([self.currentString isEqualToString:kCMISPropertyObjectTypeIdValueDocument])
- {
+ } else if ([elementName isEqualToString:kCMISCoreBaseId]) {
+ if (self.isParsingTypeDefinition) {
+ if ([self.currentString isEqualToString:kCMISPropertyObjectTypeIdValueDocument]) {
self.typeDefinition.baseTypeId = CMISBaseTypeDocument;
- }
- else if ([self.currentString isEqualToString:kCMISPropertyObjectTypeIdValueFolder])
- {
+ } else if ([self.currentString isEqualToString:kCMISPropertyObjectTypeIdValueFolder]) {
self.typeDefinition.baseTypeId = CMISBaseTypeFolder;
}
}
- }
- else if ([elementName isEqualToString:kCMISCoreCreatable])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreCreatable]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.creatable = [self.currentString.lowercaseString isEqualToString:kCMISAtomEntryValueTrue];
}
- }
- else if ([elementName isEqualToString:kCMISCoreFileable])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreFileable]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.fileable = [self.currentString.lowercaseString isEqualToString:kCMISAtomEntryValueTrue];
}
- }
- else if ([elementName isEqualToString:kCMISCoreQueryable])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreQueryable]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.queryable = [self.currentString.lowercaseString isEqualToString:kCMISAtomEntryValueTrue];
}
- }
- else if ([elementName isEqualToString:kCMISCoreFullTextIndexed])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreFullTextIndexed]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.fullTextIndexed = [self.currentString.lowercaseString isEqualToString:kCMISAtomEntryValueTrue];
}
- }
- else if ([elementName isEqualToString:kCMISCoreIncludedInSupertypeQuery])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreIncludedInSupertypeQuery]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.includedInSupertypeQuery = [self.currentString.lowercaseString isEqualToString:kCMISAtomEntryValueTrue];
}
- }
- else if ([elementName isEqualToString:kCMISCoreControllableACL])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreControllableACL]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.controllableAcl = [self.currentString.lowercaseString isEqualToString:kCMISAtomEntryValueTrue];
}
- }
- else if ([elementName isEqualToString:kCMISCoreControllablePolicy])
- {
- if (self.isParsingTypeDefinition)
- {
+ } else if ([elementName isEqualToString:kCMISCoreControllablePolicy]) {
+ if (self.isParsingTypeDefinition) {
self.typeDefinition.controllablePolicy = [self.currentString.lowercaseString isEqualToString:kCMISAtomEntryValueTrue];
}
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService%2BProtected.h?rev=1444698&r1=1444697&r2=1444698&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h Mon Feb 11 09:53:47 2013
@@ -32,7 +32,9 @@
/** Convenience method with all the defaults for the retrieval parameters */
- (void)retrieveObjectInternal:(NSString *)objectId completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
-/** Full-blown object retrieval version */
+/** Full-blown object retrieval version
+ * completionBlock returns CMISObjectData instance or nil if unsuccessul
+ */
- (void)retrieveObjectInternal:(NSString *)objectId
withReturnVersion:(CMISReturnVersion)cmisReturnVersion
withFilter:(NSString *)filter
@@ -43,6 +45,9 @@
andIncludeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
+/** retrieve object for a given path name
+ * completionBlock returns CMISObjectData instance or nil if unsuccessul
+ */
- (void)retrieveObjectByPathInternal:(NSString *)path
withFilter:(NSString *)filter
andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
@@ -52,13 +57,20 @@
andIncludeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
+/** retrieve object from cache
+ * completionBlock returns the object (as id) or nil if unsuccessul
+ */
- (void)retrieveFromCache:(NSString *)cacheKey
completionBlock:(void (^)(id object, NSError *error))completionBlock;
+///load the link for a given object Id
+///completionBlock returns the link as NSString or nil if unsuccessful
- (void)loadLinkForObjectId:(NSString *)objectId
andRelation:(NSString *)rel
completionBlock:(void (^)(NSString *link, NSError *error))completionBlock;
+///load the link for a given object Id
+///completionBlock returns the link as NSString or nil if unsuccessful
- (void)loadLinkForObjectId:(NSString *)objectId
andRelation:(NSString *)rel
andType:(NSString *)type