Closed Bug 1098082 Opened 7 years ago Closed 7 years ago

Merge identical catch blocks

Categories

(Firefox for Android Graveyard :: General, defect)

ARM
Android
defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
Firefox 36

People

(Reporter: ckitching, Assigned: ckitching)

Details

Attachments

(1 file)

Multi-catch FTW...
Attachment #8521884 - Flags: review?(rnewman)
Comment on attachment 8521884 [details] [diff] [review]
Merge identical catch branches

Review of attachment 8521884 [details] [diff] [review]:
-----------------------------------------------------------------

Hooray!

Don't forget to upstream necessary changes.

::: mobile/android/base/GeckoAppShell.java
@@ +1850,5 @@
>      private static final String PLUGIN_SYSTEM_LIB = "/system/lib/plugins/";
>  
>      private static final String PLUGIN_TYPE = "type";
>      private static final String TYPE_NATIVE = "native";
> +    static public final ArrayList<PackageInfo> mPackageInfoCache = new ArrayList<>();

If you're breaking blame like this, also fix the order -- public static final.

@@ +2126,5 @@
>      public static android.hardware.Camera sCamera;
>  
>      static native void cameraCallbackBridge(byte[] data);
>  
> +    static final int kPreferedFps = 25;

Fix to kPreferredFPS while you're here.

@@ +2196,5 @@
>                      } else if (cameraView instanceof TextureView) {
>                          sCamera.setPreviewTexture(((TextureView)cameraView).getSurfaceTexture());
>                      }
>                  }
> +            } catch(IOException | RuntimeException e) {

Space before (.

::: mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
@@ +277,3 @@
>          }
>  
> +          long lastLocalRetrieval  = 0;      // lastSyncTimestamp?

Fix indenting, remove duplicate space before =.

::: mobile/android/base/widget/ActivityChooserModel.java
@@ +1187,5 @@
>  
>                  if (DEBUG) {
>                      Log.i(LOG_TAG, "Wrote " + recordCount + " historical records.");
>                  }
> +            } catch (IllegalArgumentException | IOException | IllegalStateException iae) {

Rename the var, too.
Attachment #8521884 - Flags: review?(rnewman) → review+
(In reply to Richard Newman [:rnewman] from comment #2)
> ::: mobile/android/base/GeckoAppShell.java
> @@ +1850,5 @@
> >      private static final String PLUGIN_SYSTEM_LIB = "/system/lib/plugins/";
> >  
> >      private static final String PLUGIN_TYPE = "type";
> >      private static final String TYPE_NATIVE = "native";
> > +    static public final ArrayList<PackageInfo> mPackageInfoCache = new ArrayList<>();
> 
> If you're breaking blame like this, also fix the order -- public static
> final.

Hnh, some finalisations got applied as well. Oh well, might as well keep them...

See also: Bug 1081594
(Chris introduced some errors between review and landing. This commit built on my machine.)
Status: NEW → ASSIGNED
Flags: needinfo?(chriskitching)
:(

Thanks for the save, rnewman.
https://hg.mozilla.org/mozilla-central/rev/13f4001fe317
Status: ASSIGNED → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 36
Chris: no more pull requests without you having run `mvn clean test`. You broke the build with source that didn't even compile.
(In reply to Richard Newman [:rnewman] from comment #11)
> Chris: no more pull requests without you having run `mvn clean test`. You
> broke the build with source that didn't even compile.

ACK.
Product: Firefox for Android → Firefox for Android Graveyard
You need to log in before you can comment on or make changes to this bug.