Fixing Java style errors in net/android/

BUG=320711
NOTRY=true

Review URL: https://codereview.chromium.org/112163002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240132 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 73 insertions, 65 deletions

diff --git a/net/android/java/src/org/chromium/net/AndroidKeyStore.java b/net/android/java/src/org/chromium/net/AndroidKeyStore.java
index bc25bf3..1396bf1 100644
--- a/net/android/java/src/org/chromium/net/AndroidKeyStore.java
+++ b/net/android/java/src/org/chromium/net/AndroidKeyStore.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
index 2d51f42..83775d89 100644
--- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -33,9 +33,9 @@ class AndroidNetworkLibrary {
 
     /**
      * Stores the key pair through the CertInstaller activity.
-     * @param context: current application context.
-     * @param public_key: The public key bytes as DER-encoded SubjectPublicKeyInfo (X.509)
-     * @param private_key: The private key as DER-encoded PrivateKeyInfo (PKCS#8).
+     * @param context current application context.
+     * @param publicKey The public key bytes as DER-encoded SubjectPublicKeyInfo (X.509)
+     * @param privateKey The private key as DER-encoded PrivateKeyInfo (PKCS#8).
      * @return: true on success, false on failure.
      *
      * Note that failure means that the function could not launch the CertInstaller
@@ -43,15 +43,15 @@ class AndroidNetworkLibrary {
      * by the CertInstaller UI itself.
      */
     @CalledByNative
-    static public boolean storeKeyPair(Context context, byte[] public_key, byte[] private_key) {
+    public static boolean storeKeyPair(Context context, byte[] publicKey, byte[] privateKey) {
         // TODO(digit): Use KeyChain official extra values to pass the public and private
         // keys when they're available. The "KEY" and "PKEY" hard-coded constants were taken
         // from the platform sources, since there are no official KeyChain.EXTRA_XXX definitions
         // for them. b/5859651
         try {
             Intent intent = KeyChain.createInstallIntent();
-            intent.putExtra("PKEY", private_key);
-            intent.putExtra("KEY", public_key);
+            intent.putExtra("PKEY", privateKey);
+            intent.putExtra("KEY", publicKey);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
             return true;
@@ -65,9 +65,9 @@ class AndroidNetworkLibrary {
       * Adds a cryptographic file (User certificate, a CA certificate or
       * PKCS#12 keychain) through the system's CertInstaller activity.
       *
-      * @param context: current application context.
-      * @param cert_type: cryptographic file type. E.g. CertificateMimeType.X509_USER_CERT
-      * @param data: certificate/keychain data bytes.
+      * @param context current application context.
+      * @param certType cryptographic file type. E.g. CertificateMimeType.X509_USER_CERT
+      * @param data certificate/keychain data bytes.
       * @return true on success, false on failure.
       *
       * Note that failure only indicates that the function couldn't launch the
@@ -75,24 +75,24 @@ class AndroidNetworkLibrary {
       * installed to the keystore.
       */
     @CalledByNative
-    static public boolean storeCertificate(Context context, int cert_type, byte[] data) {
+    public static boolean storeCertificate(Context context, int certType, byte[] data) {
         try {
             Intent intent = KeyChain.createInstallIntent();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-            switch (cert_type) {
-              case CertificateMimeType.X509_USER_CERT:
-              case CertificateMimeType.X509_CA_CERT:
-                intent.putExtra(KeyChain.EXTRA_CERTIFICATE, data);
-                break;
+            switch (certType) {
+                case CertificateMimeType.X509_USER_CERT:
+                case CertificateMimeType.X509_CA_CERT:
+                    intent.putExtra(KeyChain.EXTRA_CERTIFICATE, data);
+                    break;
 
-              case CertificateMimeType.PKCS12_ARCHIVE:
-                intent.putExtra(KeyChain.EXTRA_PKCS12, data);
-                break;
+                case CertificateMimeType.PKCS12_ARCHIVE:
+                    intent.putExtra(KeyChain.EXTRA_PKCS12, data);
+                    break;
 
-              default:
-                Log.w(TAG, "invalid certificate type: " + cert_type);
-                return false;
+                default:
+                    Log.w(TAG, "invalid certificate type: " + certType);
+                    return false;
             }
             context.startActivity(intent);
             return true;
@@ -107,7 +107,7 @@ class AndroidNetworkLibrary {
      *         extension. Returns null if no corresponding mime type exists.
      */
     @CalledByNative
-    static public String getMimeTypeFromExtension(String extension) {
+    public static String getMimeTypeFromExtension(String extension) {
         return URLConnection.guessContentTypeFromName("foo." + extension);
     }
 
@@ -117,7 +117,7 @@ class AndroidNetworkLibrary {
      *         returns false if it cannot determine this.
      */
     @CalledByNative
-    static public boolean haveOnlyLoopbackAddresses() {
+    public static boolean haveOnlyLoopbackAddresses() {
         Enumeration<NetworkInterface> list = null;
         try {
             list = NetworkInterface.getNetworkInterfaces();
@@ -148,7 +148,7 @@ class AndroidNetworkLibrary {
      *         represents a network list string with two items.
      */
     @CalledByNative
-    static public String getNetworkList() {
+    public static String getNetworkList() {
         Enumeration<NetworkInterface> list = null;
         try {
             list = NetworkInterface.getNetworkInterfaces();
diff --git a/net/android/java/src/org/chromium/net/GURLUtils.java b/net/android/java/src/org/chromium/net/GURLUtils.java
index 719ddea..f69ea25 100644
--- a/net/android/java/src/org/chromium/net/GURLUtils.java
+++ b/net/android/java/src/org/chromium/net/GURLUtils.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java
index 6ea1ec0..fcf8439 100644
--- a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java
+++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
index 2c9650a..53bb1ec 100644
--- a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
+++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -97,8 +97,8 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
      */
     private void registerReceiver() {
         if (!mRegistered) {
-          mRegistered = true;
-          mContext.registerReceiver(this, mIntentFilter);
+            mRegistered = true;
+            mContext.registerReceiver(this, mIntentFilter);
         }
     }
 
@@ -107,8 +107,8 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
      */
     private void unregisterReceiver() {
         if (mRegistered) {
-           mRegistered = false;
-           mContext.unregisterReceiver(this);
+            mRegistered = false;
+            mContext.unregisterReceiver(this);
         }
     }
 
@@ -189,7 +189,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
 
     private static class NetworkConnectivityIntentFilter extends IntentFilter {
         NetworkConnectivityIntentFilter() {
-                addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+            addAction(ConnectivityManager.CONNECTIVITY_ACTION);
         }
     }
 }
diff --git a/net/android/java/src/org/chromium/net/ProxyChangeListener.java b/net/android/java/src/org/chromium/net/ProxyChangeListener.java
index d94f5b9..634c379 100644
--- a/net/android/java/src/org/chromium/net/ProxyChangeListener.java
+++ b/net/android/java/src/org/chromium/net/ProxyChangeListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -17,8 +17,10 @@ import org.chromium.base.NativeClassQualifiedName;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-// This class partners with native ProxyConfigServiceAndroid to listen for
-// proxy change notifications from Android.
+/**
+ * This class partners with native ProxyConfigServiceAndroid to listen for
+ * proxy change notifications from Android.
+ */
 @JNINamespace("net")
 public class ProxyChangeListener {
     private static final String TAG = "ProxyChangeListener";
@@ -36,7 +38,7 @@ public class ProxyChangeListener {
         }
         public final String mHost;
         public final int mPort;
-    };
+    }
 
     public interface Delegate {
         public void proxySettingsChanged();
@@ -55,12 +57,12 @@ public class ProxyChangeListener {
     }
 
     @CalledByNative
-    static public ProxyChangeListener create(Context context) {
+    public static ProxyChangeListener create(Context context) {
         return new ProxyChangeListener(context);
     }
 
     @CalledByNative
-    static public String getProperty(String property) {
+    public static String getProperty(String property) {
         return System.getProperty(property);
     }
 
@@ -105,8 +107,8 @@ public class ProxyChangeListener {
                 Method getHostMethod = cls.getDeclaredMethod(GET_HOST_NAME);
                 Method getPortMethod = cls.getDeclaredMethod(GET_PORT_NAME);
 
-                String host = (String)getHostMethod.invoke(props);
-                int port = (Integer)getPortMethod.invoke(props);
+                String host = (String) getHostMethod.invoke(props);
+                int port = (Integer) getPortMethod.invoke(props);
 
                 return new ProxyConfig(host, port);
             } catch (ClassNotFoundException ex) {
@@ -128,10 +130,10 @@ public class ProxyChangeListener {
             return;
         }
         if (mDelegate != null) {
-          mDelegate.proxySettingsChanged();
+            mDelegate.proxySettingsChanged();
         }
         if (mNativePtr == 0) {
-          return;
+            return;
         }
         // Note that this code currently runs on a MESSAGE_LOOP_UI thread, but
         // the C++ code must run the callbacks on the network thread.
diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java
index 0ded54d..76adb89 100644
--- a/net/android/java/src/org/chromium/net/X509Util.java
+++ b/net/android/java/src/org/chromium/net/X509Util.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -98,7 +98,7 @@ public class X509Util {
      */
     private static void ensureInitialized() throws CertificateException,
             KeyStoreException, NoSuchAlgorithmException {
-        synchronized(sLock) {
+        synchronized (sLock) {
             if (sCertificateFactory == null) {
                 sCertificateFactory = CertificateFactory.getInstance("X.509");
             }
@@ -109,7 +109,9 @@ public class X509Util {
                 sTestKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
                 try {
                     sTestKeyStore.load(null);
-                } catch(IOException e) {}  // No IO operation is attempted.
+                } catch (IOException e) {
+                    // No IO operation is attempted.
+                }
             }
             if (sTestTrustManager == null) {
                 sTestTrustManager = X509Util.createTrustManager(sTestKeyStore);
@@ -188,7 +190,9 @@ public class X509Util {
             try {
                 sTestKeyStore.load(null);
                 reloadTestTrustManager();
-            } catch (IOException e) {}  // No IO operation is attempted.
+            } catch (IOException e) {
+                // No IO operation is attempted.
+            }
         }
     }
 
diff --git a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
index 58dd26a..ab832c9 100644
--- a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
+++ b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -28,8 +28,7 @@ public class AndroidKeyStoreTestUtil {
      * @return new PrivateKey handle, or null in case of error.
      */
     @CalledByNative
-    public static PrivateKey createPrivateKeyFromPKCS8(int type,
-                                                       byte[] encoded_key) {
+    public static PrivateKey createPrivateKeyFromPKCS8(int type, byte[] encodedKey) {
         String algorithm = null;
         switch (type) {
             case PrivateKeyType.RSA:
@@ -47,7 +46,7 @@ public class AndroidKeyStoreTestUtil {
 
         try {
             KeyFactory factory = KeyFactory.getInstance(algorithm);
-            KeySpec ks = new PKCS8EncodedKeySpec(encoded_key);
+            KeySpec ks = new PKCS8EncodedKeySpec(encodedKey);
             PrivateKey key = factory.generatePrivate(ks);
             return key;
 
diff --git a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
index 70143c5..239a1ed 100644
--- a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
+++ b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -45,13 +45,16 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
         // java.net.Proxy only knows about http and socks proxies.
         Proxy.Type type = proxy.type();
         switch (type) {
-        case HTTP: return "PROXY " + proxy.address().toString();
-        case SOCKS: return "SOCKS5 " + proxy.address().toString();
-        case DIRECT: return "DIRECT";
-        default:
-            // If a new proxy type is supported in future, add a case to match it.
-            fail("Unknown proxy type" + type);
-            return "unknown://";
+            case HTTP:
+                return "PROXY " + proxy.address().toString();
+            case SOCKS:
+                return "SOCKS5 " + proxy.address().toString();
+            case DIRECT:
+                return "DIRECT";
+            default:
+                // If a new proxy type is supported in future, add a case to match it.
+                fail("Unknown proxy type" + type);
+                return "unknown://";
         }
     }
 
@@ -63,7 +66,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
             builder.append(toString(proxy));
         }
         return builder.toString();
-   }
+    }
 
     static void checkMapping(String url, String expected) throws URISyntaxException {
         URI uri = new URI(url);
diff --git a/net/android/javatests/src/org/chromium/net/NetErrorsTest.java b/net/android/javatests/src/org/chromium/net/NetErrorsTest.java
index 57885b2..89b284a 100644
--- a/net/android/javatests/src/org/chromium/net/NetErrorsTest.java
+++ b/net/android/javatests/src/org/chromium/net/NetErrorsTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -15,8 +15,8 @@ import org.chromium.base.test.util.Feature;
 
 public class NetErrorsTest extends InstrumentationTestCase {
     // These are manually copied and should be kept in sync with net_error_list.h.
-    private static int IO_PENDING_ERROR = -1;
-    private static int FAILED_ERROR = -2;
+    private static final int IO_PENDING_ERROR = -1;
+    private static final int FAILED_ERROR = -2;
 
     /**
      * Test whether we can include NetError.java and call to static integers defined in the file.
diff --git a/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java b/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
index b52d184..039013e 100644
--- a/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
+++ b/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.