From 276a88c6a9598991a1aae246be2b27b69e84d3e0 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Tue, 10 Feb 2015 18:49:26 -0800
Subject: Fix checkstyle errors

---
 .../main/java/com/mapbox/mapboxgl/app/MainActivity.java  | 16 +++++++---------
 .../main/java/com/mapbox/mapboxgl/app/MapFragment.java   |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'android')

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
index 93029c6f51..c4b1f496da 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
@@ -14,7 +14,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.mapbox.mapboxgl.lib.LonLatZoom;
 import com.mapbox.mapboxgl.lib.MapView;
@@ -23,7 +22,6 @@ import com.mapzen.android.lost.LocationListener;
 import com.mapzen.android.lost.LocationRequest;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
 
 public class MainActivity extends ActionBarActivity {
 
@@ -70,30 +68,30 @@ public class MainActivity extends ActionBarActivity {
 
         // Load the layout
         setContentView(R.layout.activity_main);
-        mMapFragment = (MapFragment)getSupportFragmentManager().findFragmentById(R.id.fragment_map);
+        mMapFragment = (MapFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_map);
         mMapFragment.getMap().setOnFpsChangedListener(new MyOnFpsChangedListener());
         mMapFragment.getMap().setOnMapChangedListener(new MyOnMapChangedListener());
 
-        mFpsTextView = (TextView)findViewById(R.id.view_fps);
+        mFpsTextView = (TextView) findViewById(R.id.view_fps);
         mFpsTextView.setText("");
 
-        mCompassView = (ImageView)findViewById(R.id.view_compass);
+        mCompassView = (ImageView) findViewById(R.id.view_compass);
         mCompassView.setOnClickListener(new CompassOnClickListener());
 
         // Add a toolbar as the action bar
-        Toolbar mainToolbar = (Toolbar)findViewById(R.id.toolbar_main);
+        Toolbar mainToolbar = (Toolbar) findViewById(R.id.toolbar_main);
         setSupportActionBar(mainToolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(false);
 
         // Add the spinner to select map styles
-        Spinner styleSpinner = (Spinner)findViewById(R.id.spinner_style);
+        Spinner styleSpinner = (Spinner) findViewById(R.id.spinner_style);
         ArrayAdapter styleAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
                 R.array.style_list, android.R.layout.simple_spinner_dropdown_item);
         styleSpinner.setAdapter(styleAdapter);
         styleSpinner.setOnItemSelectedListener(new StyleSpinnerListener());
 
         // Add the spinner to select class styles
-        mClassSpinner = (Spinner)findViewById(R.id.spinner_class);
+        mClassSpinner = (Spinner) findViewById(R.id.spinner_class);
         mOutdoorsClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
                 R.array.outdoors_class_list, android.R.layout.simple_spinner_dropdown_item);
         mSatelliteClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
@@ -364,7 +362,7 @@ public class MainActivity extends ActionBarActivity {
 
         @Override
         public void onMapChanged() {
-            mCompassView.setRotation((float)mMapFragment.getMap().getDirection());
+            mCompassView.setRotation((float) mMapFragment.getMap().getDirection());
         }
     }
 
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
index a9e6f0c89f..0249dab293 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
@@ -48,7 +48,7 @@ public class MapFragment extends Fragment {
             String line = reader.readLine();
             mMap.setAccessToken(line);
         } catch (IOException e) {
-            // Do nothing
+            return null;
         }
 
         // Need to pass on any saved state to the map
-- 
cgit v1.2.1