Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6BD22E914 for ; Mon, 25 Feb 2013 13:41:14 +0000 (UTC) Received: (qmail 85421 invoked by uid 500); 25 Feb 2013 13:41:14 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 85271 invoked by uid 500); 25 Feb 2013 13:41:13 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 82311 invoked by uid 99); 25 Feb 2013 13:41:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 13:41:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BF5DA82FA3B; Mon, 25 Feb 2013 13:41:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mmocny@apache.org To: commits@cordova.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [37/50] ios commit: CB-2502: Fixing CDVViewController.commandDelegate property declaration Message-Id: <20130225134101.BF5DA82FA3B@tyr.zones.apache.org> Date: Mon, 25 Feb 2013 13:41:01 +0000 (UTC) CB-2502: Fixing CDVViewController.commandDelegate property declaration Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/59b6066a Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/59b6066a Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/59b6066a Branch: refs/heads/multipart_plugin_result Commit: 59b6066a39da49fcdb34dd6ad7653561fed5db32 Parents: 8301c41 Author: Kevin Hawkins Authored: Wed Feb 20 09:58:25 2013 -0800 Committer: Andrew Grieve Committed: Thu Feb 21 08:55:46 2013 -0500 ---------------------------------------------------------------------- CordovaLib/Classes/CDVCommandQueue.h | 8 +------- CordovaLib/Classes/CDVCommandQueue.m | 8 ++++++++ CordovaLib/Classes/CDVViewController.h | 9 ++++----- CordovaLib/Classes/CDVViewController.m | 1 - CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 2 ++ .../CordovaTests.xcodeproj/project.pbxproj | 6 ++++++ 6 files changed, 21 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/59b6066a/CordovaLib/Classes/CDVCommandQueue.h ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/CDVCommandQueue.h b/CordovaLib/Classes/CDVCommandQueue.h index ebdf844..27c47b5 100644 --- a/CordovaLib/Classes/CDVCommandQueue.h +++ b/CordovaLib/Classes/CDVCommandQueue.h @@ -22,13 +22,7 @@ @class CDVInvokedUrlCommand; @class CDVViewController; -@interface CDVCommandQueue : NSObject { - @private - NSInteger _lastCommandQueueFlushRequestId; - __weak CDVViewController* _viewController; - NSMutableArray* _queue; - BOOL _currentlyExecuting; -} +@interface CDVCommandQueue : NSObject @property (nonatomic, readonly) BOOL currentlyExecuting; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/59b6066a/CordovaLib/Classes/CDVCommandQueue.m ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/CDVCommandQueue.m b/CordovaLib/Classes/CDVCommandQueue.m index a8a58b7..a5798ac 100644 --- a/CordovaLib/Classes/CDVCommandQueue.m +++ b/CordovaLib/Classes/CDVCommandQueue.m @@ -23,6 +23,14 @@ #import "CDVViewController.h" #import "CDVCommandDelegateImpl.h" +@interface CDVCommandQueue () { + NSInteger _lastCommandQueueFlushRequestId; + __weak CDVViewController* _viewController; + NSMutableArray* _queue; + BOOL _currentlyExecuting; +} +@end + @implementation CDVCommandQueue @synthesize currentlyExecuting = _currentlyExecuting; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/59b6066a/CordovaLib/Classes/CDVViewController.h ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/CDVViewController.h b/CordovaLib/Classes/CDVViewController.h index 82e22f6..eef589a 100644 --- a/CordovaLib/Classes/CDVViewController.h +++ b/CordovaLib/Classes/CDVViewController.h @@ -22,15 +22,14 @@ #import "CDVAvailability.h" #import "CDVInvokedUrlCommand.h" #import "CDVCommandDelegate.h" +#import "CDVCommandQueue.h" #import "CDVWhitelist.h" #import "CDVScreenOrientationDelegate.h" - -@class CDVCommandQueue; -@class CDVCommandDelegateImpl; +#import "CDVPlugin.h" @interface CDVViewController : UIViewController { @protected - CDVCommandDelegateImpl* _commandDelegate; + id _commandDelegate; @protected CDVCommandQueue* _commandQueue; NSString* _userAgent; @@ -49,7 +48,7 @@ @property (nonatomic, readwrite, copy) NSString* wwwFolderName; @property (nonatomic, readwrite, copy) NSString* startPage; @property (nonatomic, readonly, strong) CDVCommandQueue* commandQueue; -@property (nonatomic, readonly, strong) CDVCommandDelegateImpl* commandDelegate; +@property (nonatomic, readonly, strong) id commandDelegate; @property (nonatomic, readonly) NSString* userAgent; + (NSDictionary*)getBundlePlist:(NSString*)plistName; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/59b6066a/CordovaLib/Classes/CDVViewController.m ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m index ece7c16..59463bd 100644 --- a/CordovaLib/Classes/CDVViewController.m +++ b/CordovaLib/Classes/CDVViewController.m @@ -19,7 +19,6 @@ #import #import "CDV.h" -#import "CDVCommandQueue.h" #import "CDVCommandDelegateImpl.h" #import "CDVConfigParser.h" #import "CDVUserAgentUtil.h" http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/59b6066a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj index 4868020..5054f7e 100644 --- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj +++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj @@ -141,6 +141,7 @@ 686357DC14100B1600DF4CF2 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 68A32D7114102E1C006B237C /* libCordova.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCordova.a; sourceTree = BUILT_PRODUCTS_DIR; }; 68A32D7414103017006B237C /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; + 8220B5C316D5427E00EC3921 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; }; 8852C43614B65FD800F0E735 /* CDVViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVViewController.h; path = Classes/CDVViewController.h; sourceTree = ""; }; 8852C43714B65FD800F0E735 /* CDVViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVViewController.m; path = Classes/CDVViewController.m; sourceTree = ""; }; 8887FD261090FBE7009987E8 /* CDVCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVCamera.h; path = Classes/CDVCamera.h; sourceTree = ""; }; @@ -223,6 +224,7 @@ isa = PBXGroup; children = ( 68A32D7414103017006B237C /* AddressBook.framework */, + 8220B5C316D5427E00EC3921 /* AssetsLibrary.framework */, 686357DC14100B1600DF4CF2 /* CoreMedia.framework */, 686357CE14100ADA00DF4CF2 /* AudioToolbox.framework */, 686357CF14100ADB00DF4CF2 /* AVFoundation.framework */, http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/59b6066a/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj b/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj index f29ac11..219eb53 100644 --- a/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj +++ b/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj @@ -41,6 +41,8 @@ 68A32D7D141030E4006B237C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 686357AE141002F100DF4CF2 /* CoreGraphics.framework */; }; 68A32D7E141030EB006B237C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 686357AA141002F100DF4CF2 /* UIKit.framework */; }; 68A32D7F141030F3006B237C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 686357AC141002F100DF4CF2 /* Foundation.framework */; }; + 8220B5C216D541BD00EC3921 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */; }; + 8220B5C616D542F500EC3921 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */; }; EB3B34E9161B5532003DBE7D /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB3B34E6161B5454003DBE7D /* libCordova.a */; }; EB89634A15FE66EA00E12277 /* CDVInvokedUrlCommandTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB89634915FE66EA00E12277 /* CDVInvokedUrlCommandTests.m */; }; EB96677216ADBCF500D86CDF /* CDVUserAgentTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EB96677116ADBCF500D86CDF /* CDVUserAgentTest.m */; }; @@ -104,6 +106,7 @@ 686357D414100AF200DF4CF2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 686357DC14100B1600DF4CF2 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 68A32D7414103017006B237C /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; + 8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; }; EB37018115D18B2D00BEBC43 /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CordovaLib.xcodeproj; path = ../CordovaLib/CordovaLib.xcodeproj; sourceTree = ""; }; EB89634915FE66EA00E12277 /* CDVInvokedUrlCommandTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVInvokedUrlCommandTests.m; sourceTree = ""; }; EB96677116ADBCF500D86CDF /* CDVUserAgentTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVUserAgentTest.m; sourceTree = ""; }; @@ -120,6 +123,7 @@ buildActionMask = 2147483647; files = ( EB3B34E9161B5532003DBE7D /* libCordova.a in Frameworks */, + 8220B5C216D541BD00EC3921 /* AssetsLibrary.framework in Frameworks */, 30F8AE0C152125B6006625B3 /* MobileCoreServices.framework in Frameworks */, 30F8AE0515212587006625B3 /* AddressBook.framework in Frameworks */, 30F8AE0615212587006625B3 /* AddressBookUI.framework in Frameworks */, @@ -139,6 +143,7 @@ buildActionMask = 2147483647; files = ( 68A32D7514103017006B237C /* AddressBook.framework in Frameworks */, + 8220B5C616D542F500EC3921 /* AssetsLibrary.framework in Frameworks */, 68A32D7614103078006B237C /* CoreMedia.framework in Frameworks */, 68A32D7714103082006B237C /* AudioToolbox.framework in Frameworks */, 68A32D781410308B006B237C /* AVFoundation.framework in Frameworks */, @@ -181,6 +186,7 @@ isa = PBXGroup; children = ( 68A32D7414103017006B237C /* AddressBook.framework */, + 8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */, 686357DC14100B1600DF4CF2 /* CoreMedia.framework */, 686357CE14100ADA00DF4CF2 /* AudioToolbox.framework */, 686357CF14100ADB00DF4CF2 /* AVFoundation.framework */,