From b9e1ba8f7a8ff9cc6d3f102720a9535d5b772b77 Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Sat, 29 May 2010 07:11:29 +0000 Subject: [PATCH] Remove all @Override annotations Some build errors related to these annotations occurred, and they're not necessary. Remove them. Fix suggested by n8fr8. svn:r22440 --- src/org/torproject/android/Orbot.java | 12 +----------- .../torproject/android/net/SocksSocketFactory.java | 3 --- src/org/torproject/android/service/TorService.java | 13 ------------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 2de30908..74c3da4d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -69,7 +69,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On ITorService mService = null; /** Called when the activity is first created. */ - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -120,7 +119,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On * (non-Javadoc) * @see android.app.Activity#onMenuItemSelected(int, android.view.MenuItem) */ - @Override public boolean onMenuItemSelected(int featureId, MenuItem item) { super.onMenuItemSelected(featureId, item); @@ -203,7 +201,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On /* (non-Javadoc) * @see android.app.Activity#onPause() */ - @Override protected void onPause() { super.onPause(); @@ -219,7 +216,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On super.onSaveInstanceState(savedInstanceState); } - @Override public void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); // Restore UI state from the savedInstanceState. @@ -232,7 +228,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On /* (non-Javadoc) * @see android.app.Activity#onResume() */ - @Override protected void onResume() { super.onResume(); @@ -253,7 +248,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On /* (non-Javadoc) * @see android.app.Activity#onStart() */ - @Override protected void onStart() { super.onStart(); @@ -271,7 +265,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On /* (non-Javadoc) * @see android.app.Activity#onStop() */ - @Override protected void onStop() { super.onStop(); @@ -334,7 +327,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On final TorifiedApp[] apps = TorServiceUtils.getApps(this); Arrays.sort(apps, new Comparator() { - @Override public int compare(TorifiedApp o1, TorifiedApp o2) { if (o1.isTorified() == o2.isTorified()) return o1.getName().compareTo(o2.getName()); if (o1.isTorified()) return -1; @@ -345,7 +337,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On final LayoutInflater inflater = getLayoutInflater(); final ListAdapter adapter = new ArrayAdapter(this,R.layout.layout_apps_item,R.id.itemtext,apps) { - @Override public View getView(int position, View convertView, ViewGroup parent) { ListEntry entry; if (convertView == null) { @@ -375,7 +366,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On /** * Called an application is check/unchecked */ - @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { final TorifiedApp app = (TorifiedApp) buttonView.getTag(); if (app != null) { @@ -858,7 +848,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On private static final int DISABLE_TOR_MSG = 3; private Handler mHandler = new Handler() { - @Override public void handleMessage(Message msg) { + public void handleMessage(Message msg) { switch (msg.what) { case BUMP_MSG: diff --git a/src/org/torproject/android/net/SocksSocketFactory.java b/src/org/torproject/android/net/SocksSocketFactory.java index 194a26f4..96674075 100644 --- a/src/org/torproject/android/net/SocksSocketFactory.java +++ b/src/org/torproject/android/net/SocksSocketFactory.java @@ -73,7 +73,6 @@ public class SocksSocketFactory implements SocketFactory { } - @Override public Socket connectSocket(Socket sock, String host, int port, InetAddress localAddress, int localPort, HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException { @@ -126,12 +125,10 @@ public class SocksSocketFactory implements SocketFactory { - @Override public Socket createSocket() throws IOException { return new Socket(); } - @Override public boolean isSecure(Socket sock) throws IllegalArgumentException { return false; } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 50e47842..21fab12f 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -44,7 +44,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable /** Called when the activity is first created. */ - @Override public void onCreate() { super.onCreate(); @@ -100,7 +99,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable /* (non-Javadoc) * @see android.app.Service#onLowMemory() */ - @Override public void onLowMemory() { super.onLowMemory(); @@ -112,7 +110,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable /* (non-Javadoc) * @see android.app.Service#onUnbind(android.content.Intent) */ - @Override public boolean onUnbind(Intent intent) { Log.i(TAG, "onUnbind Called: " + intent.getAction()); @@ -159,7 +156,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable /* (non-Javadoc) * @see android.app.Service#onRebind(android.content.Intent) */ - @Override public void onRebind(Intent intent) { super.onRebind(intent); @@ -170,7 +166,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable /* (non-Javadoc) * @see android.app.Service#onStart(android.content.Intent, int) */ - @Override public void onStart(Intent intent, int startId) { super.onStart(intent, startId); @@ -671,7 +666,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable - @Override public void message(String severity, String msg) { Log.i(TAG, "[Tor Control Port] " + severity + ": " + msg); @@ -693,13 +687,11 @@ public class TorService extends Service implements TorServiceConstants, Runnable } - @Override public void newDescriptors(List orList) { } - @Override public void orConnStatus(String status, String orName) { Log.i(TAG,"OrConnStatus=" + status + ": " + orName); @@ -708,30 +700,25 @@ public class TorService extends Service implements TorServiceConstants, Runnable } - @Override public void streamStatus(String status, String streamID, String target) { Log.i(TAG,"StreamStatus=" + status + ": " + streamID); } - @Override public void unrecognized(String type, String msg) { Log.i(TAG,"unrecognized log=" + type + ": " + msg); } - @Override public void bandwidthUsed(long read, long written) { } - @Override public void circuitStatus(String status, String circID, String path) { } - @Override public IBinder onBind(Intent intent) { // Select the interface to return. If your service only implements // a single interface, you can just return it here without checking