From 5005732da0ad1bd61bb201cf6c7da91fa80017dd Mon Sep 17 00:00:00 2001 From: Richard Ross Date: Tue, 25 Aug 2015 15:30:16 -0700 Subject: [PATCH] Fixed assertion messages that were unintentionally changed in #86. wasntme.gif --- Parse/Internal/FieldOperation/PFFieldOperation.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Parse/Internal/FieldOperation/PFFieldOperation.m b/Parse/Internal/FieldOperation/PFFieldOperation.m index fe828f7ec..780347ff7 100644 --- a/Parse/Internal/FieldOperation/PFFieldOperation.m +++ b/Parse/Internal/FieldOperation/PFFieldOperation.m @@ -267,7 +267,7 @@ - (PFFieldOperation *)mergeWithPrevious:(PFFieldOperation *)previous { NSArray *oldArray = (((PFSetOperation *)previous).value); return [PFSetOperation setWithValue:[self applyToValue:oldArray forKey:nil]]; } else { - [NSException raise:NSInternalInconsistencyException format:@"Operation is invalid after previous operation."]; + [NSException raise:NSInternalInconsistencyException format:@"You can't add an item to a non-array."]; return nil; } } else if ([previous isKindOfClass:[PFAddUniqueOperation class]]) { @@ -336,14 +336,14 @@ - (PFFieldOperation *)mergeWithPrevious:(PFFieldOperation *)previous { if (!previous) { return self; } else if ([previous isKindOfClass:[PFDeleteOperation class]]) { - [NSException raise:NSInternalInconsistencyException format:@"Operation is invalid after previous operation."]; + [NSException raise:NSInternalInconsistencyException format:@"You can't remove items from a deleted array."]; return nil; } else if ([previous isKindOfClass:[PFSetOperation class]]) { if ([((PFSetOperation *)previous).value isKindOfClass:[NSArray class]]) { NSArray *oldArray = ((PFSetOperation *)previous).value; return [PFSetOperation setWithValue:[self applyToValue:oldArray forKey:nil]]; } else { - [NSException raise:NSInternalInconsistencyException format:@"Operation is invalid after previous operation."]; + [NSException raise:NSInternalInconsistencyException format:@"You can't add an item to a non-array."]; return nil; } } else if ([previous isKindOfClass:[PFRemoveOperation class]]) {