Revision: 7738
http://skim-app.svn.sourceforge.net/skim-app/?rev=7738&view=rev
Author: hofman
Date: 2012-10-19 21:15:15 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
enumerate index sets using blocks
Modified Paths:
--------------
trunk/PDFSelection_SKExtensions.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_UI.m
trunk/SKNotesDocument.m
trunk/SKOutlineView.m
trunk/SKTableView.m
trunk/SKTocOutlineView.m
Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m 2012-10-19 17:29:39 UTC (rev 7737)
+++ trunk/PDFSelection_SKExtensions.m 2012-10-19 21:15:15 UTC (rev 7738)
@@ -580,7 +580,7 @@
- (id)objectSpecifier {
NSMutableArray *ranges = [NSMutableArray array];
for (PDFPage *page in [self pages]) {
- NSRange range = NSMakeRange(0, 0);
+ __block NSRange range = NSMakeRange(0, 0);
if ([self respondsToSelector:@selector(numberOfTextRangesOnPage:)] &&
[self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
NSInteger i, iMax = [self numberOfTextRangesOnPage:page];
for (i = 0; i < iMax; i++)
@@ -588,11 +588,9 @@
} else if ([self
respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
NSIndexSet *indexes = [self indexOfCharactersOnPage:page];
if (indexes) {
- NSUInteger idx = [indexes firstIndex];
- while (idx != NSNotFound) {
+ [indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL
*stop) {
range =
addSpecifierWithCharacterRangeAndPageOrAppendRange(ranges, NSMakeRange(idx, 1),
range, page);
- idx = [indexes indexGreaterThanIndex:idx];
- }
+ }];
}
} else if ([self respondsToSelector:@selector(numberOfRangesOnPage:)]
&& [self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
NSInteger i, iMax = [self numberOfRangesOnPage:page];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2012-10-19 17:29:39 UTC (rev 7737)
+++ trunk/SKMainWindowController.m 2012-10-19 21:15:15 UTC (rev 7738)
@@ -1141,16 +1141,13 @@
- (NSArray *)selectedNotes {
NSMutableArray *selectedNotes = [NSMutableArray array];
NSIndexSet *rowIndexes = [rightSideController.noteOutlineView
selectedRowIndexes];
- NSUInteger row = [rowIndexes firstIndex];
- id item = nil;
- while (row != NSNotFound) {
- item = [rightSideController.noteOutlineView itemAtRow:row];
+ [rowIndexes enumerateIndexesUsingBlock:^(NSUInteger row, BOOL *stop) {
+ id item = [rightSideController.noteOutlineView itemAtRow:row];
if ([item type] == nil)
item = [(SKNoteText *)item note];
if ([selectedNotes containsObject:item] == NO)
[selectedNotes addObject:item];
- row = [rowIndexes indexGreaterThanIndex:row];
- }
+ }];
return selectedNotes;
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2012-10-19 17:29:39 UTC (rev 7737)
+++ trunk/SKMainWindowController_UI.m 2012-10-19 21:15:15 UTC (rev 7738)
@@ -473,21 +473,18 @@
}
} else if ([tv isEqual:leftSideController.findTableView]) {
NSMutableString *string = [NSMutableString string];
- NSUInteger idx = [rowIndexes firstIndex];
- while (idx != NSNotFound) {
+ [rowIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
PDFSelection *match = [searchResults objectAtIndex:idx];
[string appendString:@"* "];
[string appendFormat:NSLocalizedString(@"Page %@", @""), [match
firstPageLabel]];
[string appendFormat:@": %@\n", [[match contextString] string]];
- idx = [rowIndexes indexGreaterThanIndex:idx];
- }
+ }];
NSPasteboard *pboard = [NSPasteboard generalPasteboard];
[pboard clearContents];
[pboard writeObjects:[NSArray arrayWithObjects:string, nil]];
} else if ([tv isEqual:leftSideController.groupedFindTableView]) {
NSMutableString *string = [NSMutableString string];
- NSUInteger idx = [rowIndexes firstIndex];
- while (idx != NSNotFound) {
+ [rowIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
SKGroupedSearchResult *result = [groupedSearchResults
objectAtIndex:idx];
NSArray *matches = [result matches];
[string appendString:@"* "];
@@ -495,8 +492,7 @@
[string appendString:@": "];
[string appendFormat:NSLocalizedString(@"%ld Results", @""),
(long)[matches count]];
[string appendFormat:@":\n\t%@\n", [[matches
valueForKeyPath:@"contextString.string"] componentsJoinedByString:@"\n\t"]];
- idx = [rowIndexes indexGreaterThanIndex:idx];
- }
+ }];
NSPasteboard *pboard = [NSPasteboard generalPasteboard];
[pboard clearContents];
[pboard writeObjects:[NSArray arrayWithObjects:string, nil]];
@@ -1080,11 +1076,9 @@
if (row != -1) {
if ([rowIndexes containsIndex:row] == NO)
rowIndexes = [NSIndexSet indexSetWithIndex:row];
- NSUInteger rowIdx = [rowIndexes firstIndex];
- while (rowIdx != NSNotFound) {
+ [rowIndexes enumerateIndexesUsingBlock:^(NSUInteger rowIdx, BOOL
*stop) {
[items addObject:[rightSideController.noteOutlineView
itemAtRow:rowIdx]];
- rowIdx = [rowIndexes indexGreaterThanIndex:rowIdx];
- }
+ }];
if ([self outlineView:rightSideController.noteOutlineView
canDeleteItems:items]) {
item = [menu addItemWithTitle:NSLocalizedString(@"Delete",
@"Menu item title") action:@selector(deleteNotes:) target:self];
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2012-10-19 17:29:39 UTC (rev 7737)
+++ trunk/SKNotesDocument.m 2012-10-19 21:15:15 UTC (rev 7738)
@@ -728,11 +728,9 @@
if (row != -1) {
if ([rowIndexes containsIndex:row] == NO)
rowIndexes = [NSIndexSet indexSetWithIndex:row];
- NSUInteger rowIdx = [rowIndexes firstIndex];
- while (rowIdx != NSNotFound) {
+ [rowIndexes enumerateIndexesUsingBlock:^(NSUInteger rowIdx, BOOL
*stop) {
[items addObject:[outlineView itemAtRow:rowIdx]];
- rowIdx = [rowIndexes indexGreaterThanIndex:rowIdx];
- }
+ }];
if ([self outlineView:outlineView canCopyItems:items]) {
item = [menu addItemWithTitle:NSLocalizedString(@"Copy",
@"Menu item title") action:@selector(copyNotes:) target:self];
Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m 2012-10-19 17:29:39 UTC (rev 7737)
+++ trunk/SKOutlineView.m 2012-10-19 21:15:15 UTC (rev 7738)
@@ -58,12 +58,10 @@
- (NSArray *)selectedItems {
NSMutableArray *items = [NSMutableArray array];
NSIndexSet *indexes = [self selectedRowIndexes];
- NSUInteger idx = [indexes firstIndex];
- while (idx != NSNotFound) {
+ [indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
[items addObject:[self itemAtRow:idx]];
- idx = [indexes indexGreaterThanIndex:idx];
- }
+ }];
return items;
}
Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2012-10-19 17:29:39 UTC (rev 7737)
+++ trunk/SKTableView.m 2012-10-19 21:15:15 UTC (rev 7738)
@@ -231,20 +231,17 @@
NSRect visibleRect = [self visibleRect];
NSRange rowRange = [self rowsInRect:visibleRect];
NSIndexSet *columnIndexes = [self columnIndexesInRect:visibleRect];
- NSUInteger row, column;
- NSTableColumn *tableColumn;
+ NSUInteger row;
for (row = rowRange.location; row < NSMaxRange(rowRange); row++) {
if ([[self delegate] tableView:self
hasImageContextForTableColumn:nil row:row]) {
[self addTrackingAreaForColumn:-1 row:row];
} else {
- column = [columnIndexes firstIndex];
- while (column != NSNotFound) {
- tableColumn = [[self tableColumns] objectAtIndex:column];
+ [columnIndexes enumerateIndexesUsingBlock:^(NSUInteger column,
BOOL *stop) {
+ NSTableColumn *tableColumn = [[self tableColumns]
objectAtIndex:column];
if ([[self delegate] tableView:self
hasImageContextForTableColumn:tableColumn row:row])
[self addTrackingAreaForColumn:column row:row];
- column = [columnIndexes indexGreaterThanIndex:column];
- }
+ }];
}
}
}
Modified: trunk/SKTocOutlineView.m
===================================================================
--- trunk/SKTocOutlineView.m 2012-10-19 17:29:39 UTC (rev 7737)
+++ trunk/SKTocOutlineView.m 2012-10-19 21:15:15 UTC (rev 7738)
@@ -155,8 +155,7 @@
NSRect visibleRect = [self visibleRect];
NSRange rowRange = [self rowsInRect:visibleRect];
NSIndexSet *columnIndexes = [self columnIndexesInRect:visibleRect];
- NSUInteger row, column;
- NSTableColumn *tableColumn;
+ NSUInteger row;
id item;
for (row = rowRange.location; row < NSMaxRange(rowRange); row++) {
@@ -164,13 +163,11 @@
if ([[self delegate] outlineView:self
hasImageContextForTableColumn:nil item:item]) {
[self addTrackingAreaForColumn:-1 row:row];
} else {
- column = [columnIndexes firstIndex];
- while (column != NSNotFound) {
- tableColumn = [[self tableColumns] objectAtIndex:column];
+ [columnIndexes enumerateIndexesUsingBlock:^(NSUInteger column,
BOOL *stop) {
+ NSTableColumn *tableColumn = [[self tableColumns]
objectAtIndex:column];
if ([[self delegate] outlineView:self
hasImageContextForTableColumn:tableColumn item:item])
[self addTrackingAreaForColumn:column row:row];
- column = [columnIndexes indexGreaterThanIndex:column];
- }
+ }];
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
