[Skim-app-commit] SF.net SVN: skim-app:[15392] trunk/SKMainWindowController.m

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

Revision: 15392
          http://sourceforge.net/p/skim-app/code/15392
Author:   hofman
Date:     2025-06-06 21:37:03 +0000 (Fri, 06 Jun 2025)
Log Message:
-----------
use inverted boolean variable

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2025-06-06 21:33:50 UTC (rev 15391)
+++ trunk/SKMainWindowController.m      2025-06-06 21:37:03 UTC (rev 15392)
@@ -1003,13 +1003,13 @@
 }
 
 - (void)addAnnotationsFromDictionaries:(NSArray *)noteDicts 
removeAnnotations:(NSArray *)notesToRemove {
-    BOOL isConvert = [notesToRemove count] > 0 && [[notesToRemove firstObject] 
isSkimNote] == NO;
+    BOOL isAddOrReplace = [notesToRemove count] == 0 || [[notesToRemove 
firstObject] isSkimNote];
     PDFDocument *pdfDoc = [pdfView document];
     NSMutableIndexSet *pageIndexes = [NSMutableIndexSet indexSet];
     
     if ([notesToRemove count]) {
         // notesToRemove is either [self notes], nil, or non Skim notes
-        if (isConvert == NO) {
+        if (isAddOrReplace) {
             [pdfView removePDFToolTipRects];
             // remove the current annotations
             [pdfView setCurrentAnnotation:nil];
@@ -1023,10 +1023,10 @@
             [pdfDoc removeAnnotation:annotation];
         }
         mwcFlags.addOrRemoveNotesInBulk = 0;
-        if (isConvert == NO)
+        if (isAddOrReplace)
             [self removeAllObjectsFromNotes];
     }
-    if (notesToRemove && isConvert == NO && [widgets count]) {
+    if (notesToRemove && isAddOrReplace && [widgets count]) {
         for (PDFAnnotation *widget in widgets) {
             id origValue = [widgetValues objectForKey:widget];
             if ([([widget objectValue] ?: @"") isEqual:(origValue ?: @"")] == 
NO)
@@ -1034,9 +1034,9 @@
         }
     }
     
-    [self addAnnotationsFromDictionaries:noteDicts toDocument:pdfDoc 
pageIndexes:pageIndexes autoUpdate:isConvert];
+    [self addAnnotationsFromDictionaries:noteDicts toDocument:pdfDoc 
pageIndexes:pageIndexes autoUpdate:isAddOrReplace == NO];
     
-    if (isConvert == NO) {
+    if (isAddOrReplace) {
         NSArray *widgetProperties = [noteDicts 
filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"type = 
\"Widget\""]];
         if ([widgetProperties count])
             [self changeWidgetsFromDictionaries:widgetProperties];

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