[tcobrowser-cvs] SF.net SVN: tcobrowser: [660] trunk/bibdesk/vendorsrc/amaxwell/FileView/ FileView.
Status: Beta
Brought to you by:
amaxwell
Menu
▾
▴
[tcobrowser-cvs] SF.net SVN: tcobrowser: [660] trunk/bibdesk/vendorsrc/amaxwell/FileView/ FileView.m
|
From: <ama...@us...> - 2008-03-31 21:11:38
|
Revision: 660
http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=660&view=rev
Author: amaxwell
Date: 2008-03-31 14:11:43 -0700 (Mon, 31 Mar 2008)
Log Message:
-----------
remove obsolete wrapper method
Modified Paths:
--------------
trunk/bibdesk/vendorsrc/amaxwell/FileView/FileView.m
Modified: trunk/bibdesk/vendorsrc/amaxwell/FileView/FileView.m
===================================================================
--- trunk/bibdesk/vendorsrc/amaxwell/FileView/FileView.m 2008-03-31 21:07:29 UTC (rev 659)
+++ trunk/bibdesk/vendorsrc/amaxwell/FileView/FileView.m 2008-03-31 21:11:43 UTC (rev 660)
@@ -52,9 +52,6 @@
#import "FVViewController.h"
@interface FileView (Private)
-// wrapper that calls bound array or datasource transparently; for internal use
-// clients should access the datasource or bound array directly
-- (NSUInteger)numberOfIcons;
// only declare methods here to shut the compiler up if we can't rearrange
- (FVIcon *)_cachedIconForURL:(NSURL *)aURL;
@@ -355,7 +352,7 @@
- (NSUInteger)numberOfRows;
{
NSUInteger nc = [self numberOfColumns];
- NSUInteger ni = [self numberOfIcons];
+ NSUInteger ni = [_controller numberOfIcons];
NSUInteger r = ni % nc > 0 ? 1 : 0;
return (ni/nc + r);
}
@@ -455,7 +452,7 @@
[self _getRangeOfRows:&visRows columns:&visColumns inRect:visibleRect];
NSUInteger r, rMin = visRows.location, rMax = NSMaxRange(visRows);
NSUInteger c, cMin = visColumns.location, cMax = NSMaxRange(visColumns);
- NSUInteger i, iMin = [self _indexForGridRow:rMin column:cMin], iMax = MIN([self numberOfIcons], [self _indexForGridRow:rMax column:cMax]);
+ NSUInteger i, iMin = [self _indexForGridRow:rMin column:cMin], iMax = MIN([_controller numberOfIcons], [self _indexForGridRow:rMax column:cMax]);
NSPoint mouseLoc = [self convertPoint:[[self window] mouseLocationOutsideOfEventStream] fromView:nil];
NSUInteger mouseIndex = NSNotFound;
@@ -617,15 +614,6 @@
return [[_selectedIndexes copy] autorelease];
}
-#pragma mark Binding/datasource wrappers
-
-// following two methods are for binding compatibility with the datasource methods
-
-- (NSUInteger)numberOfIcons
-{
- return [_controller numberOfIcons];
-}
-
- (NSArray *)_selectedURLs
{
NSMutableArray *array = [NSMutableArray array];
@@ -651,7 +639,7 @@
if (NSEqualRects(frame, [self frame]) == NO)
[self setFrame:frame];
- NSUInteger numIcons = [self numberOfIcons];
+ NSUInteger numIcons = [_controller numberOfIcons];
NSUInteger lastSelIndex = [_selectedIndexes lastIndex];
if (lastSelIndex != NSNotFound && lastSelIndex >= numIcons) {
NSMutableIndexSet *tmpIndexes = [_selectedIndexes mutableCopy];
@@ -666,7 +654,7 @@
// nc * (r-1) + c
// assumes all slots are filled, so check numberOfIcons before returning a value
NSUInteger fileIndex = rowIndex * [self numberOfColumns] + colIndex;
- return fileIndex >= [self numberOfIcons] ? NSNotFound : fileIndex;
+ return fileIndex >= [_controller numberOfIcons] ? NSNotFound : fileIndex;
}
- (BOOL)_getGridRow:(NSUInteger *)rowIndex column:(NSUInteger *)colIndex ofIndex:(NSUInteger)anIndex;
@@ -692,7 +680,7 @@
r--;
c--;
- if (i <= [self numberOfIcons]) {
+ if (i <= [_controller numberOfIcons]) {
if (NULL != rowIndex)
*rowIndex = r;
if (NULL != colIndex)
@@ -770,14 +758,14 @@
NSRange rowRange, columnRange;
[self _getRangeOfRows:&rowRange columns:&columnRange inRect:[self visibleRect]];
- NSUInteger iMin, iMax = [self numberOfIcons];
+ NSUInteger iMin, iMax = [_controller numberOfIcons];
// _indexForGridRow:column: returns NSNotFound if we're in a short row (empty column)
iMin = [self _indexForGridRow:rowRange.location column:columnRange.location];
if (NSNotFound == iMin)
- iMin = [self numberOfIcons];
+ iMin = [_controller numberOfIcons];
else
- iMax = MIN([self numberOfIcons], iMin + rowRange.length * [self numberOfColumns]);
+ iMax = MIN([_controller numberOfIcons], iMin + rowRange.length * [self numberOfColumns]);
NSUInteger i;
@@ -1006,14 +994,14 @@
// this method is now called with only the icons being drawn, not necessarily everything that's visible; we need to compute visibility to avoid calling -releaseResources on the wrong icons
NSRange visRows, visCols;
[self _getRangeOfRows:&visRows columns:&visCols inRect:[self visibleRect]];
- NSUInteger iMin, iMax = [self numberOfIcons];
+ NSUInteger iMin, iMax = [_controller numberOfIcons];
// _indexForGridRow:column: returns NSNotFound if we're in a short row (empty column)
iMin = [self _indexForGridRow:visRows.location column:visCols.location];
if (NSNotFound == iMin)
- iMin = [self numberOfIcons];
+ iMin = [_controller numberOfIcons];
else
- iMax = MIN([self numberOfIcons], iMin + visRows.length * [self numberOfColumns]);
+ iMax = MIN([_controller numberOfIcons], iMin + visRows.length * [self numberOfColumns]);
if (iMax > iMin)
[visibleIndexes addIndexesInRange:NSMakeRange(iMin, iMax - iMin)];
@@ -1032,7 +1020,7 @@
if (NO == [self _isFastScrolling]) {
// make sure we don't call this on any icons that we just added to the render queue
- NSMutableIndexSet *unusedIndexes = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfIcons])];
+ NSMutableIndexSet *unusedIndexes = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [_controller numberOfIcons])];
[unusedIndexes removeIndexes:visibleIndexes];
// If scrolling quickly, avoid releasing icons that may become visible
@@ -1042,7 +1030,7 @@
// going down: don't release anything between end of visible range and the last icon
// going up: don't release anything between the first icon and the start of visible range
if (velocity > 0) {
- [unusedIndexes removeIndexesInRange:NSMakeRange([visibleIndexes lastIndex], [self numberOfIcons] - [visibleIndexes lastIndex])];
+ [unusedIndexes removeIndexesInRange:NSMakeRange([visibleIndexes lastIndex], [_controller numberOfIcons] - [visibleIndexes lastIndex])];
}
else {
[unusedIndexes removeIndexesInRange:NSMakeRange(0, [visibleIndexes firstIndex])];
@@ -1249,7 +1237,7 @@
NSUInteger anIndex = [download indexInView];
// we only draw a if there's an active download for this URL/index pair
- if (anIndex < [self numberOfIcons] && [[_controller URLAtIndex:anIndex] isEqual:[download downloadURL]]) {
+ if (anIndex < [_controller numberOfIcons] && [[_controller URLAtIndex:anIndex] isEqual:[download downloadURL]]) {
NSRect frame = [self _rectOfProgressIndicatorForIconAtIndex:anIndex];
[[download progressIndicator] drawWithFrame:frame inView:self];
}
@@ -1278,14 +1266,14 @@
NSRange rowRange, columnRange;
[self _getRangeOfRows:&rowRange columns:&columnRange inRect:rect];
- NSUInteger iMin, iMax = [self numberOfIcons];
+ NSUInteger iMin, iMax = [_controller numberOfIcons];
// _indexForGridRow:column: returns NSNotFound if we're in a short row (empty column)
iMin = [self _indexForGridRow:rowRange.location column:columnRange.location];
if (NSNotFound == iMin)
- iMin = [self numberOfIcons];
+ iMin = [_controller numberOfIcons];
else
- iMax = MIN([self numberOfIcons], iMin + rowRange.length * [self numberOfColumns]);
+ iMax = MIN([_controller numberOfIcons], iMin + rowRange.length * [self numberOfColumns]);
// only draw icons if we actually have some in this rect
if (iMax > iMin) {
@@ -1438,7 +1426,7 @@
NSUInteger r, c;
// this can happen if we screwed up in managing cursor rects
- NSParameterAssert(anIndex < [self numberOfIcons]);
+ NSParameterAssert(anIndex < [_controller numberOfIcons]);
if ([self _getGridRow:&r column:&c ofIndex:anIndex]) {
@@ -1839,7 +1827,7 @@
// check to avoid highlighting empty cells as individual icons; that's a DropOnView, not DropOnIcon
- if ([self _indexForGridRow:r column:c] > [self numberOfIcons]) {
+ if ([self _indexForGridRow:r column:c] > [_controller numberOfIcons]) {
aRect = [self visibleRect];
op = FVDropOnView;
}
@@ -1854,7 +1842,7 @@
// can't insert between nonexisting cells either, so check numberOfIcons first...
- if ([self _getGridRow:&r column:&c atPoint:left] && ([self _indexForGridRow:r column:c] < [self numberOfIcons])) {
+ if ([self _getGridRow:&r column:&c atPoint:left] && ([self _indexForGridRow:r column:c] < [_controller numberOfIcons])) {
aRect = [self _rectOfIconInRow:r column:c];
// rect size is 6, and should be centered between icons horizontally
@@ -1863,7 +1851,7 @@
op = FVDropInsert;
insertIndex = [self _indexForGridRow:r column:c] + 1;
}
- else if ([self _getGridRow:&r column:&c atPoint:right] && ([self _indexForGridRow:r column:c] < [self numberOfIcons])) {
+ else if ([self _getGridRow:&r column:&c atPoint:right] && ([self _indexForGridRow:r column:c] < [_controller numberOfIcons])) {
aRect = [self _rectOfIconInRow:r column:c];
aRect.origin.x -= _padding.width / 2 + 3.0;
@@ -1986,7 +1974,7 @@
// see if we're targeting a particular cell, then make sure that cell is a legal replace operation
[self _getGridRow:&r column:&c atPoint:dragLoc];
- if (FVDropOnIcon == dropOp && (idx = [self _indexForGridRow:r column:c]) < [self numberOfIcons]) {
+ if (FVDropOnIcon == dropOp && (idx = [self _indexForGridRow:r column:c]) < [_controller numberOfIcons]) {
NSURL *aURL = [FVURLSFromPasteboard(pboard) lastObject];
@@ -2022,7 +2010,7 @@
// this must be an add operation, and only non-local drag sources can do that
NSArray *allURLs = FVURLSFromPasteboard(pboard);
- NSIndexSet *insertSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([self numberOfIcons], [allURLs count])];
+ NSIndexSet *insertSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([_controller numberOfIcons], [allURLs count])];
[[self dataSource] fileView:self insertURLs:allURLs atIndexes:insertSet];
didPerform = YES;
@@ -2044,7 +2032,7 @@
{
NSUInteger curIdx = [_selectedIndexes firstIndex];
NSUInteger next = (NSNotFound == curIdx || curIdx < [self numberOfColumns]) ? 0 : curIdx - [self numberOfColumns];
- if (next >= [self numberOfIcons]) {
+ if (next >= [_controller numberOfIcons]) {
NSBeep();
}
else {
@@ -2057,12 +2045,12 @@
{
NSUInteger curIdx = [_selectedIndexes firstIndex];
NSUInteger next = NSNotFound == curIdx ? 0 : curIdx + [self numberOfColumns];
- if ([self numberOfIcons] == 0) {
+ if ([_controller numberOfIcons] == 0) {
NSBeep();
}
else {
- if (next >= [self numberOfIcons])
- next = [self numberOfIcons] - 1;
+ if (next >= [_controller numberOfIcons])
+ next = [_controller numberOfIcons] - 1;
[self scrollItemAtIndexToVisible:next];
[self setSelectionIndexes:[NSIndexSet indexSetWithIndex:next]];
@@ -2153,9 +2141,9 @@
if (NSNotFound == curIdx)
previous = 0;
- else if (0 == curIdx && [self numberOfIcons] > 0)
- previous = ([self numberOfIcons] - 1);
- else if ([self numberOfIcons] > 0)
+ else if (0 == curIdx && [_controller numberOfIcons] > 0)
+ previous = ([_controller numberOfIcons] - 1);
+ else if ([_controller numberOfIcons] > 0)
previous = curIdx - 1;
if (NSNotFound != previous) {
@@ -2168,7 +2156,7 @@
{
NSUInteger curIdx = [_selectedIndexes firstIndex];
NSUInteger next = NSNotFound == curIdx ? 0 : curIdx + 1;
- if (next >= [self numberOfIcons])
+ if (next >= [_controller numberOfIcons])
next = 0;
[self scrollItemAtIndexToVisible:next];
@@ -2223,7 +2211,7 @@
- (IBAction)selectAll:(id)sender;
{
- [self setSelectionIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfIcons])]];
+ [self setSelectionIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [_controller numberOfIcons])]];
}
- (IBAction)deselectAll:(id)sender;
@@ -2247,7 +2235,7 @@
{
if ([self isEditable]) {
NSArray *URLs = FVURLSFromPasteboard([NSPasteboard generalPasteboard]);
- NSIndexSet *insertSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([self numberOfIcons], [URLs count])];
+ NSIndexSet *insertSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([_controller numberOfIcons], [URLs count])];
if ([URLs count])
[[self dataSource] fileView:self insertURLs:URLs atIndexes:insertSet];
else
@@ -2277,7 +2265,7 @@
else if (action == @selector(delete:) || action == @selector(copy:) || action == @selector(cut:))
return [self isEditable] && selectionCount > 0;
else if (action == @selector(selectAll:))
- return ([self numberOfIcons] > 0);
+ return ([_controller numberOfIcons] > 0);
else if (action == @selector(previewAction:))
return selectionCount > 0;
else if (action == @selector(paste:))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|