vendor/Pods/YapDatabase/YapDatabase/Extensions/Views/YapDatabaseView.m in motion-yapper-0.0.1 vs vendor/Pods/YapDatabase/YapDatabase/Extensions/Views/YapDatabaseView.m in motion-yapper-0.0.2
- old
+ new
@@ -87,11 +87,11 @@
@synthesize sortingBlock = sortingBlock;
@synthesize groupingBlockType = groupingBlockType;
@synthesize sortingBlockType = sortingBlockType;
-@synthesize version = version;
+@synthesize versionTag = versionTag;
@dynamic options;
- (id)initWithGroupingBlock:(YapDatabaseViewGroupingBlock)inGroupingBlock
groupingBlockType:(YapDatabaseViewBlockType)inGroupingBlockType
sortingBlock:(YapDatabaseViewSortingBlock)inSortingBlock
@@ -99,37 +99,40 @@
{
return [self initWithGroupingBlock:inGroupingBlock
groupingBlockType:inGroupingBlockType
sortingBlock:inSortingBlock
sortingBlockType:inSortingBlockType
- version:0
+ versionTag:@""
options:nil];
}
- (id)initWithGroupingBlock:(YapDatabaseViewGroupingBlock)inGroupingBlock
groupingBlockType:(YapDatabaseViewBlockType)inGroupingBlockType
sortingBlock:(YapDatabaseViewSortingBlock)inSortingBlock
sortingBlockType:(YapDatabaseViewBlockType)inSortingBlockType
- version:(int)inVersion
+ versionTag:(NSString *)inVersionTag
{
return [self initWithGroupingBlock:inGroupingBlock
groupingBlockType:inGroupingBlockType
sortingBlock:inSortingBlock
sortingBlockType:inSortingBlockType
- version:inVersion
+ versionTag:inVersionTag
options:nil];
}
- (id)initWithGroupingBlock:(YapDatabaseViewGroupingBlock)inGroupingBlock
groupingBlockType:(YapDatabaseViewBlockType)inGroupingBlockType
sortingBlock:(YapDatabaseViewSortingBlock)inSortingBlock
sortingBlockType:(YapDatabaseViewBlockType)inSortingBlockType
- version:(int)inVersion
- options:(YapDatabaseViewOptions *)inOptions;
+ versionTag:(NSString *)inVersionTag
+ options:(YapDatabaseViewOptions *)inOptions
{
if ((self = [super init]))
{
+ NSAssert(inGroupingBlock != NULL, @"Invalid grouping block");
+ NSAssert(inSortingBlock != NULL, @"Invalid sorting block");
+
NSAssert(inGroupingBlockType == YapDatabaseViewBlockTypeWithKey ||
inGroupingBlockType == YapDatabaseViewBlockTypeWithObject ||
inGroupingBlockType == YapDatabaseViewBlockTypeWithMetadata ||
inGroupingBlockType == YapDatabaseViewBlockTypeWithRow,
@"Invalid grouping block type");
@@ -144,10 +147,10 @@
groupingBlockType = inGroupingBlockType;
sortingBlock = inSortingBlock;
sortingBlockType = inSortingBlockType;
- version = inVersion;
+ versionTag = inVersionTag ? [inVersionTag copy] : @"";
options = inOptions ? [inOptions copy] : [[YapDatabaseViewOptions alloc] init];
}
return self;
}