Bug 847839 - Part 1b: Clean up VideoPlayer.java style nits. r=mfinkle
authorChris Peterson <cpeterson@mozilla.com>
Fri, 08 Mar 2013 10:35:29 +0000
changeset 125484 a93c2f4828ae404583f730fda1d8bf52a78c4633
parent 125483 8f93de36b3bc3f7ede7ce5f3e2ce88b2365f4ae1
child 125485 6b8e128a989c40614621dd72a437d9e66435afd2
push id24459
push useremorley@mozilla.com
push dateWed, 20 Mar 2013 11:46:36 +0000
treeherdermozilla-central@1d6fe70c79c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs847839
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 847839 - Part 1b: Clean up VideoPlayer.java style nits. r=mfinkle
mobile/android/base/VideoPlayer.java
--- a/mobile/android/base/VideoPlayer.java
+++ b/mobile/android/base/VideoPlayer.java
@@ -1,33 +1,36 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import android.util.*;
-import android.widget.*;
-import android.net.*;
-import android.content.Intent;
+import android.util.Log;
+import android.widget.MediaController;
+import android.widget.VideoView;
 
-public class VideoPlayer extends Activity
-{
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+
+public final class VideoPlayer extends Activity {
     public static final String VIDEO_ACTION = "org.mozilla.gecko.PLAY_VIDEO";
 
+    private VideoView mVideoView;
+
     /** Called when the activity is first created. */
     @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.videoplayer);
         mVideoView = (VideoView) findViewById(R.id.VideoView);
         MediaController mediaController = new MediaController(this);
         mediaController.setAnchorView(mVideoView);
         Intent intent = getIntent();
         Uri data = intent.getData();
         if (data == null)
@@ -41,35 +44,33 @@ public class VideoPlayer extends Activit
         if (spec == null)
             return;
         Uri video = Uri.parse(spec);
         mVideoView.setMediaController(mediaController);
         mVideoView.setVideoURI(video);
         mVideoView.start();
     }
 
-    VideoView mVideoView;
-
-    String getSpecFromYouTubeVideoID(String id) {
+    private String getSpecFromYouTubeVideoID(String id) {
         String spec = null;
         try {
-            String info_uri = "http://www.youtube.com/get_video_info?&video_id=" + id;
-            URL info_url = new URL(info_uri);
-            URLConnection urlConnection = info_url.openConnection();
+            String infoUri = "http://www.youtube.com/get_video_info?&video_id=" + id;
+            URL infoUrl = new URL(infoUri);
+            URLConnection urlConnection = infoUrl.openConnection();
             BufferedReader br = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
             try {
                 StringBuilder sb = new StringBuilder();
                 String line;
                 while ((line = br.readLine()) != null)
                     sb.append(line);
                 android.net.Uri fakeUri = android.net.Uri.parse("fake:/fake?" + sb);
-                String stream_map = fakeUri.getQueryParameter("url_encoded_fmt_stream_map");
-                if (stream_map == null)
+                String streamMap = fakeUri.getQueryParameter("url_encoded_fmt_stream_map");
+                if (streamMap == null)
                     return null;
-                String[] streams = stream_map.split(",");
+                String[] streams = streamMap.split(",");
                 for (int i = 0; i < streams.length; i++) {
                     fakeUri = android.net.Uri.parse("fake:/fake?" + streams[i]);
                     String url = fakeUri.getQueryParameter("url");
                     String type = fakeUri.getQueryParameter("type");
                     if (type != null && url != null &&
                         (type.startsWith("video/mp4") || type.startsWith("video/webm"))) {
                         spec = url;
                     }