Revision: 14635
http://sourceforge.net/p/skim-app/code/14635
Author: hofman
Date: 2024-11-03 22:11:29 +0000 (Sun, 03 Nov 2024)
Log Message:
-----------
use else for excluding conditions
Modified Paths:
--------------
trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2024-11-03 10:05:09 UTC
(rev 14634)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2024-11-03 22:11:29 UTC
(rev 14635)
@@ -489,9 +489,7 @@
[self setStartLineStyle:[startLineStyle integerValue]];
if ([endLineStyle respondsToSelector:@selector(integerValue)])
[self setEndLineStyle:[endLineStyle integerValue]];
- }
-
- if ([type isEqualToString:SKNFreeTextString]) {
+ } else if ([type isEqualToString:SKNFreeTextString]) {
Class fontClass = [PDFKitPlatformFont class];
PDFKitPlatformFont *font = [dict
objectForKey:SKNPDFAnnotationFontKey];
PDFKitPlatformColor *fontColor = [dict
objectForKey:SKNPDFAnnotationFontColorKey];
@@ -510,9 +508,7 @@
[self setFontColor:SKNColorFromArray((NSArray *)fontColor)];
if ([alignment respondsToSelector:@selector(integerValue)])
[self setAlignment:SKNTextAlignmentFromAlignment([alignment
integerValue])];
- }
-
- if ([type isEqualToString:SKNHighlightString] || [type
isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString]
|| [type isEqualToString:SKNStrikeOutString] || [type
isEqualToString:SKNSquigglyString]) {
+ } else if ([type isEqualToString:SKNHighlightString] || [type
isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString]
|| [type isEqualToString:SKNStrikeOutString] || [type
isEqualToString:SKNSquigglyString]) {
NSArray *pointStrings = [dict
objectForKey:SKNPDFAnnotationQuadrilateralPointsKey];
NSMutableArray *pointValues = [[NSMutableArray alloc]
initWithCapacity:[pointStrings count]];
NSUInteger i, iMax = [pointStrings count];
@@ -522,9 +518,7 @@
[pointValues addObject:val];
}
[self setQuadrilateralPoints:pointValues];
- }
-
- if ([type isEqualToString:SKNTextString] || [type
isEqualToString:SKNStampString] || [type isEqualToString:SKNNoteString]) {
+ } else if ([type isEqualToString:SKNTextString] || [type
isEqualToString:SKNStampString] || [type isEqualToString:SKNNoteString]) {
NSString *name = [dict objectForKey:SKNPDFAnnotationNameKey];
NSNumber *iconType = [dict
objectForKey:SKNPDFAnnotationIconTypeKey];
if ([iconType respondsToSelector:@selector(integerValue)])
@@ -531,9 +525,7 @@
[self setIconType:[iconType integerValue]];
if ([name isKindOfClass:stringClass])
[self setStampName:name];
- }
-
- if ([type isEqualToString:SKNInkString]) {
+ } else if ([type isEqualToString:SKNInkString]) {
NSArray *pointLists = [dict
objectForKey:SKNPDFAnnotationPointListsKey];
if ([pointLists isKindOfClass:arrayClass]) {
NSUInteger i, iMax = [pointLists count];
@@ -546,9 +538,7 @@
}
}
}
- }
-
- if ([type isEqualToString:SKNWidgetString]) {
+ } else if ([type isEqualToString:SKNWidgetString]) {
SKNPDFWidgetType widgetType = [[dict
objectForKey:SKNPDFAnnotationWidgetTypeKey] integerValue];
NSString *fieldName = [dict
objectForKey:SKNPDFAnnotationFieldNameKey];
NSString *stringValue = [dict
objectForKey:SKNPDFAnnotationStringValueKey];
@@ -696,16 +686,12 @@
color = SKNColorFromAnnotationValue(value);
if (color)
[dict setValue:color forKey:SKNPDFAnnotationInteriorColorKey];
- }
-
- if ([type isEqualToString:SKNTextString] || [type
isEqualToString:SKNNoteString]) {
+ } else if ([type isEqualToString:SKNTextString] || [type
isEqualToString:SKNNoteString]) {
if ([self respondsToSelector:@selector(iconType)])
[dict setValue:[NSNumber numberWithInteger:[(id)self
iconType]] forKey:SKNPDFAnnotationIconTypeKey];
else if ((value = [self valueForAnnotationKey:@"/Name"]))
[dict setValue:[NSNumber
numberWithInteger:SKNIconTypeFromAnnotationValue(value)]
forKey:SKNPDFAnnotationIconTypeKey];
- }
-
- if ([type isEqualToString:SKNStampString]) {
+ } else if ([type isEqualToString:SKNStampString]) {
if ([self respondsToSelector:@selector(stampName)])
value = [self stampName];
else
@@ -720,9 +706,7 @@
}
}
[dict setValue:appearanceImageForAnnotation(self)
forKey:SKNPDFAnnotationImageKey];
- }
-
- if ([type isEqualToString:SKNLineString]) {
+ } else if ([type isEqualToString:SKNLineString]) {
if ([self respondsToSelector:@selector(startLineStyle)] && [self
respondsToSelector:@selector(endLineStyle)]) {
[dict setValue:[NSNumber numberWithInteger:[(id)self
startLineStyle]] forKey:SKNPDFAnnotationStartLineStyleKey];
[dict setValue:[NSNumber numberWithInteger:[(id)self
endLineStyle]] forKey:SKNPDFAnnotationStartLineStyleKey];
@@ -744,9 +728,7 @@
[dict setValue:SKNStringFromPoint(p)
forKey:SKNPDFAnnotationEndPointKey];
}
}
- }
-
- if ([type isEqualToString:SKNHighlightString] || [type
isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString]
|| [type isEqualToString:SKNStrikeOutString] || [type
isEqualToString:SKNSquigglyString]) {
+ } else if ([type isEqualToString:SKNHighlightString] || [type
isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString]
|| [type isEqualToString:SKNStrikeOutString] || [type
isEqualToString:SKNSquigglyString]) {
if ([self respondsToSelector:@selector(quadrilateralPoints)]) {
NSArray *quadPoints = [(id)self quadrilateralPoints];
if (quadPoints) {
@@ -778,9 +760,7 @@
[dict setValue:quadPoints
forKey:SKNPDFAnnotationQuadrilateralPointsKey];
}
}
- }
-
- if ([type isEqualToString:SKNInkString]) {
+ } else if ([type isEqualToString:SKNInkString]) {
if ([self respondsToSelector:@selector(paths)]) {
NSArray *paths = [(id)self paths];
if (paths) {
@@ -828,9 +808,7 @@
[dict setValue:pointLists
forKey:SKNPDFAnnotationPointListsKey];
}
}
- }
-
- if ([type isEqualToString:SKNFreeTextString]) {
+ } else if ([type isEqualToString:SKNFreeTextString]) {
if ([self respondsToSelector:@selector(alignment)]) {
[dict setValue:[NSNumber
numberWithInteger:SKNTextAlignmentFromAlignment([(id)self alignment])]
forKey:SKNPDFAnnotationAlignmentKey];
} else if ((value = [self valueForAnnotationKey:@"/Q"])) {
@@ -884,9 +862,7 @@
}
if (fontColor)
[dict setObject:fontColor forKey:SKNPDFAnnotationFontColorKey];
- }
-
- if ([type isEqualToString:SKNWidgetString]) {
+ } else if ([type isEqualToString:SKNWidgetString]) {
[dict removeObjectForKey:SKNPDFAnnotationContentsKey];
[dict removeObjectForKey:SKNPDFAnnotationColorKey];
[dict removeObjectForKey:SKNPDFAnnotationModificationDateKey];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
