From d246b197506fbd12c80ad5873b9e9dc7d21a75cb Mon Sep 17 00:00:00 2001 From: Stephen Ierodiaconou Date: Thu, 16 Dec 2010 16:44:00 +0200 Subject: [PATCH 1/5] Some linting and deprecation error and ivar '_' addition --- Foundation/CPUserDefaults.j | 62 ++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/Foundation/CPUserDefaults.j b/Foundation/CPUserDefaults.j index 9445b46f2..697cd850f 100644 --- a/Foundation/CPUserDefaults.j +++ b/Foundation/CPUserDefaults.j @@ -20,14 +20,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import +@import + +@import "CPBundle.j" +@import "CPData.j" +@import "CPDictionary.j" +@import "CPException.j" +@import "CPKeyedArchiver.j" +@import "CPKeyedUnarchiver.j" +@import "CPNotificationCenter.j" @import "CPObject.j" +@import "CPRunLoop.j" +@import "CPString.j" +@import "CPURL.j" +@import "CPURLConnection.j" +@import "CPURLRequest.j" - -CPArgumentDomain = @"CPArgumentDomain"; -CPApplicationDomain = [[[CPBundle mainBundle] infoDictionary] objectForKey:@"CPBundleIdentifier"] || @"CPApplicationDomain"; -CPGlobalDomain = @"CPGlobalDomain"; -CPLocaleDomain = @"CPLocaleDomain"; -CPRegistrationDomain = @"CPRegistrationDomain"; +CPArgumentDomain = @"CPArgumentDomain"; +CPApplicationDomain = [[[CPBundle mainBundle] infoDictionary] objectForKey:@"CPBundleIdentifier"] || @"CPApplicationDomain"; +CPGlobalDomain = @"CPGlobalDomain"; +CPLocaleDomain = @"CPLocaleDomain"; +CPRegistrationDomain = @"CPRegistrationDomain"; CPUserDefaultsDidChangeNotification = @"CPUserDefaultsDidChangeNotification"; @@ -110,9 +124,10 @@ var StandardUserDefaults; { var args = [CPApp namedArguments], keys = [args allKeys], - count = [keys count]; + count = [keys count], + i = 0; - for (var i = 0; i < count; i++) + for (; i < count; i++) { var key = keys[i]; [self setObject:[args objectForKey:key] forKey:key inDomain:CPArgumentDomain]; @@ -214,9 +229,10 @@ var StandardUserDefaults; - (void)registerDefaults:(CPDictionary)aDictionary { var keys = [aDictionary allKeys], - count = [keys count]; + count = [keys count], + i = 0; - for (var i = 0; i < count; i++) + for (; i < count; i++) { var key = keys[i]; [self setObject:[aDictionary objectForKey:key] forKey:key inDomain:CPRegistrationDomain]; @@ -231,8 +247,8 @@ var StandardUserDefaults; */ - (void)registerDefaultsFromContentsOfFile:(CPURL)aURL { - var contents = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil error:nil], - data = [CPData dataWithRawString:[contents string]], + var contents = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil], + data = [CPData dataWithRawString:[contents rawString]], plist = [data plistObject]; [self registerDefaults:plist]; @@ -246,20 +262,22 @@ var StandardUserDefaults; _searchListNeedsReload = NO; var dicts = [CPRegistrationDomain, CPGlobalDomain, CPApplicationDomain, CPArgumentDomain], - count = [dicts count]; + count = [dicts count], + i = 0; _searchList = [CPDictionary dictionary]; - for (var i = 0; i < count; i++) + for (; i < count; i++) { var domain = [_domains objectForKey:dicts[i]]; if (!domain) continue; var keys = [domain allKeys], - keysCount = [keys count]; + keysCount = [keys count], + j = 0; - for (var j = 0; j < keysCount; j++) + for (; j < keysCount; j++) { var key = keys[j]; [_searchList setObject:[domain objectForKey:key] forKey:key]; @@ -557,7 +575,7 @@ var StandardUserDefaults; @implementation CPUserDefaultsStore : CPObject { - CPString domain @accessors; + CPString _domain @accessors(property=domain); } - (CPData)data @@ -580,12 +598,12 @@ var StandardUserDefaults; - (void)setDomain:(CPString)aDomain { - if (domain === aDomain) + if (_domain === aDomain) return; - domain = aDomain; + _domain = aDomain; - _cookie = [[CPCookie alloc] initWithName:domain]; + _cookie = [[CPCookie alloc] initWithName:_domain]; } - (CPData)data @@ -626,7 +644,7 @@ var StandardUserDefaults; - (CPData)data { - var result = localStorage.getItem(domain); + var result = localStorage.getItem(_domain); if (!result || [result length] < 1) return nil; @@ -635,7 +653,7 @@ var StandardUserDefaults; - (void)setData:(CPData)aData { - localStorage.setItem(domain, encodeURIComponent([aData rawString])); + localStorage.setItem(_domain, encodeURIComponent([aData rawString])); } @end From 9f5904eaf2e1ee23c33a9e294e600da247fce3da Mon Sep 17 00:00:00 2001 From: Stephen Ierodiaconou Date: Thu, 16 Dec 2010 17:34:02 +0200 Subject: [PATCH 2/5] Alphabetical order --- Foundation/Foundation.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/Foundation.j b/Foundation/Foundation.j index 6f4f5058f..2dd7339d1 100755 --- a/Foundation/Foundation.j +++ b/Foundation/Foundation.j @@ -33,8 +33,8 @@ @import "CPDictionary.j" @import "CPEnumerator.j" @import "CPException.j" -@import "CPFormatter.j" @import "CPExpression.j" +@import "CPFormatter.j" @import "CPIndexSet.j" @import "CPInvocation.j" @import "CPJSONPConnection.j" From fd812f25a53e0a20ab3a54c7eb2ec123220056ed Mon Sep 17 00:00:00 2001 From: Stephen Ierodiaconou Date: Thu, 16 Dec 2010 17:38:58 +0200 Subject: [PATCH 3/5] Imports additions Import fixes and clean up Missing import Missing imports Missing import Remove uncessary comments --- Foundation/CPSortDescriptor.j | 2 +- Foundation/CPString.j | 3 ++- Foundation/CPTimer.j | 4 ---- Foundation/CPURL.j | 1 + Foundation/CPURLConnection.j | 2 +- Foundation/CPURLRequest.j | 4 +++- Foundation/CPURLResponse.j | 2 +- Foundation/CPUndoManager.j | 5 ++++- Foundation/CPUserSessionManager.j | 2 +- Foundation/CPValue.j | 1 - Foundation/CPValueTransformer.j | 19 +++++++++++-------- Foundation/CPWebDAVManager.j | 18 ++++++++++-------- 12 files changed, 35 insertions(+), 28 deletions(-) diff --git a/Foundation/CPSortDescriptor.j b/Foundation/CPSortDescriptor.j index 8c246bd4c..5047726ae 100755 --- a/Foundation/CPSortDescriptor.j +++ b/Foundation/CPSortDescriptor.j @@ -22,7 +22,7 @@ @import "CPObject.j" @import "CPObjJRuntime.j" - +@import "CPString.j" /*! The left operand is smaller than the right. diff --git a/Foundation/CPString.j b/Foundation/CPString.j index e4dfa459d..b67086e2f 100644 --- a/Foundation/CPString.j +++ b/Foundation/CPString.j @@ -22,10 +22,11 @@ @import "CPException.j" @import "CPObject.j" +@import "CPObjJRuntime.j" +@import "CPRange.j" @import "CPSortDescriptor.j" @import "CPValue.j" - /*! A case insensitive search @global diff --git a/Foundation/CPTimer.j b/Foundation/CPTimer.j index eb27fb139..16f3d0a59 100644 --- a/Foundation/CPTimer.j +++ b/Foundation/CPTimer.j @@ -25,7 +25,6 @@ @import "CPObject.j" @import "CPRunLoop.j" - /*! @class CPTimer @ingroup foundation @@ -51,7 +50,6 @@ { var timer = [[self alloc] initWithFireDate:[CPDate dateWithTimeIntervalSinceNow:seconds] interval:seconds invocation:anInvocation repeats:shouldRepeat]; - //add to the runloop [[CPRunLoop currentRunLoop] addTimer:timer forMode:CPDefaultRunLoopMode]; return timer; @@ -64,7 +62,6 @@ { var timer = [[self alloc] initWithFireDate:[CPDate dateWithTimeIntervalSinceNow:seconds] interval:seconds target:aTarget selector:aSelector userInfo:userInfo repeats:shouldRepeat]; - //add to the runloop [[CPRunLoop currentRunLoop] addTimer:timer forMode:CPDefaultRunLoopMode]; return timer; @@ -77,7 +74,6 @@ { var timer = [[self alloc] initWithFireDate:[CPDate dateWithTimeIntervalSinceNow:seconds] interval:seconds callback:aFunction repeats:shouldRepeat]; - //add to the runloop [[CPRunLoop currentRunLoop] addTimer:timer forMode:CPDefaultRunLoopMode]; return timer; diff --git a/Foundation/CPURL.j b/Foundation/CPURL.j index 75ec1497f..4ff45cb20 100644 --- a/Foundation/CPURL.j +++ b/Foundation/CPURL.j @@ -21,6 +21,7 @@ */ @import "CPObject.j" +@import "CPString.j" CPURLNameKey = @"CPURLNameKey"; CPURLLocalizedNameKey = @"CPURLLocalizedNameKey"; diff --git a/Foundation/CPURLConnection.j b/Foundation/CPURLConnection.j index d6f260226..bcf28ceb6 100644 --- a/Foundation/CPURLConnection.j +++ b/Foundation/CPURLConnection.j @@ -20,12 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import "CPData.j" @import "CPObject.j" @import "CPRunLoop.j" @import "CPURLRequest.j" @import "CPURLResponse.j" - var CPURLConnectionDelegate = nil; /*! diff --git a/Foundation/CPURLRequest.j b/Foundation/CPURLRequest.j index 28b4e4dc4..7ef71d231 100644 --- a/Foundation/CPURLRequest.j +++ b/Foundation/CPURLRequest.j @@ -20,8 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import "CPDictionary.j" @import "CPObject.j" - +@import "CPString.j" +@import "CPURL.j" /*! @class CPURLRequest diff --git a/Foundation/CPURLResponse.j b/Foundation/CPURLResponse.j index 6d0c0bf5e..c879a9abd 100644 --- a/Foundation/CPURLResponse.j +++ b/Foundation/CPURLResponse.j @@ -21,7 +21,7 @@ */ @import "CPObject.j" - +@import "CPURL.j" /* CPURL _URL; diff --git a/Foundation/CPUndoManager.j b/Foundation/CPUndoManager.j index c511d093f..16a70cd37 100644 --- a/Foundation/CPUndoManager.j +++ b/Foundation/CPUndoManager.j @@ -20,12 +20,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import "CPArray.j" +@import "CPException.j" @import "CPInvocation.j" +@import "CPNotificationCenter.j" @import "CPObject.j" @import "CPProxy.j" +@import "CPKeyValueObserving.j" @import "CPRunLoop.j" - var CPUndoManagerNormal = 0, CPUndoManagerUndoing = 1, CPUndoManagerRedoing = 2; diff --git a/Foundation/CPUserSessionManager.j b/Foundation/CPUserSessionManager.j index 5feca31ff..b1cbd23cb 100644 --- a/Foundation/CPUserSessionManager.j +++ b/Foundation/CPUserSessionManager.j @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import "CPNotificationCenter.j" @import "CPObject.j" @import "CPString.j" - CPUserSessionUndeterminedStatus = 0; CPUserSessionLoggedInStatus = 1; CPUserSessionLoggedOutStatus = 2; diff --git a/Foundation/CPValue.j b/Foundation/CPValue.j index 70ea751ad..e19f5baa3 100644 --- a/Foundation/CPValue.j +++ b/Foundation/CPValue.j @@ -23,7 +23,6 @@ @import "CPCoder.j" @import "CPObject.j" - /*! @class CPValue @ingroup foundation diff --git a/Foundation/CPValueTransformer.j b/Foundation/CPValueTransformer.j index 6ea38a7cc..6424fe9e3 100644 --- a/Foundation/CPValueTransformer.j +++ b/Foundation/CPValueTransformer.j @@ -23,13 +23,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import "CPObject.j" +@import "CPData.j" @import "CPDictionary.j" - +@import "CPException.j" +@import "CPKeyedArchiver.j" +@import "CPKeyedUnarchiver.j" +@import "CPNumber.j" +@import "CPObject.j" var transformerMap = [CPDictionary dictionary]; - @implementation CPValueTransformer : CPObject { @@ -75,7 +78,7 @@ var transformerMap = [CPDictionary dictionary]; { if ([[self class] allowsReverseTransformation]) { - [CPException raise:CPInvalidArgumentException reason:(self+" is not reversible.")]; + [CPException raise:CPInvalidArgumentException reason:(self + " is not reversible.")]; } return [self transformedValue:aValue]; @@ -184,7 +187,7 @@ var transformerMap = [CPDictionary dictionary]; @end -CPNegateBooleanTransformerName = @"CPNegateBooleanTransformerName"; -CPIsNilTransformerName = @"CPIsNilTransformerName"; -CPIsNotNilTransformerName = @"CPIsNotNilTransformerName"; -CPUnarchiveFromDataTransformerName = @"CPUnarchiveFromDataTransformerName"; +CPNegateBooleanTransformerName = @"CPNegateBooleanTransformerName"; +CPIsNilTransformerName = @"CPIsNilTransformerName"; +CPIsNotNilTransformerName = @"CPIsNotNilTransformerName"; +CPUnarchiveFromDataTransformerName = @"CPUnarchiveFromDataTransformerName"; diff --git a/Foundation/CPWebDAVManager.j b/Foundation/CPWebDAVManager.j index a32a857fd..01a614145 100644 --- a/Foundation/CPWebDAVManager.j +++ b/Foundation/CPWebDAVManager.j @@ -20,9 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import -@import -@import +@import "CPArray.j" +@import "CPDictionary.j" +@import "CPObject.j" +@import "CPString.j" +@import "CPURL.j" +@import "CPURLConnection.j" +@import "CPURLRequest.j" var setURLResourceValuesForKeysFromProperties = function(aURL, keys, properties) { @@ -174,7 +178,7 @@ WebDAVPropertiesForURLKeys[CPURLIsDirectoryKey] = @"resourcetype"; //CPURLCustomIconKey = @"CPURLCustomIconKey"; var XMLDocumentFromString = function(anXMLString) -{//console.log(anXMLString); +{ if (typeof window["ActiveXObject"] !== "undefined") { var XMLDocument = new ActiveXObject("Microsoft.XMLDOM"); @@ -193,9 +197,8 @@ var parsePROPFINDResponse = function(anXMLString) var XMLDocument = XMLDocumentFromString(anXMLString), responses = XMLDocument.getElementsByTagNameNS("*", "response"), responseIndex = 0, - responseCount = responses.length; - - var propertiesForURLs = [CPDictionary dictionary]; + responseCount = responses.length, + propertiesForURLs = [CPDictionary dictionary]; for (; responseIndex < responseCount; ++responseIndex) { @@ -220,7 +223,6 @@ var parsePROPFINDResponse = function(anXMLString) if (nodeName === @"resourcetype") [properties setObject:element.firstChild ? CPWebDAVManagerCollectionResourceType : CPWebDAVManagerNonCollectionResourceType forKey:nodeName]; - else [properties setObject:element.firstChild.nodeValue forKey:nodeName]; } From d105388d82dc8674ce6b0ff20c879e3b25996448 Mon Sep 17 00:00:00 2001 From: Stephen Ierodiaconou Date: Thu, 16 Dec 2010 19:00:41 +0200 Subject: [PATCH 4/5] Move CPOrderedX to CPObjRuntime only instead of duplicated in CPSortDescriptor --- Foundation/CPObjJRuntime.j | 37 +++++++++++++++++------------------ Foundation/CPSortDescriptor.j | 19 ------------------ 2 files changed, 18 insertions(+), 38 deletions(-) diff --git a/Foundation/CPObjJRuntime.j b/Foundation/CPObjJRuntime.j index 019888d19..0d3b3e6bb 100644 --- a/Foundation/CPObjJRuntime.j +++ b/Foundation/CPObjJRuntime.j @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - function CPStringFromSelector(aSelector) { return sel_getName(aSelector); @@ -41,27 +40,27 @@ function CPStringFromClass(aClass) return class_getName(aClass); } -CPOrderedAscending = -1; -CPOrderedSame = 0; -CPOrderedDescending = 1; +/*! + The left operand is smaller than the right. + @global + @group CPComparisonResult +*/ +CPOrderedAscending = -1; +/*! + The left and right operands are equal. + @global + @group CPComparisonResult +*/ +CPOrderedSame = 0; +/*! + The left operand is greater than the right. + @global + @group CPComparisonResult +*/ +CPOrderedDescending = 1; CPNotFound = -1; MIN = Math.min; MAX = Math.max; ABS = Math.abs; - -/*function MIN(lhs, rhs) -{ - return Math.min(lhs, rhs); -} - -function MAX(lhs, rhs) -{ - return Math.max(lhs, rhs); -} - -function ABS(argument) -{ - return Math.abs(argument); -}*/ diff --git a/Foundation/CPSortDescriptor.j b/Foundation/CPSortDescriptor.j index 5047726ae..f82399a2f 100755 --- a/Foundation/CPSortDescriptor.j +++ b/Foundation/CPSortDescriptor.j @@ -24,25 +24,6 @@ @import "CPObjJRuntime.j" @import "CPString.j" -/*! - The left operand is smaller than the right. - @global - @group CPComparisonResult -*/ -CPOrderedAscending = -1; -/*! - The left and right operands are equal. - @global - @group CPComparisonResult -*/ -CPOrderedSame = 0; -/*! - The left operand is greater than the right. - @global - @group CPComparisonResult -*/ -CPOrderedDescending = 1; - /*! @class CPSortDescriptor @ingroup foundation From 4f3146dc7b4d9bca901849fcfb74f76cb392d7e9 Mon Sep 17 00:00:00 2001 From: Stephen Ierodiaconou Date: Thu, 16 Dec 2010 20:20:58 +0200 Subject: [PATCH 5/5] Remove unnecessary defines of MIN/MAX/ABS --- Foundation/CPObjJRuntime.j | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Foundation/CPObjJRuntime.j b/Foundation/CPObjJRuntime.j index 0d3b3e6bb..e485e5fee 100644 --- a/Foundation/CPObjJRuntime.j +++ b/Foundation/CPObjJRuntime.j @@ -59,8 +59,4 @@ CPOrderedSame = 0; */ CPOrderedDescending = 1; -CPNotFound = -1; - -MIN = Math.min; -MAX = Math.max; -ABS = Math.abs; +CPNotFound = -1;