cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject [1/3] mac commit: CB-10581 Remove deprecated methods
Date Wed, 10 Feb 2016 00:24:27 GMT
Repository: cordova-osx
Updated Branches:
  refs/heads/master 38707da8b -> 80c0c6fb9


CB-10581 Remove deprecated methods


Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/7b6b78af
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/7b6b78af
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/7b6b78af

Branch: refs/heads/master
Commit: 7b6b78af786a3c8e7ba7a2e3110b74147a57c427
Parents: 63599eb
Author: Tobias Bocanegra <tripod@adobe.com>
Authored: Tue Feb 9 14:55:07 2016 -0800
Committer: Tobias Bocanegra <tripod@adobe.com>
Committed: Tue Feb 9 14:55:07 2016 -0800

----------------------------------------------------------------------
 .../Classes/Commands/CDVCommandDelegate.h         |  5 -----
 .../Classes/Commands/CDVCommandDelegateImpl.m     |  7 +------
 .../__PROJECT_NAME__/Classes/MainViewController.m | 18 ++++--------------
 .../CordovaLibApp/MainViewController.m            | 18 ++++--------------
 4 files changed, 9 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b6b78af/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegate.h
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegate.h b/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegate.h
index e177c63..04df6bc 100644
--- a/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegate.h
+++ b/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegate.h
@@ -30,11 +30,6 @@
 
 - (NSString*)pathForResource:(NSString*)resourcepath;
 - (id)getCommandInstance:(NSString*)pluginName;
-- (void)registerPlugin:(CDVPlugin*)plugin withClassName:(NSString*)className CDV_DEPRECATED(2.2,
"Use CDVViewController to register plugins, or use config.xml.");
-
-// Plugins should not be using this interface to call other plugins since it
-// will result in bogus callbacks being made.
-- (BOOL)execute:(CDVInvokedUrlCommand*)command CDV_DEPRECATED(2.2, "Use direct method calls
instead.");
 
 // Sends a plugin result to the JS. This is thread-safe.
 - (void)sendPluginResult:(CDVPluginResult*)result callbackId:(NSString*)callbackId;

http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b6b78af/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegateImpl.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegateImpl.m b/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegateImpl.m
index ed082aa..c5c583e 100644
--- a/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegateImpl.m
+++ b/CordovaLib/CordovaLib/Classes/Commands/CDVCommandDelegateImpl.m
@@ -61,7 +61,7 @@
     if ([commandsJSON length] > 0) {
         CDV_EXEC_LOG(@"Exec: Retrieved new exec messages by chaining.");
     }
-    
+
     // TODO:
 //    [_commandQueue enqueCommandBatch:commandsJSON];
 }
@@ -124,11 +124,6 @@
     return [_viewController getCommandInstance:pluginName];
 }
 
-- (void)registerPlugin:(CDVPlugin*)plugin withClassName:(NSString*)className
-{
-    [_viewController registerPlugin:plugin withClassName:className];
-}
-
 - (void)runInBackground:(void (^)())block
 {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), block);

http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b6b78af/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m
----------------------------------------------------------------------
diff --git a/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m b/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m
index 0e04f3f..bf5daa6 100644
--- a/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m
+++ b/bin/templates/project/__PROJECT_NAME__/Classes/MainViewController.m
@@ -6,9 +6,9 @@
  to you under the Apache License, Version 2.0 (the
  "License"); you may not use this file except in compliance
  with the License.  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an
  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@
     if (self) {
         // Initialization code here.
     }
-    
+
     return self;
 }
 
@@ -64,7 +64,7 @@
 - (void)awakeFromNib
 {
     [super awakeFromNib];
-    
+
     // Implement this method to handle any initialization after your window controller's
window has been loaded from its nib file.
 }
 
@@ -83,16 +83,6 @@
     return [super getCommandInstance:className];
 }
 
-/*
- NOTE: this will only inspect execute calls coming explicitly from native plugins,
- not the commandQueue (from JavaScript). To see execute calls from JavaScript, see
- MainCommandQueue below
- */
-- (BOOL)execute:(CDVInvokedUrlCommand*)command
-{
-    return [super execute:command];
-}
-
 - (NSString*)pathForResource:(NSString*)resourcepath;
 {
     return [super pathForResource:resourcepath];

http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b6b78af/tests/CordovaLibTests/CordovaLibApp/MainViewController.m
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CordovaLibApp/MainViewController.m b/tests/CordovaLibTests/CordovaLibApp/MainViewController.m
index 0e04f3f..bf5daa6 100644
--- a/tests/CordovaLibTests/CordovaLibApp/MainViewController.m
+++ b/tests/CordovaLibTests/CordovaLibApp/MainViewController.m
@@ -6,9 +6,9 @@
  to you under the Apache License, Version 2.0 (the
  "License"); you may not use this file except in compliance
  with the License.  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an
  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@
     if (self) {
         // Initialization code here.
     }
-    
+
     return self;
 }
 
@@ -64,7 +64,7 @@
 - (void)awakeFromNib
 {
     [super awakeFromNib];
-    
+
     // Implement this method to handle any initialization after your window controller's
window has been loaded from its nib file.
 }
 
@@ -83,16 +83,6 @@
     return [super getCommandInstance:className];
 }
 
-/*
- NOTE: this will only inspect execute calls coming explicitly from native plugins,
- not the commandQueue (from JavaScript). To see execute calls from JavaScript, see
- MainCommandQueue below
- */
-- (BOOL)execute:(CDVInvokedUrlCommand*)command
-{
-    return [super execute:command];
-}
-
 - (NSString*)pathForResource:(NSString*)resourcepath;
 {
     return [super pathForResource:resourcepath];


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message