You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/07/14 20:31:05 UTC

[1/4] android commit: Undeprecate some just-deprecated symbols in PluginManager.

Repository: cordova-android
Updated Branches:
  refs/heads/4.0.x 6f301576e -> a99c8219b
  refs/heads/master b934c1be6 -> 92be0033a


Undeprecate some just-deprecated symbols in PluginManager.

Forgot about custom engines again :(


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/92be0033
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/92be0033
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/92be0033

Branch: refs/heads/4.0.x
Commit: 92be0033a88f032f5232b55aecdd3161071c5831
Parents: b934c1b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Jul 14 14:28:27 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jul 14 14:28:27 2014 -0400

----------------------------------------------------------------------
 framework/src/org/apache/cordova/PluginManager.java | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/92be0033/framework/src/org/apache/cordova/PluginManager.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java
index 689c3c8..9ae5ce6 100755
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -84,7 +84,6 @@ public class PluginManager {
     /**
      * Init when loading a new HTML page into webview.
      */
-    @Deprecated // Should not be exposed as public.
     public void init() {
         LOG.d(TAG, "init()");
         this.onPause(false);
@@ -231,7 +230,6 @@ public class PluginManager {
      *
      * @param multitasking      Flag indicating if multitasking is turned on for app
      */
-    @Deprecated // Should not be public
     public void onPause(boolean multitasking) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onPause(multitasking);
@@ -243,7 +241,6 @@ public class PluginManager {
      *
      * @param multitasking      Flag indicating if multitasking is turned on for app
      */
-    @Deprecated // Should not be public
     public void onResume(boolean multitasking) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onResume(multitasking);
@@ -253,7 +250,6 @@ public class PluginManager {
     /**
      * The final call you receive before your activity is destroyed.
      */
-    @Deprecated // Should not be public
     public void onDestroy() {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onDestroy();
@@ -284,7 +280,6 @@ public class PluginManager {
     /**
      * Called when the activity receives a new intent.
      */
-    @Deprecated // Should not be public
     public void onNewIntent(Intent intent) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onNewIntent(intent);
@@ -297,7 +292,6 @@ public class PluginManager {
      * @param url               The URL that is being changed to.
      * @return                  Return false to allow the URL to load, return true to prevent the URL from loading.
      */
-    @Deprecated // Should not be public
     public boolean onOverrideUrlLoading(String url) {
         // Deprecated way to intercept URLs. (process <url-filter> tags).
         // Instead, plugins should not include <url-filter> and instead ensure
@@ -324,7 +318,6 @@ public class PluginManager {
     /**
      * Called when the app navigates or refreshes.
      */
-    @Deprecated // Should not be public
     public void onReset() {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onReset();


[3/4] android commit: Merge branch 'master' into 4.0.x (undeprecate)

Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (undeprecate)


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

Branch: refs/heads/4.0.x
Commit: a03fdaba39b14cf7231b10375301e7aecf19f03e
Parents: 6f30157 92be003
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Jul 14 14:28:56 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jul 14 14:28:56 2014 -0400

----------------------------------------------------------------------
 framework/src/org/apache/cordova/PluginManager.java | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a03fdaba/framework/src/org/apache/cordova/PluginManager.java
----------------------------------------------------------------------


[4/4] android commit: Make private PluginManager.clearPluginObjects, .startupPlugins

Posted by ag...@apache.org.
Make private PluginManager.clearPluginObjects, .startupPlugins


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

Branch: refs/heads/4.0.x
Commit: a99c8219bd90f913df9083652972c5037a8426d9
Parents: a03fdab
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Jul 14 14:30:10 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jul 14 14:30:10 2014 -0400

----------------------------------------------------------------------
 framework/src/org/apache/cordova/PluginManager.java | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a99c8219/framework/src/org/apache/cordova/PluginManager.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java
index 2bb984e..bf69314 100755
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -83,18 +83,9 @@ public class PluginManager {
     }
 
     /**
-     * Delete all plugin objects.
-     */
-    @Deprecated // Should not be exposed as public.
-    public void clearPluginObjects() {
-        pluginMap.clear();
-    }
-
-    /**
      * Create plugins objects that have onload set.
      */
-    @Deprecated // Should not be exposed as public.
-    public void startupPlugins() {
+    private void startupPlugins() {
         for (PluginEntry entry : entryMap.values()) {
             if (entry.onload) {
                 getPlugin(entry.service);


[2/4] android commit: Undeprecate some just-deprecated symbols in PluginManager.

Posted by ag...@apache.org.
Undeprecate some just-deprecated symbols in PluginManager.

Forgot about custom engines again :(


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/92be0033
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/92be0033
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/92be0033

Branch: refs/heads/master
Commit: 92be0033a88f032f5232b55aecdd3161071c5831
Parents: b934c1b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Jul 14 14:28:27 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jul 14 14:28:27 2014 -0400

----------------------------------------------------------------------
 framework/src/org/apache/cordova/PluginManager.java | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/92be0033/framework/src/org/apache/cordova/PluginManager.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java
index 689c3c8..9ae5ce6 100755
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -84,7 +84,6 @@ public class PluginManager {
     /**
      * Init when loading a new HTML page into webview.
      */
-    @Deprecated // Should not be exposed as public.
     public void init() {
         LOG.d(TAG, "init()");
         this.onPause(false);
@@ -231,7 +230,6 @@ public class PluginManager {
      *
      * @param multitasking      Flag indicating if multitasking is turned on for app
      */
-    @Deprecated // Should not be public
     public void onPause(boolean multitasking) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onPause(multitasking);
@@ -243,7 +241,6 @@ public class PluginManager {
      *
      * @param multitasking      Flag indicating if multitasking is turned on for app
      */
-    @Deprecated // Should not be public
     public void onResume(boolean multitasking) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onResume(multitasking);
@@ -253,7 +250,6 @@ public class PluginManager {
     /**
      * The final call you receive before your activity is destroyed.
      */
-    @Deprecated // Should not be public
     public void onDestroy() {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onDestroy();
@@ -284,7 +280,6 @@ public class PluginManager {
     /**
      * Called when the activity receives a new intent.
      */
-    @Deprecated // Should not be public
     public void onNewIntent(Intent intent) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onNewIntent(intent);
@@ -297,7 +292,6 @@ public class PluginManager {
      * @param url               The URL that is being changed to.
      * @return                  Return false to allow the URL to load, return true to prevent the URL from loading.
      */
-    @Deprecated // Should not be public
     public boolean onOverrideUrlLoading(String url) {
         // Deprecated way to intercept URLs. (process <url-filter> tags).
         // Instead, plugins should not include <url-filter> and instead ensure
@@ -324,7 +318,6 @@ public class PluginManager {
     /**
      * Called when the app navigates or refreshes.
      */
-    @Deprecated // Should not be public
     public void onReset() {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
             plugin.onReset();