[Skim-app-commit] SF.net SVN: skim-app:[13982] trunk/SKMainWindowContro ller.m

[hofman--- via Skim-app-commit]

Revision: 13982
          http://sourceforge.net/p/skim-app/code/13982
Author:   hofman
Date:     2023-12-24 22:24:30 +0000 (Sun, 24 Dec 2023)
Log Message:
-----------
create search results array when needed, synthesize getters for arrays

Modified Paths:
--------------
    trunk/SKMainWindowController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2023-12-24 22:18:21 UTC (rev 13981)
+++ trunk/SKMainWindowController.m      2023-12-24 22:24:30 UTC (rev 13982)
@@ -216,8 +216,8 @@
 
 @implementation SKMainWindowController
 
-@synthesize mainWindow, splitView, centerContentView, pdfSplitView, 
pdfContentView, statusBar, pdfView, secondaryPdfView, leftSideController, 
rightSideController, toolbarController, leftSideContentView, 
rightSideContentView, presentationNotesDocument, presentationNotesOffset, tags, 
rating, pageLabel, interactionMode, placeholderPdfDocument;
-@dynamic pdfDocument, notes, thumbnails, snapshots, searchResults, 
groupedSearchResults, presentationOptions, presentationUndoManager, 
selectedNotes, hasNotes, widgetProperties, autoScales, leftSidePaneState, 
rightSidePaneState, findPaneState, leftSidePaneIsOpen, rightSidePaneIsOpen, 
recentInfoNeedsUpdate, searchString, hasOverview, notesMenu;
+@synthesize mainWindow, splitView, centerContentView, pdfSplitView, 
pdfContentView, statusBar, pdfView, secondaryPdfView, leftSideController, 
rightSideController, toolbarController, leftSideContentView, 
rightSideContentView, presentationNotesDocument, presentationNotesOffset, 
notes, thumbnails, snapshots, searchResults, groupedSearchResults, tags, 
rating, pageLabel, interactionMode, placeholderPdfDocument;
+@dynamic pdfDocument, presentationOptions, presentationUndoManager, 
selectedNotes, hasNotes, widgetProperties, autoScales, leftSidePaneState, 
rightSidePaneState, findPaneState, leftSidePaneIsOpen, rightSidePaneIsOpen, 
recentInfoNeedsUpdate, searchString, hasOverview, notesMenu;
 
 + (void)initialize {
     SKINITIALIZE;
@@ -231,7 +231,7 @@
     if (self) {
         NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
         interactionMode = SKNormalMode;
-        searchResults = [[NSMutableArray alloc] init];
+        searchResults = nil;
         searchResultIndex = 0;
         memset(&mwcFlags, 0, sizeof(mwcFlags));
         mwcFlags.fullSizeContent = NO == [sud 
boolForKey:SKDisableSearchBarBlurringKey];
@@ -238,7 +238,7 @@
         mwcFlags.caseInsensitiveSearch = [sud 
boolForKey:SKCaseInsensitiveSearchKey];
         mwcFlags.wholeWordSearch = [sud boolForKey:SKWholeWordSearchKey];
         mwcFlags.caseInsensitiveFilter = [sud 
boolForKey:SKCaseInsensitiveFilterKey];
-        groupedSearchResults = [[NSMutableArray alloc] init];
+        groupedSearchResults = nil;
         thumbnails = [[NSMutableArray alloc] init];
         notes = [[NSMutableArray alloc] init];
         tags = [[NSArray alloc] init];
@@ -1293,10 +1293,6 @@
     return NO;
 }
 
-- (NSArray *)notes {
-    return notes;
-}
-
 - (void)insertObject:(PDFAnnotation *)note inNotesAtIndex:(NSUInteger)theIndex 
{
     [notes insertObject:note atIndex:theIndex];
 
@@ -1347,10 +1343,6 @@
     }
 }
 
-- (NSArray *)thumbnails {
-    return thumbnails;
-}
-
 - (void)setThumbnails:(NSArray *)newThumbnails {
     [thumbnails setValue:nil forKey:@"delegate"];
     [thumbnails setArray:newThumbnails];
@@ -1357,10 +1349,6 @@
     [thumbnails setValue:self forKey:@"delegate"];
 }
 
-- (NSArray *)snapshots {
-    return snapshots;
-}
-
 - (void)insertObject:(SKSnapshotWindowController *)snapshot 
inSnapshotsAtIndex:(NSUInteger)theIndex {
     [snapshots insertObject:snapshot atIndex:theIndex];
 }
@@ -1406,20 +1394,12 @@
     [rightSideController.noteOutlineView selectRowIndexes:rowIndexes 
byExtendingSelection:NO];
 }
 
-- (NSArray *)searchResults {
-    return searchResults;
-}
-
 - (void)setSearchResults:(NSArray *)newSearchResults {
-    [searchResults setArray:newSearchResults];
+    searchResults = [newSearchResults mutableCopy];
 }
 
-- (NSArray *)groupedSearchResults {
-    return groupedSearchResults;
-}
-
 - (void)setGroupedSearchResults:(NSArray *)newGroupedSearchResults {
-    [groupedSearchResults setArray:newGroupedSearchResults];
+    groupedSearchResults = [newGroupedSearchResults mutableCopy];
 }
 
 - (NSDictionary *)presentationOptions {
@@ -1978,8 +1958,8 @@
 
 - (void)documentDidBeginDocumentFind:(NSNotification *)note {
     [leftSideController 
applySearchTableHeader:[NSLocalizedString(@"Searching", @"Message in search 
table header") stringByAppendingEllipsis]];
-    [self setSearchResults:nil];
-    [self setGroupedSearchResults:nil];
+    [self setSearchResults:@[]];
+    [self setGroupedSearchResults:@[]];
     [statusBar setProgressIndicatorStyle:SKProgressIndicatorStyleDeterminate];
     [[statusBar progressIndicator] setMaxValue:[[note object] pageCount]];
     [[statusBar progressIndicator] setDoubleValue:0.0];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit