Updated Branches: refs/heads/master 05bc1865a -> d1ab1b59b
Remove @Override from interface methods In Java 6 you will get an error in Eclipse if your put the @Override annotation on a method of an interface. You are not really over riding the methods you are implementing it. This is an undocumented change in Java 6. Just cleaning up our usage of this so some project problems got away. Note: Things will build fine using 'ant jar' even with the @Override's. Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/d1ab1b59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/d1ab1b59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/d1ab1b59 Branch: refs/heads/master Commit: d1ab1b59be0315fcf5c9070f5e35f9654389fdfa Parents: 05bc186 Author: Simon MacDonald <simon.macdon...@gmail.com> Authored: Tue Oct 2 11:42:12 2012 -0400 Committer: Simon MacDonald <simon.macdon...@gmail.com> Committed: Tue Oct 2 11:42:15 2012 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/DroidGap.java | 1 - framework/src/org/apache/cordova/Echo.java | 2 +- framework/src/org/apache/cordova/FileTransfer.java | 3 --- .../org/apache/cordova/NativeToJsMessageQueue.java | 1 - .../src/org/apache/cordova/api/LegacyContext.java | 1 - 5 files changed, 1 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d1ab1b59/framework/src/org/apache/cordova/DroidGap.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java index f648ab8..eac3eba 100755 --- a/framework/src/org/apache/cordova/DroidGap.java +++ b/framework/src/org/apache/cordova/DroidGap.java @@ -1056,7 +1056,6 @@ public class DroidGap extends Activity implements CordovaInterface { return null; } - @Override public ExecutorService getThreadPool() { return threadPool; } http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d1ab1b59/framework/src/org/apache/cordova/Echo.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/Echo.java b/framework/src/org/apache/cordova/Echo.java index b91c3c4..78146e7 100644 --- a/framework/src/org/apache/cordova/Echo.java +++ b/framework/src/org/apache/cordova/Echo.java @@ -33,7 +33,7 @@ public class Echo extends CordovaPlugin { return true; } else if ("echoAsync".equals(action)) { cordova.getThreadPool().execute(new Runnable() { - @Override public void run() { + public void run() { callbackContext.success(result); } }); http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d1ab1b59/framework/src/org/apache/cordova/FileTransfer.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/FileTransfer.java b/framework/src/org/apache/cordova/FileTransfer.java index be3a11f..da3bad4 100644 --- a/framework/src/org/apache/cordova/FileTransfer.java +++ b/framework/src/org/apache/cordova/FileTransfer.java @@ -205,7 +205,6 @@ public class FileTransfer extends CordovaPlugin { } cordova.getThreadPool().execute(new Runnable() { - @Override public void run() { if (context.aborted) { return; @@ -615,7 +614,6 @@ public class FileTransfer extends CordovaPlugin { } cordova.getThreadPool().execute(new Runnable() { - @Override public void run() { if (context.aborted) { return; @@ -810,7 +808,6 @@ public class FileTransfer extends CordovaPlugin { } // Closing the streams can block, so execute on a background thread. cordova.getThreadPool().execute(new Runnable() { - @Override public void run() { synchronized (context) { safeClose(context.currentInputStream); http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d1ab1b59/framework/src/org/apache/cordova/NativeToJsMessageQueue.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java index 54c6eed..55fa205 100755 --- a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java +++ b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java @@ -293,7 +293,6 @@ public class NativeToJsMessageQueue { private class OnlineEventsBridgeMode implements BridgeMode { boolean online = true; final Runnable runnable = new Runnable() { - @Override public void run() { if (!queue.isEmpty()) { online = !online; http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d1ab1b59/framework/src/org/apache/cordova/api/LegacyContext.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/api/LegacyContext.java b/framework/src/org/apache/cordova/api/LegacyContext.java index b8bc0ae..c303038 100644 --- a/framework/src/org/apache/cordova/api/LegacyContext.java +++ b/framework/src/org/apache/cordova/api/LegacyContext.java @@ -148,7 +148,6 @@ public class LegacyContext implements CordovaInterface { this.cordova.getActivity().unbindService(conn); } - @Override public ExecutorService getThreadPool() { Log.i(LOG_TAG, "Replace ctx.getThreadPool() with cordova.getThreadPool()"); return this.cordova.getThreadPool();
