From 3cd44284c4a84a2ceba63cb4c37485f936f0a8cd Mon Sep 17 00:00:00 2001 From: Klaas Pieter Annema Date: Wed, 26 May 2010 16:46:44 +0200 Subject: [PATCH] - added CPValueTransformer to Foundation.j - made CPValueTransformer import Foundation objects directly - gave the build in transformers CPValueTransformer as superclass --- Foundation/CPValueTransformer.j | 20 ++++++++++---------- Foundation/Foundation.j | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Foundation/CPValueTransformer.j b/Foundation/CPValueTransformer.j index 29bfcf6f8..f3440e59c 100644 --- a/Foundation/CPValueTransformer.j +++ b/Foundation/CPValueTransformer.j @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import -@import +@import "CPObject.j" +@import "CPDictionary.j" var transformerMap = [CPDictionary dictionary]; @@ -79,7 +79,7 @@ var transformerMap = [CPDictionary dictionary]; // builtin transformers -@implementation CPNegateBooleanTransformer +@implementation CPNegateBooleanTransformer : CPValueTransformer + (BOOL)allowsReverseTransformation { @@ -103,7 +103,7 @@ var transformerMap = [CPDictionary dictionary]; @end -@implementation CPIsNilTransformer +@implementation CPIsNilTransformer : CPValueTransformer + (BOOL)allowsReverseTransformation { @@ -122,7 +122,7 @@ var transformerMap = [CPDictionary dictionary]; @end -@implementation CPIsNotNilTransformer +@implementation CPIsNotNilTransformer : CPValueTransformer + (BOOL)allowsReverseTransformation { @@ -141,7 +141,7 @@ var transformerMap = [CPDictionary dictionary]; @end -@implementation CPUnarchiveFromDataTransformer +@implementation CPUnarchiveFromDataTransformer : CPValueTransformer + (BOOL)allowsReverseTransformation { @@ -170,7 +170,7 @@ CPIsNilTransformerName = @"CPIsNilTransformerName"; CPIsNotNilTransformerName = @"CPIsNotNilTransformerName"; CPUnarchiveFromDataTransformerName = @"CPUnarchiveFromDataTransformerName"; -[CPValueTransformer setValueTransformer:[CPNegateBooleanTransformer new] forName:CPNegateBooleanTransformerName]; -[CPValueTransformer setValueTransformer:[CPIsNilTransformer new] forName:CPIsNilTransformerName]; -[CPValueTransformer setValueTransformer:[CPIsNotNilTransformer new] forName:CPIsNotNilTransformerName]; -[CPValueTransformer setValueTransformer:[CPUnarchiveFromDataTransformer new] forName:CPUnarchiveFromDataTransformerName]; +[CPValueTransformer setValueTransformer:[[CPNegateBooleanTransformer alloc] init] forName:CPNegateBooleanTransformerName]; +[CPValueTransformer setValueTransformer:[[CPIsNilTransformer alloc] init] forName:CPIsNilTransformerName]; +[CPValueTransformer setValueTransformer:[[CPIsNotNilTransformer alloc] init] forName:CPIsNotNilTransformerName]; +[CPValueTransformer setValueTransformer:[[CPUnarchiveFromDataTransformer alloc] init] forName:CPUnarchiveFromDataTransformerName]; \ No newline at end of file diff --git a/Foundation/Foundation.j b/Foundation/Foundation.j index 4bf1460e4..f2066ed2f 100755 --- a/Foundation/Foundation.j +++ b/Foundation/Foundation.j @@ -56,6 +56,7 @@ @import "CPURLResponse.j" @import "CPUserSessionManager.j" @import "CPValue.j" +@import "CPValueTransformer.j" /*! @mainpage Cappuccino is distributed under the @ref license "GNU LGPL".