Bug 1258789 - Add rcurly and fix {} issues. r=grisha

MozReview-Commit-ID: m2dF4mPC1u

--HG--
extra : rebase_source : 6797dc55ab478d310f43a77badc83eabcedd0d6d

mobile/android/app/checkstyle.xml

@@ -61,7 +61,7 @@
             <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN,
                     LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
                     LOR, LT, NOT_EQUAL, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND,
-                    PLUS, PLUS_ASSIGN, MOD, MOD_ASSIGN, LE, LAND, GT, GE"/>
+                    PLUS, PLUS_ASSIGN, MOD, MOD_ASSIGN, LE, LAND, GT, GE, RCURLY"/>
         </module>
     </module>
 

mobile/android/base/java/org/mozilla/gecko/ContactService.java

@@ -657,7 +657,7 @@ public class ContactService implements GeckoEventListener {
         if (DEBUG) {
             try {
                 Log.d(LOGTAG, "Got contact: " + contact.toString(3));
-            } catch (JSONException e) {}
+            } catch (JSONException e) { }
         }
 
         return contact;

mobile/android/base/java/org/mozilla/gecko/GeckoApp.java

@@ -1132,7 +1132,7 @@ public abstract class GeckoApp
         // Workaround for <http://code.google.com/p/android/issues/detail?id=20915>.
         try {
             Class.forName("android.os.AsyncTask");
-        } catch (ClassNotFoundException e) {}
+        } catch (ClassNotFoundException e) { }
 
         MemoryMonitor.getInstance().init(getApplicationContext());
 

mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java

@@ -1297,7 +1297,7 @@ public class GeckoAppShell
             if (null != cmdlineReader) {
                 try {
                     cmdlineReader.close();
-                } catch (Exception e) {}
+                } catch (Exception e) { }
             }
         }
     }
@@ -1792,7 +1792,7 @@ public class GeckoAppShell
                     try {
                         if (getGeckoInterface() != null)
                             getGeckoInterface().enableCameraView();
-                    } catch (Exception e) {}
+                    } catch (Exception e) { }
                 }
             });
 
@@ -1886,7 +1886,7 @@ public class GeckoAppShell
                     try {
                         if (getGeckoInterface() != null)
                             getGeckoInterface().disableCameraView();
-                    } catch (Exception e) {}
+                    } catch (Exception e) { }
                 }
             });
         if (sCamera != null) {
@@ -2210,7 +2210,7 @@ public class GeckoAppShell
                             try {
                                 bitmap.compress(Bitmap.CompressFormat.PNG, 100, output);
                                 output.close();
-                            } catch (IOException ioe) {}
+                            } catch (IOException ioe) { }
                         }
                     });
                 mHaveConnected = true;

mobile/android/base/java/org/mozilla/gecko/GeckoNetworkManager.java

@@ -301,8 +301,7 @@ public class GeckoNetworkManager extends BroadcastReceiver implements NativeEven
         NetworkInfo ni = null;
         try {
             ni = cm.getActiveNetworkInfo();
-        } catch (SecurityException se) {} // if we don't have the permission, fall through to null check
-
+        } catch (SecurityException se) { /* if we don't have the permission, fall through to null check */ }
         if (ni == null) {
             return ConnectionType.NONE;
         }

mobile/android/base/java/org/mozilla/gecko/lwt/LightweightTheme.java

@@ -143,7 +143,7 @@ public class LightweightTheme implements GeckoEventListener {
                 if (stream != null) {
                     try {
                         stream.close();
-                    } catch (IOException e) {}
+                    } catch (IOException e) { }
                 }
             }
         }

mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java

@@ -609,12 +609,12 @@ public class UpdateService extends IntentService {
             try {
                 if (input != null)
                     input.close();
-            } catch (java.io.IOException e) {}
+            } catch (java.io.IOException e) { }
 
             try {
                 if (output != null)
                     output.close();
-            } catch (java.io.IOException e) {}
+            } catch (java.io.IOException e) { }
 
             mDownloading = false;
 
@@ -646,7 +646,7 @@ public class UpdateService extends IntentService {
             try {
                 if (input != null)
                     input.close();
-            } catch (java.io.IOException e) {}
+            } catch (java.io.IOException e) { }
         }
 
         String hex = Hex.encodeHexString(digest.digest());

mobile/android/base/java/org/mozilla/gecko/util/Clipboard.java

@@ -48,7 +48,7 @@ public final class Clipboard {
                 String text = getClipboardTextImpl();
                 try {
                     sClipboardQueue.put(text != null ? text : "");
-                } catch (InterruptedException ie) {}
+                } catch (InterruptedException ie) { }
             }
         });
 

mobile/android/base/java/org/mozilla/gecko/util/IOUtils.java

@@ -115,7 +115,7 @@ public class IOUtils {
         try {
             if (stream != null)
                 stream.close();
-        } catch (IOException e) {}
+        } catch (IOException e) { }
     }
 
     public static void copy(InputStream in, OutputStream out) throws IOException {

mobile/android/base/java/org/mozilla/gecko/widget/ContentSecurityDoorHanger.java

@@ -92,7 +92,7 @@ public class ContentSecurityDoorHanger extends DoorHanger {
                 }
                 mMessage.setVisibility(VISIBLE);
                 mSecurityState.setVisibility(VISIBLE);
-            } catch (JSONException e) {}
+            } catch (JSONException e) { }
         }
     }