Revision: 4454
http://skim-app.svn.sourceforge.net/skim-app/?rev=4454&view=rev
Author: hofman
Date: 2008-08-26 19:01:27 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
Type objects in indexed to-many accessors.
Modified Paths:
--------------
trunk/SKDownloadController.h
trunk/SKDownloadController.m
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKNotesDocument.h
trunk/SKNotesDocument.m
trunk/SKPDFDocument.h
trunk/SKPDFDocument.m
Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h 2008-08-26 18:19:01 UTC (rev 4453)
+++ trunk/SKDownloadController.h 2008-08-26 19:01:27 UTC (rev 4454)
@@ -38,7 +38,7 @@
#import <Cocoa/Cocoa.h>
[EMAIL PROTECTED] SKTableView;
[EMAIL PROTECTED] SKTableView, SKDownload;
@interface SKDownloadController : NSWindowController {
IBOutlet NSArrayController *arrayController;
@@ -60,9 +60,9 @@
- (IBAction)dismissDownloadsPreferences:(id)sender;
- (NSArray *)downloads;
-- (unsigned)countOfDownloads;
-- (id)objectInDownloadsAtIndex:(unsigned)anIndex;
-- (void)insertObject:(id)obj inDownloadsAtIndex:(unsigned)anIndex;
-- (void)removeObjectFromDownloadsAtIndex:(unsigned)anIndex;
+- (unsigned int)countOfDownloads;
+- (SKDownload *)objectInDownloadsAtIndex:(unsigned int)anIndex;
+- (void)insertObject:(SKDownload *)download inDownloadsAtIndex:(unsigned
int)anIndex;
+- (void)removeObjectFromDownloadsAtIndex:(unsigned int)anIndex;
@end
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2008-08-26 18:19:01 UTC (rev 4453)
+++ trunk/SKDownloadController.m 2008-08-26 19:01:27 UTC (rev 4454)
@@ -112,21 +112,21 @@
return [[downloads copy] autorelease];
}
-- (unsigned)countOfDownloads {
+- (unsigned int)countOfDownloads {
return [downloads count];
}
-- (id)objectInDownloadsAtIndex:(unsigned)anIndex {
+- (SKDownload *)objectInDownloadsAtIndex:(unsigned int)anIndex {
return [downloads objectAtIndex:anIndex];
}
-- (void)insertObject:(id)obj inDownloadsAtIndex:(unsigned)anIndex {
- [downloads insertObject:obj atIndex:anIndex];
+- (void)insertObject:(SKDownload *)download inDownloadsAtIndex:(unsigned
int)anIndex {
+ [downloads insertObject:download atIndex:anIndex];
[downloads
makeObjectsPerformSelector:@selector(removeProgressIndicatorFromSuperview)];
[tableView reloadData];
}
-- (void)removeObjectFromDownloadsAtIndex:(unsigned)anIndex {
+- (void)removeObjectFromDownloadsAtIndex:(unsigned int)anIndex {
SKDownload *download = [downloads objectAtIndex:anIndex];
[download setDelegate:nil];
[download cancel];
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2008-08-26 18:19:01 UTC (rev 4453)
+++ trunk/SKMainWindowController.h 2008-08-26 19:01:27 UTC (rev 4454)
@@ -83,7 +83,7 @@
extern NSString *SKMainWindowPageColumnIdentifer;
[EMAIL PROTECTED] PDFOutline, SKThumbnail;
[EMAIL PROTECTED] PDFAnnotation, PDFOutline, PDFSelection, SKThumbnail,
SKGroupedSearchResult;
@class SKPDFView, SKSecondaryPDFView, SKTocOutlineView, SKNoteOutlineView,
SKThumbnailTableView, SKSnapshotTableView, SKSplitView, BDSKCollapsibleView,
BDSKEdgeView, BDSKGradientView, SKColorSwatch, SKStatusBar;
@class SKFullScreenWindow, SKNavigationWindow, SKSideWindow,
SKSnapshotWindowController, SKProgressController, SKPageSheetController,
SKScaleSheetController, SKPasswordSheetController, SKBookmarkSheetController;
@@ -355,36 +355,36 @@
- (NSArray *)notes;
- (void)setNotes:(NSArray *)newNotes;
-- (unsigned)countOfNotes;
-- (id)objectInNotesAtIndex:(unsigned)index;
-- (void)insertObject:(id)obj inNotesAtIndex:(unsigned)index;
-- (void)removeObjectFromNotesAtIndex:(unsigned)index;
+- (unsigned int)countOfNotes;
+- (PDFAnnotation *)objectInNotesAtIndex:(unsigned int)theIndex;
+- (void)insertObject:(PDFAnnotation *)note inNotesAtIndex:(unsigned
int)theIndex;
+- (void)removeObjectFromNotesAtIndex:(unsigned int)theIndex;
-- (unsigned)countOfThumbnails;
-- (id)objectInThumbnailsAtIndex:(unsigned)theIndex;
-- (void)insertObject:(id)obj inThumbnailsAtIndex:(unsigned)theIndex;
-- (void)removeObjectFromThumbnailsAtIndex:(unsigned)theIndex;
+- (unsigned int)countOfThumbnails;
+- (SKThumbnail *)objectInThumbnailsAtIndex:(unsigned int)theIndex;
+- (void)insertObject:(SKThumbnail *)thumbnail inThumbnailsAtIndex:(unsigned
int)theIndex;
+- (void)removeObjectFromThumbnailsAtIndex:(unsigned int)theIndex;
- (NSArray *)snapshots;
- (void)setSnapshots:(NSArray *)newSnapshots;
-- (unsigned)countOfSnapshots;
-- (id)objectInSnapshotsAtIndex:(unsigned)theIndex;
-- (void)insertObject:(id)obj inSnapshotsAtIndex:(unsigned)theIndex;
-- (void)removeObjectFromSnapshotsAtIndex:(unsigned)theIndex;
+- (unsigned int)countOfSnapshots;
+- (SKSnapshotWindowController *)objectInSnapshotsAtIndex:(unsigned
int)theIndex;
+- (void)insertObject:(SKSnapshotWindowController *)snapshot
inSnapshotsAtIndex:(unsigned int)theIndex;
+- (void)removeObjectFromSnapshotsAtIndex:(unsigned int)theIndex;
- (NSArray *)searchResults;
- (void)setSearchResults:(NSArray *)newSearchResults;
-- (unsigned)countOfSearchResults;
-- (id)objectInSearchResultsAtIndex:(unsigned)theIndex;
-- (void)insertObject:(id)obj inSearchResultsAtIndex:(unsigned)theIndex;
-- (void)removeObjectFromSearchResultsAtIndex:(unsigned)theIndex;
+- (unsigned int)countOfSearchResults;
+- (PDFSelection *)objectInSearchResultsAtIndex:(unsigned int)theIndex;
+- (void)insertObject:(PDFSelection *)searchResult
inSearchResultsAtIndex:(unsigned int)theIndex;
+- (void)removeObjectFromSearchResultsAtIndex:(unsigned int)theIndex;
- (NSArray *)groupedSearchResults;
- (void)setGroupedSearchResults:(NSArray *)newGroupedSearchResults;
-- (unsigned)countOfGroupedSearchResults;
-- (id)objectInGroupedSearchResultsAtIndex:(unsigned)theIndex;
-- (void)insertObject:(id)obj inGroupedSearchResultsAtIndex:(unsigned)theIndex;
-- (void)removeObjectFromGroupedSearchResultsAtIndex:(unsigned)theIndex;
+- (unsigned int)countOfGroupedSearchResults;
+- (SKGroupedSearchResult *)objectInGroupedSearchResultsAtIndex:(unsigned
int)theIndex;
+- (void)insertObject:(SKGroupedSearchResult *)groupedSearchResult
inGroupedSearchResultsAtIndex:(unsigned int)theIndex;
+- (void)removeObjectFromGroupedSearchResultsAtIndex:(unsigned int)theIndex;
- (NSArray *)selectedNotes;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-08-26 18:19:01 UTC (rev 4453)
+++ trunk/SKMainWindowController.m 2008-08-26 19:01:27 UTC (rev 4454)
@@ -1016,22 +1016,22 @@
[noteOutlineView reloadData];
}
-- (unsigned)countOfNotes {
+- (unsigned int)countOfNotes {
return [notes count];
}
-- (id)objectInNotesAtIndex:(unsigned)theIndex {
+- (PDFAnnotation *)objectInNotesAtIndex:(unsigned int)theIndex {
return [notes objectAtIndex:theIndex];
}
-- (void)insertObject:(id)obj inNotesAtIndex:(unsigned)theIndex {
- [notes insertObject:obj atIndex:theIndex];
+- (void)insertObject:(PDFAnnotation *)note inNotesAtIndex:(unsigned
int)theIndex {
+ [notes insertObject:note atIndex:theIndex];
// Start observing the just-inserted notes so that, when they're changed,
we can record undo operations.
- [self startObservingNotes:[NSArray arrayWithObject:obj]];
+ [self startObservingNotes:[NSArray arrayWithObject:note]];
}
-- (void)removeObjectFromNotesAtIndex:(unsigned)theIndex {
+- (void)removeObjectFromNotesAtIndex:(unsigned int)theIndex {
PDFAnnotation *note = [notes objectAtIndex:theIndex];
NSEnumerator *wcEnum = [[[self document] windowControllers]
objectEnumerator];
NSWindowController *wc = [wcEnum nextObject];
@@ -1053,11 +1053,11 @@
[notes removeObjectAtIndex:theIndex];
}
-- (unsigned)countOfThumbnails {
+- (unsigned int)countOfThumbnails {
return [thumbnails count];
}
-- (id)objectInThumbnailsAtIndex:(unsigned)theIndex {
+- (SKThumbnail *)objectInThumbnailsAtIndex:(unsigned int)theIndex {
SKThumbnail *thumbnail = [thumbnails objectAtIndex:theIndex];
if ([thumbnail isDirty] && NO == isAnimating && NO == [thumbnailTableView
isScrolling] && [[pdfView document] isLocked] == NO) {
@@ -1080,11 +1080,11 @@
return thumbnail;
}
-- (void)insertObject:(id)obj inThumbnailsAtIndex:(unsigned)theIndex {
- [thumbnails insertObject:obj atIndex:theIndex];
+- (void)insertObject:(SKThumbnail *)thumbnail inThumbnailsAtIndex:(unsigned
int)theIndex {
+ [thumbnails insertObject:thumbnail atIndex:theIndex];
}
-- (void)removeObjectFromThumbnailsAtIndex:(unsigned)theIndex {
+- (void)removeObjectFromThumbnailsAtIndex:(unsigned int)theIndex {
[thumbnails removeObjectAtIndex:theIndex];
}
@@ -1108,19 +1108,19 @@
[snapshots setArray:snapshots];
}
-- (unsigned)countOfSnapshots {
+- (unsigned int)countOfSnapshots {
return [snapshots count];
}
-- (id)objectInSnapshotsAtIndex:(unsigned)theIndex {
+- (SKSnapshotWindowController *)objectInSnapshotsAtIndex:(unsigned
int)theIndex {
return [snapshots objectAtIndex:theIndex];
}
-- (void)insertObject:(id)obj inSnapshotsAtIndex:(unsigned)theIndex {
- [snapshots insertObject:obj atIndex:theIndex];
+- (void)insertObject:(SKSnapshotWindowController *)snapshot
inSnapshotsAtIndex:(unsigned int)theIndex {
+ [snapshots insertObject:snapshot atIndex:theIndex];
}
-- (void)removeObjectFromSnapshotsAtIndex:(unsigned)theIndex {
+- (void)removeObjectFromSnapshotsAtIndex:(unsigned int)theIndex {
[dirtySnapshots removeObject:[snapshots objectAtIndex:theIndex]];
[snapshots removeObjectAtIndex:theIndex];
}
@@ -1149,19 +1149,19 @@
[searchResults setArray:newSearchResults];
}
-- (unsigned)countOfSearchResults {
+- (unsigned int)countOfSearchResults {
return [searchResults count];
}
-- (id)objectInSearchResultsAtIndex:(unsigned)theIndex {
+- (PDFSelection *)objectInSearchResultsAtIndex:(unsigned int)theIndex {
return [searchResults objectAtIndex:theIndex];
}
-- (void)insertObject:(id)obj inSearchResultsAtIndex:(unsigned)theIndex {
- [searchResults insertObject:obj atIndex:theIndex];
+- (void)insertObject:(PDFSelection *)searchResult
inSearchResultsAtIndex:(unsigned int)theIndex {
+ [searchResults insertObject:searchResult atIndex:theIndex];
}
-- (void)removeObjectFromSearchResultsAtIndex:(unsigned)theIndex {
+- (void)removeObjectFromSearchResultsAtIndex:(unsigned int)theIndex {
[searchResults removeObjectAtIndex:theIndex];
}
@@ -1173,19 +1173,19 @@
[groupedSearchResults setArray:newGroupedSearchResults];
}
-- (unsigned)countOfGroupedSearchResults {
+- (unsigned int)countOfGroupedSearchResults {
return [groupedSearchResults count];
}
-- (id)objectInGroupedSearchResultsAtIndex:(unsigned)theIndex {
+- (SKGroupedSearchResult *)objectInGroupedSearchResultsAtIndex:(unsigned
int)theIndex {
return [groupedSearchResults objectAtIndex:theIndex];
}
-- (void)insertObject:(id)obj inGroupedSearchResultsAtIndex:(unsigned)theIndex {
- [groupedSearchResults insertObject:obj atIndex:theIndex];
+- (void)insertObject:(SKGroupedSearchResult *)groupedSearchResult
inGroupedSearchResultsAtIndex:(unsigned int)theIndex {
+ [groupedSearchResults insertObject:groupedSearchResult atIndex:theIndex];
}
-- (void)removeObjectFromGroupedSearchResultsAtIndex:(unsigned)theIndex {
+- (void)removeObjectFromGroupedSearchResultsAtIndex:(unsigned int)theIndex {
[groupedSearchResults removeObjectAtIndex:theIndex];
}
Modified: trunk/SKNotesDocument.h
===================================================================
--- trunk/SKNotesDocument.h 2008-08-26 18:19:01 UTC (rev 4453)
+++ trunk/SKNotesDocument.h 2008-08-26 19:01:27 UTC (rev 4454)
@@ -52,9 +52,9 @@
- (NSArray *)notes;
- (void)setNotes:(NSArray *)newNotes;
-- (unsigned)countOfNotes;
-- (id)objectInNotesAtIndex:(unsigned)index;
-- (void)insertObject:(id)obj inNotesAtIndex:(unsigned)index;
-- (void)removeObjectFromNotesAtIndex:(unsigned)index;
+- (unsigned int)countOfNotes;
+- (NSDictionary *)objectInNotesAtIndex:(unsigned int)index;
+- (void)insertObject:(NSDictionary *)note inNotesAtIndex:(unsigned int)index;
+- (void)removeObjectFromNotesAtIndex:(unsigned int)index;
@end
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2008-08-26 18:19:01 UTC (rev 4453)
+++ trunk/SKNotesDocument.m 2008-08-26 19:01:27 UTC (rev 4454)
@@ -337,19 +337,19 @@
[notes setArray:notes];
}
-- (unsigned)countOfNotes {
+- (unsigned int)countOfNotes {
return [notes count];
}
-- (id)objectInNotesAtIndex:(unsigned)theIndex {
+- (NSDictionary *)objectInNotesAtIndex:(unsigned int)theIndex {
return [notes objectAtIndex:theIndex];
}
-- (void)insertObject:(id)obj inNotesAtIndex:(unsigned)theIndex {
- [notes insertObject:obj atIndex:theIndex];
+- (void)insertObject:(NSDictionary *)note inNotesAtIndex:(unsigned
int)theIndex {
+ [notes insertObject:note atIndex:theIndex];
}
-- (void)removeObjectFromNotesAtIndex:(unsigned)theIndex {
+- (void)removeObjectFromNotesAtIndex:(unsigned int)theIndex {
[notes removeObjectAtIndex:theIndex];
}
Modified: trunk/SKPDFDocument.h
===================================================================
--- trunk/SKPDFDocument.h 2008-08-26 18:19:01 UTC (rev 4453)
+++ trunk/SKPDFDocument.h 2008-08-26 19:01:27 UTC (rev 4454)
@@ -120,11 +120,11 @@
- (unsigned int)countOfPages;
- (PDFPage *)objectInPagesAtIndex:(unsigned int)index;
- (NSArray *)notes;
-- (void)insertInNotes:(id)newNote;
-- (void)insertInNotes:(id)newNote atIndex:(unsigned int)index;
-- (void)removeFromNotesAtIndex:(unsigned int)index;
+- (void)insertInNotes:(PDFAnnotation *)newNote;
+- (void)insertObject:(PDFAnnotation *)newNote inNotesAtIndex:(unsigned
int)anIndex;
+- (void)removeObjectFromNotesAtIndex:(unsigned int)anIndex;
- (unsigned int)countOfLines;
-- (SKLine *)objectInLinesAtIndex:(unsigned int)index;
+- (SKLine *)objectInLinesAtIndex:(unsigned int)anIndex;
- (PDFPage *)currentPage;
- (void)setCurrentPage:(PDFPage *)page;
- (id)activeNote;
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-08-26 18:19:01 UTC (rev 4453)
+++ trunk/SKPDFDocument.m 2008-08-26 19:01:27 UTC (rev 4454)
@@ -1730,7 +1730,7 @@
return [[self mainWindowController] notes];
}
-- (void)insertInNotes:(id)newNote {
+- (void)insertInNotes:(PDFAnnotation *)newNote {
PDFPage *page = [newNote page];
if (page && [[page annotations] containsObject:newNote] == NO) {
SKPDFView *pdfView = [self pdfView];
@@ -1740,11 +1740,11 @@
}
}
-- (void)insertInNotes:(id)newNote atIndex:(unsigned int)anIndex {
+- (void)insertObject:(PDFAnnotation *)newNote inNotesAtIndex:(unsigned
int)anIndex {
[self insertInNotes:newNote];
}
-- (void)removeFromNotesAtIndex:(unsigned int)anIndex {
+- (void)removeObjectFromNotesAtIndex:(unsigned int)anIndex {
PDFAnnotation *note = [[self notes] objectAtIndex:anIndex];
[[self pdfView] removeAnnotation:note];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
