Factored image creation code so -description can be added

cappuccino · Apr 6, 2012 · eb292e6 · eb292e6
1 parent 129a8cb
commit eb292e6
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/AppKit/Cib/_CPCibCustomResource.j b/AppKit/Cib/_CPCibCustomResource.j
@@ -94,21 +94,30 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
             else if (_resourceName == "CPRemoveTemplate")
                 return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
 
-            var bundleClass = _properties.valueForKey(@"bundleClass"),
-                bundle = nil;
+            return [self imageFromBundle:[aCoder bundle]];
+        }
 
-            if (bundleClass)
-            {
-                bundleClass = CPClassFromString(bundleClass);
+    return self;
+}
 
-                if (bundleClass)
-                    bundle = [CPBundle bundleForClass:bundleClass];
-            }
+- (CPImage)imageFromBundle:(CPBundle)aBundle
+{
+    if (!aBundle)
+    {
+        var bundleClass = _properties.valueForKey(@"bundleClass");
+
+        if (bundleClass)
+        {
+            bundleClass = CPClassFromString(bundleClass);
 
-            return [[CPImage alloc] initWithContentsOfFile:[(bundle || [aCoder bundle]) pathForResource:_resourceName] size:_properties.valueForKey(@"size")];
+            if (bundleClass)
+                aBundle = [CPBundle bundleForClass:bundleClass];
         }
+        else
+            aBundle = [CPBundle mainBundle];
+    }
 
-    return self;
+    return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:_resourceName] size:_properties.valueForKey(@"size")];
 }
 
 @end
@@ -145,4 +154,11 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
     return nil;
 }
 
+- (CPString)description
+{
+    var image = [self imageFromBundle:nil];
+
+    return [image description];
+}
+
 @end