Revision: 5323
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5323&view=rev
Author:   hofman
Date:     2009-04-21 20:42:23 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
always assume the (un)archiver allows keyed coding, as it will always be the 
case

Modified Paths:
--------------
    trunk/SKColorSwatch.m
    trunk/SKFontWell.m
    trunk/SKLineWell.m

Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m       2009-04-18 23:40:35 UTC (rev 5322)
+++ trunk/SKColorSwatch.m       2009-04-21 20:42:23 UTC (rev 5323)
@@ -94,17 +94,10 @@
 
 - (id)initWithCoder:(NSCoder *)decoder {
     if (self = [super initWithCoder:decoder]) {
-        if ([decoder allowsKeyedCoding]) {
-            colors = [[NSMutableArray alloc] initWithArray:[decoder 
decodeObjectForKey:COLORS_KEY]];
-            action = NSSelectorFromString([decoder 
decodeObjectForKey:ACTION_KEY]);
-            target = [decoder decodeObjectForKey:TARGET_KEY];
-            autoResizes = [decoder decodeBoolForKey:AUTORESIZES_KEY];
-        } else {
-            colors = [[NSMutableArray alloc] initWithArray:[decoder 
decodeObject]];
-            action = NSSelectorFromString([decoder decodeObject]);
-            target = [decoder decodeObject];
-            [decoder decodeValueOfObjCType:@encode(BOOL) at:&autoResizes];
-        }
+        colors = [[NSMutableArray alloc] initWithArray:[decoder 
decodeObjectForKey:COLORS_KEY]];
+        action = NSSelectorFromString([decoder decodeObjectForKey:ACTION_KEY]);
+        target = [decoder decodeObjectForKey:TARGET_KEY];
+        autoResizes = [decoder decodeBoolForKey:AUTORESIZES_KEY];
         [self commonInit];
     }
     return self;
@@ -112,17 +105,10 @@
 
 - (void)encodeWithCoder:(NSCoder *)coder {
     [super encodeWithCoder:coder];
-    if ([coder allowsKeyedCoding]) {
-        [coder encodeObject:colors forKey:COLORS_KEY];
-        [coder encodeObject:NSStringFromSelector(action) forKey:ACTION_KEY];
-        [coder encodeConditionalObject:target forKey:TARGET_KEY];
-        [coder encodeBool:autoResizes forKey:AUTORESIZES_KEY];
-    } else {
-        [coder encodeObject:colors];
-        [coder encodeObject:NSStringFromSelector(action)];
-        [coder encodeConditionalObject:target];
-        [coder encodeValueOfObjCType:@encode(BOOL) at:&autoResizes];
-    }
+    [coder encodeObject:colors forKey:COLORS_KEY];
+    [coder encodeObject:NSStringFromSelector(action) forKey:ACTION_KEY];
+    [coder encodeConditionalObject:target forKey:TARGET_KEY];
+    [coder encodeBool:autoResizes forKey:AUTORESIZES_KEY];
 }
 
 - (void)dealloc {

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m  2009-04-18 23:40:35 UTC (rev 5322)
+++ trunk/SKFontWell.m  2009-04-21 20:42:23 UTC (rev 5323)
@@ -121,13 +121,8 @@
                        [self setCell:newCell];
                        [newCell release];
                }
-        if ([decoder allowsKeyedCoding]) {
-            action = NSSelectorFromString([decoder 
decodeObjectForKey:ACTION_KEY]);
-            target = [decoder decodeObjectForKey:TARGET_KEY];
-        } else {
-            action = NSSelectorFromString([decoder decodeObject]);
-            target = [decoder decodeObject];
-        }
+        action = NSSelectorFromString([decoder decodeObjectForKey:ACTION_KEY]);
+        target = [decoder decodeObjectForKey:TARGET_KEY];
         [self commonInit];
     }
     return self;
@@ -135,13 +130,8 @@
 
 - (void)encodeWithCoder:(NSCoder *)coder {
     [super encodeWithCoder:coder];
-    if ([coder allowsKeyedCoding]) {
-        [coder encodeObject:NSStringFromSelector(action) forKey:ACTION_KEY];
-        [coder encodeConditionalObject:target forKey:TARGET_KEY];
-    } else {
-        [coder encodeObject:NSStringFromSelector(action)];
-        [coder encodeConditionalObject:target];
-    }
+    [coder encodeObject:NSStringFromSelector(action) forKey:ACTION_KEY];
+    [coder encodeConditionalObject:target forKey:TARGET_KEY];
 }
 
 - (void)dealloc {
@@ -468,13 +458,8 @@
 
 - (id)initWithCoder:(NSCoder *)decoder {
        if (self = [super initWithCoder:decoder]) {
-        if ([decoder allowsKeyedCoding]) {
-            [self setTextColor:[decoder decodeObjectForKey:TEXTCOLOR_KEY]];
-            [self setHasTextColor:[decoder decodeBoolForKey:HASTEXTCOLOR_KEY]];
-        } else {
-            [self setTextColor:[decoder decodeObject]];
-            [decoder decodeValueOfObjCType:@encode(BOOL) at:&hasTextColor];
-               }
+        [self setTextColor:[decoder decodeObjectForKey:TEXTCOLOR_KEY]];
+        [self setHasTextColor:[decoder decodeBoolForKey:HASTEXTCOLOR_KEY]];
         [self commonInit];
        }
        return self;
@@ -482,13 +467,8 @@
 
 - (void)encodeWithCoder:(NSCoder *)coder {
     [super encodeWithCoder:coder];
-    if ([coder allowsKeyedCoding]) {
-        [coder encodeConditionalObject:textColor forKey:TEXTCOLOR_KEY];
-        [coder encodeObject:textColor forKey:HASTEXTCOLOR_KEY];
-    } else {
-        [coder encodeObject:textColor];
-        [coder encodeValueOfObjCType:@encode(BOOL) at:&hasTextColor];
-    }
+    [coder encodeConditionalObject:textColor forKey:TEXTCOLOR_KEY];
+    [coder encodeObject:textColor forKey:HASTEXTCOLOR_KEY];
 }
 
 - (void)dealloc {

Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m  2009-04-18 23:40:35 UTC (rev 5322)
+++ trunk/SKLineWell.m  2009-04-21 20:42:23 UTC (rev 5323)
@@ -102,27 +102,15 @@
 
 - (id)initWithCoder:(NSCoder *)decoder {
     if (self = [super initWithCoder:decoder]) {
-        if ([decoder allowsKeyedCoding]) {
-            lineWidth = [decoder decodeFloatForKey:SKLineWellLineWidthKey];
-            style = [decoder decodeIntForKey:SKLineWellStyleKey];
-            dashPattern = [[decoder 
decodeObjectForKey:SKLineWellDashPatternKey] retain];
-            startLineStyle = [decoder 
decodeIntForKey:SKLineWellStartLineStyleKey];
-            endLineStyle = [decoder decodeIntForKey:SKLineWellEndLineStyleKey];
-            displayStyle = [decoder decodeIntForKey:DISPLAYSTYLE_KEY];
-            active = [decoder decodeBoolForKey:ACTIVE_KEY];
-            action = NSSelectorFromString([decoder 
decodeObjectForKey:ACTION_KEY]);
-            target = [decoder decodeObjectForKey:TARGET_KEY];
-        } else {
-            [decoder decodeValueOfObjCType:@encode(CGFloat) at:&lineWidth];
-            [decoder decodeValueOfObjCType:@encode(NSInteger) at:&style];
-            dashPattern = [[decoder decodeObject] retain];
-            [decoder decodeValueOfObjCType:@encode(NSInteger) 
at:&startLineStyle];
-            [decoder decodeValueOfObjCType:@encode(NSInteger) 
at:&endLineStyle];
-            [decoder decodeValueOfObjCType:@encode(NSInteger) 
at:&displayStyle];
-            [decoder decodeValueOfObjCType:@encode(BOOL) at:&active];
-            action = NSSelectorFromString([decoder decodeObject]);
-            target = [decoder decodeObject];
-        }
+        lineWidth = [decoder decodeFloatForKey:SKLineWellLineWidthKey];
+        style = [decoder decodeIntForKey:SKLineWellStyleKey];
+        dashPattern = [[decoder decodeObjectForKey:SKLineWellDashPatternKey] 
retain];
+        startLineStyle = [decoder decodeIntForKey:SKLineWellStartLineStyleKey];
+        endLineStyle = [decoder decodeIntForKey:SKLineWellEndLineStyleKey];
+        displayStyle = [decoder decodeIntForKey:DISPLAYSTYLE_KEY];
+        active = [decoder decodeBoolForKey:ACTIVE_KEY];
+        action = NSSelectorFromString([decoder decodeObjectForKey:ACTION_KEY]);
+        target = [decoder decodeObjectForKey:TARGET_KEY];
         [self commonInit];
     }
     return self;
@@ -130,27 +118,15 @@
 
 - (void)encodeWithCoder:(NSCoder *)coder {
     [super encodeWithCoder:coder];
-    if ([coder allowsKeyedCoding]) {
-        [coder encodeFloat:lineWidth forKey:SKLineWellLineWidthKey];
-        [coder encodeInt:style forKey:SKLineWellStyleKey];
-        [coder encodeObject:dashPattern forKey:SKLineWellDashPatternKey];
-        [coder encodeInt:startLineStyle forKey:SKLineWellStartLineStyleKey];
-        [coder encodeInt:endLineStyle forKey:SKLineWellEndLineStyleKey];
-        [coder encodeInt:displayStyle forKey:DISPLAYSTYLE_KEY];
-        [coder encodeBool:active forKey:ACTIVE_KEY];
-        [coder encodeObject:NSStringFromSelector(action) forKey:ACTION_KEY];
-        [coder encodeConditionalObject:target forKey:TARGET_KEY];
-    } else {
-        [coder encodeValueOfObjCType:@encode(CGFloat) at:&lineWidth];
-        [coder encodeValueOfObjCType:@encode(NSInteger) at:&style];
-        [coder encodeObject:dashPattern];
-        [coder encodeValueOfObjCType:@encode(NSInteger) at:&startLineStyle];
-        [coder encodeValueOfObjCType:@encode(NSInteger) at:&endLineStyle];
-        [coder encodeValueOfObjCType:@encode(NSInteger) at:&displayStyle];
-        [coder encodeValueOfObjCType:@encode(BOOL) at:&active];
-        [coder encodeObject:NSStringFromSelector(action)];
-        [coder encodeConditionalObject:target];
-    }
+    [coder encodeFloat:lineWidth forKey:SKLineWellLineWidthKey];
+    [coder encodeInt:style forKey:SKLineWellStyleKey];
+    [coder encodeObject:dashPattern forKey:SKLineWellDashPatternKey];
+    [coder encodeInt:startLineStyle forKey:SKLineWellStartLineStyleKey];
+    [coder encodeInt:endLineStyle forKey:SKLineWellEndLineStyleKey];
+    [coder encodeInt:displayStyle forKey:DISPLAYSTYLE_KEY];
+    [coder encodeBool:active forKey:ACTIVE_KEY];
+    [coder encodeObject:NSStringFromSelector(action) forKey:ACTION_KEY];
+    [coder encodeConditionalObject:target forKey:TARGET_KEY];
 }
 
 - (void)dealloc {


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

------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and 
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today. 
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to