diff --git a/Classes/osx/MMFlowView+MMFlowViewContentBinderDelegate.m b/Classes/osx/MMFlowView+MMFlowViewContentBinderDelegate.m index 3c337f6..7291b17 100644 --- a/Classes/osx/MMFlowView+MMFlowViewContentBinderDelegate.m +++ b/Classes/osx/MMFlowView+MMFlowViewContentBinderDelegate.m @@ -21,7 +21,7 @@ - (void)contentBinder:(MMFlowViewContentBinder *)contentBinder itemChanged:(id delegate; @property (nonatomic, readonly, copy) NSString *contentArrayKeyPath; -@property (nonatomic, readonly, copy) NSArray *contentArray; -@property (nonatomic, readonly) NSArray *observedItems; +@property (nonatomic, readonly, copy) NSArray *observedItems; @property (nonatomic, readonly) NSArray *observedItemKeys; @property (nonatomic, readonly) NSDictionary *bindingInfo; diff --git a/Classes/osx/MMFlowViewContentBinder.m b/Classes/osx/MMFlowViewContentBinder.m index ed87640..9a0736e 100644 --- a/Classes/osx/MMFlowViewContentBinder.m +++ b/Classes/osx/MMFlowViewContentBinder.m @@ -16,14 +16,13 @@ @interface MMFlowViewContentBinder () @property (nonatomic, strong) NSArrayController *controller; -@property (nonatomic, readwrite) NSArray *observedItems; +@property (nonatomic, readwrite, copy) NSArray *observedItems; @property (nonatomic, readwrite, strong) NSDictionary *bindingInfo; @end @implementation MMFlowViewContentBinder -@dynamic contentArray; @dynamic observedItemKeys; - (instancetype)init @@ -43,7 +42,6 @@ - (instancetype)initWithArrayController:(NSArrayController *)controller withCont if (self) { _controller = controller; _contentArrayKeyPath = [keyPath copy]; - _observedItems = nil; _bindingInfo = @{NSObservedObjectKey: controller, NSObservedKeyPathKey: [keyPath copy], NSOptionsKey: @{} }; @@ -67,11 +65,6 @@ - (NSArray*)observedItemKeys return mandantoryKeys; } -- (NSArray*)contentArray -{ - return [[self.controller valueForKeyPath:self.contentArrayKeyPath] copy]; -} - - (void)startObservingContent { [self.controller addObserver:self diff --git a/Classes/osx/MMFlowView_Private.h b/Classes/osx/MMFlowView_Private.h index c07459f..2a2ed68 100644 --- a/Classes/osx/MMFlowView_Private.h +++ b/Classes/osx/MMFlowView_Private.h @@ -54,8 +54,6 @@ @property (strong,nonatomic) CALayer *highlightedLayer; @property (strong,readwrite) MMScrollBarLayer *scrollBarLayer; @property (strong) MMFlowViewImageFactory *imageFactory; -@property (strong,nonatomic,readwrite) NSDictionary *contentArrayBindingInfo; -@property (nonatomic,copy) NSArray *observedItems; @property (readwrite,nonatomic) NSUInteger numberOfItems; @property (readwrite,strong) id imageCache; @property (nonatomic, readonly) NSRect selectedItemFrame; diff --git a/Classes/osx/Specs/MMFlowViewContentBinderDelegateSpec.m b/Classes/osx/Specs/MMFlowViewContentBinderDelegateSpec.m index ac6a5fd..643677d 100644 --- a/Classes/osx/Specs/MMFlowViewContentBinderDelegateSpec.m +++ b/Classes/osx/Specs/MMFlowViewContentBinderDelegateSpec.m @@ -23,7 +23,7 @@ beforeEach(^{ sut = [[MMFlowView alloc] initWithFrame:NSMakeRect(0, 0, 400, 300)]; contentBinderMock = [KWMock nullMockForClass:[MMFlowViewContentBinder class]]; - [contentBinderMock stub:@selector(contentArray) andReturn:contentArray]; + [contentBinderMock stub:@selector(observedItems) andReturn:contentArray]; }); afterEach(^{ sut = nil; @@ -51,7 +51,7 @@ it(@"should set the contentAdapter to the contentBinders contentArray", ^{ [sut contentArrayDidChange:contentBinderMock]; - [[sut.contentAdapter should] equal:contentBinderMock.contentArray]; + [[sut.contentAdapter should] equal:contentBinderMock.observedItems]; }); }); diff --git a/Classes/osx/Specs/MMFlowViewContentBinderSpec.m b/Classes/osx/Specs/MMFlowViewContentBinderSpec.m index 5f66283..c899c1d 100644 --- a/Classes/osx/Specs/MMFlowViewContentBinderSpec.m +++ b/Classes/osx/Specs/MMFlowViewContentBinderSpec.m @@ -70,10 +70,6 @@ [[sut.contentArrayKeyPath should] equal:arrangedObjectsKey]; }); - it(@"should have an empty contentArray", ^{ - [[sut.contentArray should] haveCountOf:numberOfItems]; - }); - it(@"should have no observedItems", ^{ [[sut.observedItems should] beNil]; });