Auto reformat; optimize imports; minor JavaDoc fixes.
diff --git a/src/main/java/com/xtremelabs/robolectric/ApplicationResolver.java b/src/main/java/com/xtremelabs/robolectric/ApplicationResolver.java
index 343e389..76d3118 100644
--- a/src/main/java/com/xtremelabs/robolectric/ApplicationResolver.java
+++ b/src/main/java/com/xtremelabs/robolectric/ApplicationResolver.java
@@ -21,10 +21,10 @@
         String packageName = null;
         try {
             Document manifestDoc =
-                DocumentBuilderFactory
-                    .newInstance()
-                    .newDocumentBuilder()
-                    .parse(androidManifestPath);
+                    DocumentBuilderFactory
+                            .newInstance()
+                            .newDocumentBuilder()
+                            .parse(androidManifestPath);
 
             packageName = getTagAttributeText(manifestDoc, "manifest", "package");
             //TODO: should use getNamedItemNS, but that's not working as expected
diff --git a/src/main/java/com/xtremelabs/robolectric/Robolectric.java b/src/main/java/com/xtremelabs/robolectric/Robolectric.java
index 10ec5f9..9346ffe 100644
--- a/src/main/java/com/xtremelabs/robolectric/Robolectric.java
+++ b/src/main/java/com/xtremelabs/robolectric/Robolectric.java
@@ -495,7 +495,7 @@
     public static ShadowCameraSize shadowOf(Camera.Size instance) {
         return (ShadowCameraSize) shadowOf_(instance);
     }
-    
+
     public static ShadowMediaPlayer shadowOf(MediaPlayer instance) {
         return (ShadowMediaPlayer) shadowOf_(instance);
     }
@@ -512,8 +512,8 @@
         return (ShadowAlarmManager) Robolectric.shadowOf_(instance);
     }
 
-public static ShadowConfiguration shadowOf(Configuration instance) {
-    	return (ShadowConfiguration) Robolectric.shadowOf_(instance);
+    public static ShadowConfiguration shadowOf(Configuration instance) {
+        return (ShadowConfiguration) Robolectric.shadowOf_(instance);
     }
 
     public static ShadowBitmap shadowOf(Bitmap other) {
diff --git a/src/main/java/com/xtremelabs/robolectric/RobolectricConfig.java b/src/main/java/com/xtremelabs/robolectric/RobolectricConfig.java
index f81a4aa..0f48d7c 100644
--- a/src/main/java/com/xtremelabs/robolectric/RobolectricConfig.java
+++ b/src/main/java/com/xtremelabs/robolectric/RobolectricConfig.java
@@ -17,7 +17,7 @@
 
     /**
      * Creates a Robolectric configuration using default Android files relative to the specified base directory.
-     *
+     * <p/>
      * The manifest will be baseDir/AndroidManifest.xml, res will be baseDir/res, and assets in baseDir/assets.
      *
      * @param baseDir the base directory of your Android project
diff --git a/src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java b/src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java
index be4aeae..89d109c 100644
--- a/src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java
+++ b/src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java
@@ -53,7 +53,7 @@
      * Creates a runner to run {@code testClass}. Looks in your working directory for your AndroidManifest.xml file
      * and res directory.
      *
-     * @param testClass            the test class to be run
+     * @param testClass the test class to be run
      * @throws InitializationError if junit says so
      */
     public RobolectricTestRunner(Class<?> testClass) throws InitializationError {
@@ -64,8 +64,8 @@
      * Call this constructor in subclasses in order to specify non-default configuration (e.g. location of the
      * AndroidManifest.xml file and resource directory).
      *
-     * @param testClass            the test class to be run
-     * @param robolectricConfig               the configuration data
+     * @param testClass         the test class to be run
+     * @param robolectricConfig the configuration data
      * @throws InitializationError if junit says so
      */
     protected RobolectricTestRunner(Class<?> testClass, RobolectricConfig robolectricConfig)
@@ -79,8 +79,8 @@
     /**
      * Call this constructor in subclasses in order to specify the project root directory.
      *
-     * @param testClass            the test class to be run
-     * @param androidProjectRoot   the directory containing your AndroidManifest.xml file and res dir
+     * @param testClass          the test class to be run
+     * @param androidProjectRoot the directory containing your AndroidManifest.xml file and res dir
      * @throws InitializationError if the test class is malformed
      */
     public RobolectricTestRunner(Class<?> testClass, File androidProjectRoot) throws InitializationError {
@@ -90,8 +90,8 @@
     /**
      * Call this constructor in subclasses in order to specify the project root directory.
      *
-     * @param testClass            the test class to be run
-     * @param androidProjectRoot   the directory containing your AndroidManifest.xml file and res dir
+     * @param testClass          the test class to be run
+     * @param androidProjectRoot the directory containing your AndroidManifest.xml file and res dir
      * @throws InitializationError if junit says so
      * @deprecated Use {@link #RobolectricTestRunner(Class, File)} instead.
      */
@@ -105,9 +105,9 @@
      * contains package name for the {@code R} class which contains the identifiers for all of the resources. The
      * resource directory is where the resource loader will look for resources to load.
      *
-     * @param testClass            the test class to be run
-     * @param androidManifestPath  the AndroidManifest.xml file
-     * @param resourceDirectory    the directory containing the project's resources
+     * @param testClass           the test class to be run
+     * @param androidManifestPath the AndroidManifest.xml file
+     * @param resourceDirectory   the directory containing the project's resources
      * @throws InitializationError if junit says so
      */
     protected RobolectricTestRunner(Class<?> testClass, File androidManifestPath, File resourceDirectory)
@@ -145,10 +145,10 @@
      * resource directory, use {@link #RobolectricTestRunner(Class, String, String)}. For other extensions, consider
      * creating a subclass and overriding the documented methods of this class.
      *
-     * @param testClass           the test class to be run
-     * @param classHandler        the {@link ClassHandler} to use to in shadow delegation
-     * @param classLoader         the {@link RobolectricClassLoader}
-     * @param robolectricConfig              the configuration
+     * @param testClass         the test class to be run
+     * @param classHandler      the {@link ClassHandler} to use to in shadow delegation
+     * @param classLoader       the {@link RobolectricClassLoader}
+     * @param robolectricConfig the configuration
      * @throws InitializationError if junit says so
      */
     protected RobolectricTestRunner(Class<?> testClass, ClassHandler classHandler, RobolectricClassLoader classLoader, RobolectricConfig robolectricConfig) throws InitializationError {
@@ -182,7 +182,7 @@
 
     /**
      * Only used when creating the delegate instance within the instrumented ClassLoader.
-     *
+     * <p/>
      * This is not the constructor you are looking for.
      */
     @SuppressWarnings({"UnusedDeclaration", "JavaDoc"})
@@ -292,11 +292,11 @@
 
     /**
      * Override this method if you want to provide your own implementation of Application.
-     *
+     * <p/>
      * This method attempts to instantiate an application instance as specified by the AndroidManifest.xml.
      *
      * @return An instance of the Application class specified by the ApplicationManifest.xml or an instance of
-     * Application if not specified.
+     *         Application if not specified.
      */
     protected Application createApplication() {
         return new ApplicationResolver(robolectricConfig.getAndroidManifestFile()).resolveApplication();
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/ClassCache.java b/src/main/java/com/xtremelabs/robolectric/bytecode/ClassCache.java
index bde1ab7..9698cd1 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/ClassCache.java
+++ b/src/main/java/com/xtremelabs/robolectric/bytecode/ClassCache.java
@@ -1,10 +1,18 @@
 package com.xtremelabs.robolectric.bytecode;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.jar.*;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
 
 public class ClassCache {
     private static final Attributes.Name VERSION_ATTRIBUTE = new Attributes.Name("version");
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricInternals.java b/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricInternals.java
index 860137f..2965432 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricInternals.java
+++ b/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricInternals.java
@@ -49,8 +49,7 @@
             ShadowWrangler.getInstance().bindShadowClass(realClass.value(), shadowClass);
         } catch (TypeNotPresentException typeLoadingException) {
             String unloadableClassName = shadowClass.getSimpleName();
-            if (isIgnorable(typeLoadingException) )
-            {
+            if (isIgnorable(typeLoadingException)) {
                 //this allows users of the robolectric.jar file to use the non-Google APIs version of the api
                 if (unloadableClassNames.add(unloadableClassName)) {
                     System.out.println("Warning: an error occurred while binding shadow class: " + unloadableClassName);
@@ -65,7 +64,7 @@
         Throwable cause = typeLoadingException.getCause();
         if (cause instanceof NoClassDefFoundError) {
             cause = cause.getCause();
-            if (cause instanceof  ClassNotFoundException) {
+            if (cause instanceof ClassNotFoundException) {
                 cause = cause.getCause();
                 // instanceof doesn't work here. Are we in different classloaders?
                 if (cause.getClass().getName().equals(RobolectricClassNotFoundException.class.getName())) {
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/ShadowWrangler.java b/src/main/java/com/xtremelabs/robolectric/bytecode/ShadowWrangler.java
index 6501b87..8d362a3 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/ShadowWrangler.java
+++ b/src/main/java/com/xtremelabs/robolectric/bytecode/ShadowWrangler.java
@@ -8,8 +8,17 @@
 import javassist.NotFoundException;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class ShadowWrangler implements ClassHandler {
     public static final String SHADOW_FIELD_NAME = "__shadow__";
diff --git a/src/main/java/com/xtremelabs/robolectric/content/TestSharedPreferences.java b/src/main/java/com/xtremelabs/robolectric/content/TestSharedPreferences.java
index 18dac52..348e910 100644
--- a/src/main/java/com/xtremelabs/robolectric/content/TestSharedPreferences.java
+++ b/src/main/java/com/xtremelabs/robolectric/content/TestSharedPreferences.java
@@ -83,48 +83,48 @@
 
     private class TestSharedPreferencesEditor implements Editor {
 
-    	Hashtable<String, Object> editsThatNeedCommit = new Hashtable<String, Object>();
-    	Set<String> editsThatNeedRemove = new HashSet<String>();
+        Hashtable<String, Object> editsThatNeedCommit = new Hashtable<String, Object>();
+        Set<String> editsThatNeedRemove = new HashSet<String>();
         private boolean shouldClearOnCommit = false;
 
         @Override
         public Editor putString(String key, String value) {
             editsThatNeedCommit.put(key, value);
-        	editsThatNeedRemove.remove(key);
+            editsThatNeedRemove.remove(key);
             return this;
         }
 
         @Override
         public Editor putInt(String key, int value) {
             editsThatNeedCommit.put(key, value);
-        	editsThatNeedRemove.remove(key);
+            editsThatNeedRemove.remove(key);
             return this;
         }
 
         @Override
         public Editor putLong(String key, long value) {
             editsThatNeedCommit.put(key, value);
-        	editsThatNeedRemove.remove(key);
+            editsThatNeedRemove.remove(key);
             return this;
         }
 
         @Override
         public Editor putFloat(String key, float value) {
             editsThatNeedCommit.put(key, value);
-        	editsThatNeedRemove.remove(key);
+            editsThatNeedRemove.remove(key);
             return this;
         }
 
         @Override
         public Editor putBoolean(String key, boolean value) {
             editsThatNeedCommit.put(key, value);
-        	editsThatNeedRemove.remove(key);
+            editsThatNeedRemove.remove(key);
             return this;
         }
 
         @Override
         public Editor remove(String key) {
-        	editsThatNeedRemove.add(key);
+            editsThatNeedRemove.add(key);
             return this;
         }
 
@@ -144,7 +144,7 @@
                     previousContent.put(key, editsThatNeedCommit.get(key));
                 }
                 for (String key : editsThatNeedRemove) {
-                	previousContent.remove(key);
+                    previousContent.remove(key);
                 }
             }
             return true;
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ColorResourceLoader.java b/src/main/java/com/xtremelabs/robolectric/res/ColorResourceLoader.java
index e24012e..5f0db12 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ColorResourceLoader.java
+++ b/src/main/java/com/xtremelabs/robolectric/res/ColorResourceLoader.java
@@ -50,7 +50,7 @@
             return androidColorsFromIds.get(colorId);
         } else {
             String resourceName = resourceExtractor.getResourceName(colorId);
-            return resourceName == null ? -1:colorResolver.getValue(resourceName);
+            return resourceName == null ? -1 : colorResolver.getValue(resourceName);
         }
     }
 
diff --git a/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java b/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
index 25c8f61..e928dbc 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
+++ b/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
@@ -28,12 +28,12 @@
     @Override
     protected void processResourceXml(File xmlFile, Document document) throws Exception {
         MenuNode topLevelNode = new MenuNode("top-level", new HashMap<String, String>());
-		
-		NodeList items = document.getChildNodes();
-		if (items.getLength()!=1)
-			throw new RuntimeException("Expected only one top-level item in menu file "+xmlFile.getName());
-		if (items.item(0).getNodeName().compareTo("menu")!=0)
-			throw new RuntimeException("Expected a top-level item called 'menu' in menu file "+xmlFile.getName());
+
+        NodeList items = document.getChildNodes();
+        if (items.getLength() != 1)
+            throw new RuntimeException("Expected only one top-level item in menu file " + xmlFile.getName());
+        if (items.item(0).getNodeName().compareTo("menu") != 0)
+            throw new RuntimeException("Expected a top-level item called 'menu' in menu file " + xmlFile.getName());
 
         processChildren(items.item(0).getChildNodes(), topLevelNode);
         menuNodesByMenuName.put(
@@ -61,11 +61,11 @@
         }
 
         if (!name.startsWith("#")) {
-			MenuNode menuNode = new MenuNode(name, attrMap);
-			parent.addChild(menuNode);
-			if (node.getChildNodes().getLength() != 0)
-				throw new RuntimeException(node.getChildNodes().toString());
-		}
+            MenuNode menuNode = new MenuNode(name, attrMap);
+            parent.addChild(menuNode);
+            if (node.getChildNodes().getLength() != 0)
+                throw new RuntimeException(node.getChildNodes().toString());
+        }
     }
 
     public void inflateMenu(Context context, String key, Menu root) {
@@ -116,12 +116,12 @@
 
         public void inflate(Context context, Menu root) throws Exception {
             for (MenuNode child : children) {
-				assert(child.getChildren().size() == 0);
-				MenuItem menuItem = root.add(child.attributes.get("android:id"));
-				assert (menuItem != null);
-				menuItem.setTitle(child.attributes.get("android:title"));
+                assert (child.getChildren().size() == 0);
+                MenuItem menuItem = root.add(child.attributes.get("android:id"));
+                assert (menuItem != null);
+                menuItem.setTitle(child.attributes.get("android:title"));
             }
         }
-	}
+    }
 }
 
diff --git a/src/main/java/com/xtremelabs/robolectric/res/RawResourceLoader.java b/src/main/java/com/xtremelabs/robolectric/res/RawResourceLoader.java
index 7fd2d59..da70f81 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/RawResourceLoader.java
+++ b/src/main/java/com/xtremelabs/robolectric/res/RawResourceLoader.java
@@ -7,13 +7,13 @@
 
 public class RawResourceLoader {
 
-	private ResourceExtractor resourceExtractor;
-	private File resourceDir;
+    private ResourceExtractor resourceExtractor;
+    private File resourceDir;
 
-	public RawResourceLoader(ResourceExtractor resourceExtractor, File resourceDir) {
-		this.resourceExtractor = resourceExtractor;
-		this.resourceDir = resourceDir;
-	}
+    public RawResourceLoader(ResourceExtractor resourceExtractor, File resourceDir) {
+        this.resourceExtractor = resourceExtractor;
+        this.resourceDir = resourceDir;
+    }
 
     public InputStream getValue(int resourceId) {
         String resourceFileName = resourceExtractor.getResourceName(resourceId);
@@ -37,9 +37,9 @@
                     return new FileInputStream(file);
                 }
             }
-		} catch (FileNotFoundException e) {
-			return null;
-		}
+        } catch (FileNotFoundException e) {
+            return null;
+        }
         return null;
     }
 
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java b/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
index 2f67145..1275ece 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
+++ b/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
@@ -77,7 +77,7 @@
                     }
                 });
                 menuDocumentLoader.loadResourceXmlDirs(menuDirs);
-             } else {
+            } else {
                 viewLoader = null;
                 menuLoader = null;
             }
@@ -95,9 +95,9 @@
         return path.contains(File.separator + "menu");
     }
 
- 	 /*
-     * For tests only...
-     */
+    /*
+    * For tests only...
+    */
     protected ResourceLoader(StringResourceLoader stringResourceLoader) {
         resourceExtractor = new ResourceExtractor();
         this.stringResourceLoader = stringResourceLoader;
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/HttpResponseStub.java b/src/main/java/com/xtremelabs/robolectric/shadows/HttpResponseStub.java
index d47fc8a..c0519e0 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/HttpResponseStub.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/HttpResponseStub.java
@@ -1,13 +1,18 @@
 package com.xtremelabs.robolectric.shadows;
 
-import org.apache.http.*;
+import org.apache.http.Header;
+import org.apache.http.HeaderIterator;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.ProtocolVersion;
+import org.apache.http.StatusLine;
 import org.apache.http.params.HttpParams;
 
 import java.util.Locale;
 
 public class HttpResponseStub implements HttpResponse {
     @Override public StatusLine getStatusLine() {
-                         throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException();
 
     }
 
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java
index 8c2001b..cc656c8 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java
@@ -9,26 +9,26 @@
 @Implements(AbstractCursor.class)
 public class ShadowAbstractCursor {
     @RealObject private AbstractCursor realAbstractCursor;
-    
+
     private int currentRowNumber = 0;
 
     @Implementation
     public boolean moveToFirst() {
-    	currentRowNumber = 0;
+        currentRowNumber = 0;
         return realAbstractCursor.getCount() > 0;
     }
-    
+
     @Implementation
     public int getPosition() {
-    	return currentRowNumber;
+        return currentRowNumber;
     }
-    
+
     @Implementation
     public boolean moveToNext() {
-    	if (currentRowNumber >= realAbstractCursor.getCount() - 1) {
-    		return false;
-    	}
-    	currentRowNumber++;
-    	return true;
+        if (currentRowNumber >= realAbstractCursor.getCount() - 1) {
+            return false;
+        }
+        currentRowNumber++;
+        return true;
     }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java
index 23d7354..af1652d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java
@@ -1,12 +1,8 @@
 package com.xtremelabs.robolectric.shadows;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
-import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.View;
@@ -19,7 +15,9 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static com.xtremelabs.robolectric.Robolectric.shadowOf;
@@ -38,7 +36,7 @@
     private Activity parent;
     private boolean finishWasCalled;
     private TestWindow window;
-    
+
     private List<IntentForResult> startedActivitiesForResults = new ArrayList<IntentForResult>();
 
     private Map<Intent, Integer> intentRequestCodeMap = new HashMap<Intent, Integer>();
@@ -128,7 +126,7 @@
     public void finish() {
         finishWasCalled = true;
     }
-    
+
     /**
      * @return whether {@link #finish()} was called
      */
@@ -166,7 +164,7 @@
     public void onDestroy() {
         assertNoBroadcastListenersRegistered();
     }
-    
+
     /**
      * Checks the {@code ApplicationContext} to see if {@code BroadcastListener}s are still registered.
      *
@@ -203,29 +201,29 @@
     public Intent getResultIntent() {
         return resultIntent;
     }
-    
+
     /**
      * Non-Android accessor consumes and returns the next {@code Intent} on the
      * started activities for results stack.
      *
      * @return the next started {@code Intent} for an activity, wrapped in
-     * an {@link ShadowActivity.IntentForResult} object
+     *         an {@link ShadowActivity.IntentForResult} object
      */
     public IntentForResult getNextStartedActivityForResult() {
         if (startedActivitiesForResults.isEmpty()) {
-        	return null;
+            return null;
         } else {
-        	return startedActivitiesForResults.remove(0);
+            return startedActivitiesForResults.remove(0);
         }
     }
-    
+
     /**
      * Non-Android accessor returns the most recent {@code Intent} started by
-     * {@link #startActivityForResult(android.content.Intent)} without
+     * {@link #startActivityForResult(android.content.Intent, int)} without
      * consuming it.
      *
      * @return the most recently started {@code Intent}, wrapped in
-     * an {@link ShadowActivity.IntentForResult} object
+     *         an {@link ShadowActivity.IntentForResult} object
      */
     public IntentForResult peekNextStartedActivityForResult() {
         if (startedActivitiesForResults.isEmpty()) {
@@ -234,26 +232,26 @@
             return startedActivitiesForResults.get(0);
         }
     }
-    
+
     /**
      * Container object to hold an Intent, together with the requestCode used
      * in a call to {@code Activity#startActivityForResult(Intent, int)}
      */
     public class IntentForResult {
-    	public Intent intent;
-    	public int requestCode;
-    	
-    	public IntentForResult(Intent intent, int requestCode) {
-    		this.intent = intent;
-    		this.requestCode = requestCode;
-    	}
+        public Intent intent;
+        public int requestCode;
+
+        public IntentForResult(Intent intent, int requestCode) {
+            this.intent = intent;
+            this.requestCode = requestCode;
+        }
     }
 
     @Implementation
     public void startActivityForResult(Intent intent, int requestCode) {
         intentRequestCodeMap.put(intent, requestCode);
-      	startedActivitiesForResults.add(new IntentForResult(intent, requestCode));
-      	getApplicationContext().startActivity(intent);
+        startedActivitiesForResults.add(new IntentForResult(intent, requestCode));
+        getApplicationContext().startActivity(intent);
     }
 
     public void receiveResult(Intent requestIntent, int resultCode, Intent resultIntent) {
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlarmManager.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlarmManager.java
index bdde599..b98f4c2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlarmManager.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlarmManager.java
@@ -1,49 +1,48 @@
 package com.xtremelabs.robolectric.shadows;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
-
 import com.xtremelabs.robolectric.internal.Implementation;
 import com.xtremelabs.robolectric.internal.Implements;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Shadows the {@code android.app.AlarmManager} class.
  */
 @SuppressWarnings({"UnusedDeclaration"})
 @Implements(AlarmManager.class)
 public class ShadowAlarmManager {
-	
-	private List<ScheduledAlarm> scheduledAlarms = new ArrayList<ScheduledAlarm>();
 
-	@Implementation
-	public void set(int type, long triggerAtTime, PendingIntent operation) {
-		scheduledAlarms.add(new ScheduledAlarm(type, triggerAtTime, operation));
-	}
-	
+    private List<ScheduledAlarm> scheduledAlarms = new ArrayList<ScheduledAlarm>();
+
+    @Implementation
+    public void set(int type, long triggerAtTime, PendingIntent operation) {
+        scheduledAlarms.add(new ScheduledAlarm(type, triggerAtTime, operation));
+    }
+
     /**
      * Non-Android accessor consumes and returns the next scheduled alarm on the
      * AlarmManager's stack.
      *
      * @return the next scheduled alarm, wrapped in a
-     * {@link ShadowAlarmManager#ScheduledAlarm} object
+     *         {@link ShadowAlarmManager.ScheduledAlarm} object
      */
     public ScheduledAlarm getNextScheduledAlarm() {
         if (scheduledAlarms.isEmpty()) {
-        	return null;
+            return null;
         } else {
-        	return scheduledAlarms.remove(0);
+            return scheduledAlarms.remove(0);
         }
     }
-    
+
     /**
      * Non-Android accessor returns the most recent scheduled alarm without
      * consuming it.
      *
      * @return the most recently scheduled alarm, wrapped in a
-     * {@link ShadowAlarmManager#ScheduledAlarm} object
+     *         {@link ShadowAlarmManager.ScheduledAlarm} object
      */
     public ScheduledAlarm peekNextScheduledAlarm() {
         if (scheduledAlarms.isEmpty()) {
@@ -57,21 +56,21 @@
      * Container object to hold an PendingIntent, together with the alarm
      * parameters used in a call to {@code AlarmManager}
      */
-	public class ScheduledAlarm {
-		public int type;
-		public long triggerAtTime;
-		public long interval;
-		public PendingIntent operation;
-		
-		public ScheduledAlarm(int type, long triggerAtTime, PendingIntent operation) {
-			this(type, triggerAtTime, 0, operation);
-		}
-		
-		public ScheduledAlarm(int type, long triggerAtTime, long interval, PendingIntent operation) {
-			this.type = type;
-			this.triggerAtTime = triggerAtTime;
-			this.operation = operation;
-			this.interval = interval;
-		}
-	}
+    public class ScheduledAlarm {
+        public int type;
+        public long triggerAtTime;
+        public long interval;
+        public PendingIntent operation;
+
+        public ScheduledAlarm(int type, long triggerAtTime, PendingIntent operation) {
+            this(type, triggerAtTime, 0, operation);
+        }
+
+        public ScheduledAlarm(int type, long triggerAtTime, long interval, PendingIntent operation) {
+            this.type = type;
+            this.triggerAtTime = triggerAtTime;
+            this.operation = operation;
+            this.interval = interval;
+        }
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAppWidgetManager.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAppWidgetManager.java
index 1049333..e813e40 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAppWidgetManager.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAppWidgetManager.java
@@ -70,9 +70,9 @@
 
     /**
      * Simulates updating an {@code AppWidget} with a new set of views
-     * 
+     *
      * @param appWidgetId id of widget
-     * @param views views to update
+     * @param views       views to update
      */
     @Implementation
     public void updateAppWidget(int appWidgetId, RemoteViews views) {
@@ -100,9 +100,9 @@
 
     /**
      * Creates a widget by inflating its layout.
-     * 
+     *
      * @param appWidgetProviderClass the app widget provider class
-     * @param widgetLayoutId id of the layout to inflate
+     * @param widgetLayoutId         id of the layout to inflate
      * @return the ID of the new widget
      */
     public int createWidget(Class<? extends AppWidgetProvider> appWidgetProviderClass, int widgetLayoutId) {
@@ -111,10 +111,10 @@
 
     /**
      * Creates a bunch of widgets by inflating the same layout multiple times.
-     * 
+     *
      * @param appWidgetProviderClass the app widget provider class
-     * @param widgetLayoutId id of the layout to inflate
-     * @param howManyToCreate number of new widgets to create
+     * @param widgetLayoutId         id of the layout to inflate
+     * @param howManyToCreate        number of new widgets to create
      * @return the IDs of the new widgets
      */
     public int[] createWidgets(Class<? extends AppWidgetProvider> appWidgetProviderClass, int widgetLayoutId, int howManyToCreate) {
@@ -166,6 +166,7 @@
      * Non-Android mechanism that enables testing of widget behavior when all of the views are recreated on every
      * update. This is useful for ensuring that your widget will behave correctly even if it is restarted by the OS
      * between events.
+     *
      * @param alwaysRecreate whether or not to always recreate the views
      */
     public void setAlwaysRecreateViewsDuringUpdate(boolean alwaysRecreate) {
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowApplication.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowApplication.java
index 2c5303d..95a5266 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowApplication.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowApplication.java
@@ -4,7 +4,12 @@
 import android.app.Application;
 import android.appwidget.AppWidgetManager;
 import android.bluetooth.BluetoothAdapter;
-import android.content.*;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.location.LocationManager;
 import android.media.AudioManager;
@@ -22,7 +27,12 @@
 import com.xtremelabs.robolectric.util.Scheduler;
 import com.xtremelabs.robolectric.view.TestWindowManager;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import static com.xtremelabs.robolectric.Robolectric.newInstanceOf;
 import static com.xtremelabs.robolectric.Robolectric.shadowOf;
@@ -62,11 +72,11 @@
 
     /**
      * Associates a {@code ResourceLoader} with an {@code Application} instance
-     * 
-     * @param application application
+     *
+     * @param application    application
      * @param resourceLoader resource loader
      * @return the application
-     * todo: make this non-static?
+     *         todo: make this non-static?
      */
     public static Application bind(Application application, ResourceLoader resourceLoader) {
         ShadowApplication shadowApplication = shadowOf(application);
@@ -117,7 +127,7 @@
         } else if (name.equals(Context.AUDIO_SERVICE)) {
             return audioManager == null ? audioManager = newInstanceOf(AudioManager.class) : audioManager;
         } else if (name.equals(Context.CONNECTIVITY_SERVICE)) {
-        	return connectivityManager == null ? connectivityManager = newInstanceOf(ConnectivityManager.class) : connectivityManager;
+            return connectivityManager == null ? connectivityManager = newInstanceOf(ConnectivityManager.class) : connectivityManager;
         }
         return null;
     }
@@ -265,6 +275,7 @@
 
     /**
      * Non-Android accessor.
+     *
      * @return list of {@link Wrapper}s for registered receivers
      */
     public List<Wrapper> getRegisteredReceivers() {
@@ -273,6 +284,7 @@
 
     /**
      * Non-Android accessor.
+     *
      * @return the layout inflater used by this {@code Application}
      */
     public LayoutInflater getLayoutInflater() {
@@ -281,6 +293,7 @@
 
     /**
      * Non-Android accessor.
+     *
      * @return the app widget manager used by this {@code Application}
      */
     public AppWidgetManager getAppWidgetManager() {
@@ -300,7 +313,7 @@
         return currentLooper;
     }
 
-    public Map<String,Hashtable<String, Object>> getSharedPreferenceMap() {
+    public Map<String, Hashtable<String, Object>> getSharedPreferenceMap() {
         return sharedPreferenceMap;
     }
 
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java
index f3b6d01..bbec894 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java
@@ -15,60 +15,60 @@
 @Implements(ArrayAdapter.class)
 public class ShadowArrayAdapter<T> extends ShadowBaseAdapter {
 
-  private Context context;
-  private List<T> list;
+    private Context context;
+    private List<T> list;
 
-  public void __constructor__(Context context, int textViewResourceId) {
-    init(context, textViewResourceId, 0, new ArrayList<T>());
-  }
+    public void __constructor__(Context context, int textViewResourceId) {
+        init(context, textViewResourceId, 0, new ArrayList<T>());
+    }
 
-  public void __constructor__(Context context, int resource, int textViewResourceId) {
-    init(context, resource, textViewResourceId, new ArrayList<T>());
-  }
+    public void __constructor__(Context context, int resource, int textViewResourceId) {
+        init(context, resource, textViewResourceId, new ArrayList<T>());
+    }
 
-  public void __constructor__(Context context, int textViewResourceId, T[] objects) {
-    init(context, textViewResourceId, 0, Arrays.asList(objects));
-  }
+    public void __constructor__(Context context, int textViewResourceId, T[] objects) {
+        init(context, textViewResourceId, 0, Arrays.asList(objects));
+    }
 
-  public void __constructor__(Context context, int resource, int textViewResourceId, T[] objects) {
-    init(context, resource, textViewResourceId, Arrays.asList(objects));
-  }
+    public void __constructor__(Context context, int resource, int textViewResourceId, T[] objects) {
+        init(context, resource, textViewResourceId, Arrays.asList(objects));
+    }
 
-  public void __constructor__(Context context, int textViewResourceId, List<T> objects) {
-    init(context, textViewResourceId, 0, objects);
-  }
+    public void __constructor__(Context context, int textViewResourceId, List<T> objects) {
+        init(context, textViewResourceId, 0, objects);
+    }
 
-  public void __constructor__(Context context, int resource, int textViewResourceId, List<T> objects) {
-    init(context, resource, textViewResourceId, objects);
-  }
+    public void __constructor__(Context context, int resource, int textViewResourceId, List<T> objects) {
+        init(context, resource, textViewResourceId, objects);
+    }
 
-  private void init(Context context, int resource, int textViewResourceId, List<T> objects) {
-    this.context = context;
-    this.list = objects;
-  }
+    private void init(Context context, int resource, int textViewResourceId, List<T> objects) {
+        this.context = context;
+        this.list = objects;
+    }
 
-  @Implementation
-  public void add(T object) {
-    list.add(object);
-  }
+    @Implementation
+    public void add(T object) {
+        list.add(object);
+    }
 
-  @Implementation
-  public Context getContext() {
-    return context;
-  }
+    @Implementation
+    public Context getContext() {
+        return context;
+    }
 
-  @Implementation
-  public int getCount() {
-    return list.size();
-  }
+    @Implementation
+    public int getCount() {
+        return list.size();
+    }
 
-  @Implementation
-  public T getItem(int position) {
-    return list.get(position);
-  }
+    @Implementation
+    public T getItem(int position) {
+        return list.get(position);
+    }
 
-  @Implementation
-  public int getPosition(T item) {
-    return list.indexOf(item);
-  }
+    @Implementation
+    public int getPosition(T item) {
+        return list.indexOf(item);
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBaseAdapter.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBaseAdapter.java
index 415423d..a957baf 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBaseAdapter.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBaseAdapter.java
@@ -25,7 +25,7 @@
 
     /**
      * Registers the observer.
-     * 
+     *
      * @param observer observer
      */
     @Implementation
@@ -35,7 +35,7 @@
 
     /**
      * Unregisters the observer if it can be found. Nothing otherwise.
-     * 
+     *
      * @param observer observer
      */
     @Implementation
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraParameters.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraParameters.java
index cdd4c2e..73a3daf 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraParameters.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraParameters.java
@@ -2,7 +2,6 @@
 
 import android.graphics.ImageFormat;
 import android.hardware.Camera;
-
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.internal.Implementation;
 import com.xtremelabs.robolectric.internal.Implements;
@@ -16,64 +15,64 @@
 @Implements(Camera.Parameters.class)
 public class ShadowCameraParameters {
 
-    private int pictureWidth   = 1280;
-    private int pictureHeight  = 960;
-    private int previewWidth   = 640;
-    private int previewHeight  = 480; 
-    private int previewFormat  = ImageFormat.NV21;
-    private int previewFpsMin  = 10;
-    private int previewFpsMax  = 30;
-    private int previewFps     = 30;
+    private int pictureWidth = 1280;
+    private int pictureHeight = 960;
+    private int previewWidth = 640;
+    private int previewHeight = 480;
+    private int previewFormat = ImageFormat.NV21;
+    private int previewFpsMin = 10;
+    private int previewFpsMax = 30;
+    private int previewFps = 30;
 
     @Implementation
     public Camera.Size getPictureSize() {
-    	Camera.Size pictureSize = Robolectric.newInstanceOf(Camera.class).new Size(0, 0);
-    	pictureSize.width = pictureWidth;
-    	pictureSize.height = pictureHeight;
-    	return pictureSize;
+        Camera.Size pictureSize = Robolectric.newInstanceOf(Camera.class).new Size(0, 0);
+        pictureSize.width = pictureWidth;
+        pictureSize.height = pictureHeight;
+        return pictureSize;
     }
 
     @Implementation
     public int getPreviewFormat() {
         return previewFormat;
     }
-    
+
     @Implementation
     public void getPreviewFpsRange(int[] range) {
-    	range[0] = previewFpsMin;
-    	range[1] = previewFpsMax;
+        range[0] = previewFpsMin;
+        range[1] = previewFpsMax;
     }
 
     @Implementation
     public int getPreviewFrameRate() {
-    	return previewFps;				
+        return previewFps;
     }
-    
+
     @Implementation
     public Camera.Size getPreviewSize() {
-    	Camera.Size previewSize = Robolectric.newInstanceOf(Camera.class).new Size(0, 0);
-    	previewSize.width = previewWidth;
-    	previewSize.height = previewHeight;
-    	return previewSize;
+        Camera.Size previewSize = Robolectric.newInstanceOf(Camera.class).new Size(0, 0);
+        previewSize.width = previewWidth;
+        previewSize.height = previewHeight;
+        return previewSize;
     }
 
     @Implementation
     public List<Camera.Size> getSupportedPictureSizes() {
-    	List<Camera.Size> supportedSizes = new ArrayList<Camera.Size>();
-    	addSize(supportedSizes, 320, 240);
-    	addSize(supportedSizes, 640, 480);
-    	addSize(supportedSizes, 800, 600); 	
-    	return supportedSizes;
+        List<Camera.Size> supportedSizes = new ArrayList<Camera.Size>();
+        addSize(supportedSizes, 320, 240);
+        addSize(supportedSizes, 640, 480);
+        addSize(supportedSizes, 800, 600);
+        return supportedSizes;
     }
-    
+
     @Implementation
     public List<Integer> getSupportedPictureFormats() {
         List<Integer> formats = new ArrayList<Integer>();
         formats.add(ImageFormat.NV21);
         formats.add(ImageFormat.JPEG);
-        return formats;    	
+        return formats;
     }
-    
+
     @Implementation
     public List<Integer> getSupportedPreviewFormats() {
         List<Integer> formats = new ArrayList<Integer>();
@@ -81,32 +80,32 @@
         formats.add(ImageFormat.JPEG);
         return formats;
     }
-    
+
     @Implementation
     public List<int[]> getSupportedPreviewFpsRange() {
-    	List<int[]> supportedRanges = new ArrayList<int[]>();
-    	addRange(supportedRanges, 15, 15);
-    	addRange(supportedRanges, 10, 30);
-    	return supportedRanges;
+        List<int[]> supportedRanges = new ArrayList<int[]>();
+        addRange(supportedRanges, 15, 15);
+        addRange(supportedRanges, 10, 30);
+        return supportedRanges;
     }
-    
+
     @Implementation
     public List<Integer> getSupportedPreviewFrameRates() {
-    	List<Integer> supportedRates = new ArrayList<Integer>();
-    	supportedRates.add(10);
-    	supportedRates.add(15);
-    	supportedRates.add(30);
-    	return supportedRates;
+        List<Integer> supportedRates = new ArrayList<Integer>();
+        supportedRates.add(10);
+        supportedRates.add(15);
+        supportedRates.add(30);
+        return supportedRates;
     }
 
     @Implementation
     public List<Camera.Size> getSupportedPreviewSizes() {
-    	List<Camera.Size> supportedSizes = new ArrayList<Camera.Size>();
-    	addSize(supportedSizes, 320, 240);
-    	addSize(supportedSizes, 640, 480);	
-    	return supportedSizes;
+        List<Camera.Size> supportedSizes = new ArrayList<Camera.Size>();
+        addSize(supportedSizes, 320, 240);
+        addSize(supportedSizes, 640, 480);
+        return supportedSizes;
     }
-    
+
     @Implementation
     public void setPictureSize(int width, int height) {
         pictureWidth = width;
@@ -117,24 +116,24 @@
     public void setPreviewFormat(int pixel_format) {
         previewFormat = pixel_format;
     }
-    
+
     @Implementation
     public void setPreviewFpsRange(int min, int max) {
-    	previewFpsMin = min;
-    	previewFpsMax = max;
+        previewFpsMin = min;
+        previewFpsMax = max;
     }
 
     @Implementation
     public void setPreviewFrameRate(int fps) {
-    	previewFps = fps;
+        previewFps = fps;
     }
-    
+
     @Implementation
     public void setPreviewSize(int width, int height) {
         previewWidth = width;
         previewHeight = height;
     }
-    
+
     public int getPreviewWidth() {
         return previewWidth;
     }
@@ -143,26 +142,26 @@
         return previewHeight;
     }
 
-	public int getPictureWidth() {
-		return pictureWidth;
-	}
+    public int getPictureWidth() {
+        return pictureWidth;
+    }
 
-	public int getPictureHeight() {
-		return pictureHeight;
-	}
-	
-    private void addSize( List<Camera.Size> sizes, int width, int height ) {
-    	Camera.Size newSize = Robolectric.newInstanceOf(Camera.class).new Size(0, 0);
-    	newSize.width = width;
-    	newSize.height = height;
-    	sizes.add( newSize );
+    public int getPictureHeight() {
+        return pictureHeight;
     }
-    
+
+    private void addSize(List<Camera.Size> sizes, int width, int height) {
+        Camera.Size newSize = Robolectric.newInstanceOf(Camera.class).new Size(0, 0);
+        newSize.width = width;
+        newSize.height = height;
+        sizes.add(newSize);
+    }
+
     private void addRange(List<int[]> ranges, int min, int max) {
-    	int[] range = new int[2];
-       	range[0] = min;
-       	range[1] = max;
-     	ranges.add(range);
+        int[] range = new int[2];
+        range[0] = min;
+        range[1] = max;
+        ranges.add(range);
     }
-    
+
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraSize.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraSize.java
index 0cb0684..43f4aaf 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraSize.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraSize.java
@@ -1,20 +1,18 @@
 package com.xtremelabs.robolectric.shadows;
 
+import android.hardware.Camera;
 import com.xtremelabs.robolectric.internal.Implements;
 import com.xtremelabs.robolectric.internal.RealObject;
 
-import android.hardware.Camera;
-
 /**
  * Shadow for the Android {@code Camera.Size} value object.
- *
  */
 @Implements(Camera.Size.class)
 public class ShadowCameraSize {
-	  @RealObject private Camera.Size realCameraSize;
-	  
-	  public void __constructor__(Camera camera, int width, int height) {
-		  realCameraSize.width = width;
-		  realCameraSize.height = height;
-	  }  
+    @RealObject private Camera.Size realCameraSize;
+
+    public void __constructor__(Camera camera, int width, int height) {
+        realCameraSize.width = width;
+        realCameraSize.height = height;
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java
index 8549412..ba9e805 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java
@@ -1,6 +1,11 @@
 package com.xtremelabs.robolectric.shadows;
 
-import android.graphics.*;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
 import com.xtremelabs.robolectric.internal.Implementation;
 import com.xtremelabs.robolectric.internal.Implements;
 
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrix.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrix.java
index 9265823..2d8db51 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrix.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrix.java
@@ -44,9 +44,17 @@
         final float G = 0.715f * invSat;
         final float B = 0.072f * invSat;
 
-        m[0] = R + sat; m[1] = G;       m[2] = B;
-        m[5] = R;       m[6] = G + sat; m[7] = B;
-        m[10] = R;      m[11] = G;      m[12] = B + sat;
+        m[0] = R + sat;
+        m[1] = G;
+        m[2] = B;
+
+        m[5] = R;
+        m[6] = G + sat;
+        m[7] = B;
+
+        m[10] = R;
+        m[11] = G;
+        m[12] = B + sat;
     }
 
     @Override @Implementation
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java
index fff6314..3a94e67 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java
@@ -1,20 +1,19 @@
 package com.xtremelabs.robolectric.shadows;
 
+import android.content.res.Configuration;
 import com.xtremelabs.robolectric.internal.Implementation;
 import com.xtremelabs.robolectric.internal.Implements;
 import com.xtremelabs.robolectric.internal.RealObject;
 
-import android.content.res.Configuration;
-
 @Implements(Configuration.class)
 public class ShadowConfiguration {
-	
-	  @RealObject
-	  private Configuration realConfiguration;
-	  
-	  @Implementation
-	  public void setToDefaults() {
-		  realConfiguration.screenLayout = Configuration.SCREENLAYOUT_LONG_NO | 
-		  								   Configuration.SCREENLAYOUT_SIZE_NORMAL;
-	  }
+
+    @RealObject
+    private Configuration realConfiguration;
+
+    @Implementation
+    public void setToDefaults() {
+        realConfiguration.screenLayout = Configuration.SCREENLAYOUT_LONG_NO |
+                Configuration.SCREENLAYOUT_SIZE_NORMAL;
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConnectivityManager.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConnectivityManager.java
index 0137b95..810ab6b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConnectivityManager.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConnectivityManager.java
@@ -15,10 +15,10 @@
 @Implements(ConnectivityManager.class)
 public class ShadowConnectivityManager {
 
-	private NetworkInfo networkInfo;
+    private NetworkInfo networkInfo;
 
-	@Implementation
+    @Implementation
     public NetworkInfo getActiveNetworkInfo() {
-		return networkInfo == null ? networkInfo = newInstanceOf(NetworkInfo.class) : networkInfo;
+        return networkInfo == null ? networkInfo = newInstanceOf(NetworkInfo.class) : networkInfo;
     }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDefaultRequestDirector.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDefaultRequestDirector.java
index 98aeb62..295fdad 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDefaultRequestDirector.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDefaultRequestDirector.java
@@ -7,7 +7,11 @@
 import com.xtremelabs.robolectric.util.HttpRequestInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.*;
+import org.apache.http.ConnectionReuseStrategy;
+import org.apache.http.HttpException;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.client.AuthenticationHandler;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.RedirectHandler;
@@ -56,18 +60,18 @@
             AuthenticationHandler proxyAuthHandler,
             UserTokenHandler userTokenHandler,
             HttpParams params) {
-        this.log               = log;
+        this.log = log;
         this.httpRequestExecutor = requestExec;
         this.connectionManager = conman;
         this.connectionReuseStrategy = reustrat;
         this.connectionKeepAliveStrategy = kastrat;
         this.httpRoutePlanner = rouplan;
-        this.httpProcessor     = httpProcessor;
+        this.httpProcessor = httpProcessor;
         this.httpRequestRetryHandler = retryHandler;
         this.redirectHandler = redirectHandler;
         this.targetAuthenticationHandler = targetAuthHandler;
         this.proxyAuthenticationHandler = proxyAuthHandler;
-        this.userTokenHandler  = userTokenHandler;
+        this.userTokenHandler = userTokenHandler;
         this.httpParams = params;
     }
 
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowExpandableListView.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowExpandableListView.java
index 31e2a1b..5de3bac 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowExpandableListView.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowExpandableListView.java
@@ -9,21 +9,21 @@
 
 @Implements(ExpandableListView.class)
 public class ShadowExpandableListView extends ShadowListView {
-	@RealObject private ExpandableListView mExpandable;
-	private OnChildClickListener mChildClickListener;
-	
-	@Implementation
+    @RealObject private ExpandableListView mExpandable;
+    private OnChildClickListener mChildClickListener;
+
+    @Implementation
     @Override
     public boolean performItemClick(View view, int position, long id) {
-		if( mChildClickListener != null ){
-			mChildClickListener.onChildClick(mExpandable, null, 0, position, id);
-        	return true;
+        if (mChildClickListener != null) {
+            mChildClickListener.onChildClick(mExpandable, null, 0, position, id);
+            return true;
         }
         return false;
     }
-	
-	@Implementation
-	public void setOnChildClickListener(OnChildClickListener clildListener){
-		mChildClickListener = clildListener;
-	}
+
+    @Implementation
+    public void setOnChildClickListener(OnChildClickListener clildListener) {
+        mChildClickListener = clildListener;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeocoder.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeocoder.java
index a327abd..c298059 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeocoder.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeocoder.java
@@ -59,10 +59,10 @@
     /**
      * Sets up a simulated response for {@link #getFromLocation(double, double, int)}
      *
-     * @param address the address for the response
-     * @param city the city for the response
-     * @param state the state for the response
-     * @param zip the zip code for the response
+     * @param address     the address for the response
+     * @param city        the city for the response
+     * @param state       the state for the response
+     * @param zip         the zip code for the response
      * @param countryCode the country code for the response
      */
     public void setSimulatedResponse(String address, String city, String state, String zip, String countryCode) {
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandler.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandler.java
index 5611b23..4b4baf3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandler.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandler.java
@@ -73,9 +73,9 @@
     public static void flush() {
         idleMainLooper();
     }
-    
+
     /**
-     * @see com.xtremelabs.robolectric.shadows.ShadowLooper#idle() 
+     * @see com.xtremelabs.robolectric.shadows.ShadowLooper#idle()
      */
     public static void idleMainLooper() {
         shadowOf(Looper.myLooper()).idle();
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowImageView.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowImageView.java
index d1355f0..8c55d0a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowImageView.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowImageView.java
@@ -72,8 +72,9 @@
     }
 
     /**
+     * @return the image drawable
      * @deprecated Use android.widget.ImageView#getDrawable() instead.
-     * @return the image drawable */
+     */
     @Deprecated
     public Drawable getImageDrawable() {
         return imageDrawable;
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
index 84d89e4..187eb9d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
@@ -12,7 +12,12 @@
 import com.xtremelabs.robolectric.internal.RealObject;
 import com.xtremelabs.robolectric.util.Join;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowItemizedOverlay.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowItemizedOverlay.java
index 96ab7a5..99d98b3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowItemizedOverlay.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowItemizedOverlay.java
@@ -43,7 +43,7 @@
      * than -1.
      *
      * @return whether {@link #setLastFocusedIndex(int)} has been called with a value other
-     * than -1
+     *         than -1
      */
     public boolean lastFocusedIndexWasReset() {
         return lastFocusedIndexWasReset;
@@ -62,7 +62,8 @@
      * {@link #hitTest(com.google.android.maps.OverlayItem, android.graphics.drawable.Drawable, int, int)}
      *
      * @param shouldHit the value that
-     * {@link #hitTest(com.google.android.maps.OverlayItem, android.graphics.drawable.Drawable, int, int)} shoule return
+     *                  {@link #hitTest(com.google.android.maps.OverlayItem, android.graphics.drawable.Drawable, int, int)}
+     *                  should return
      */
     public void setShouldHit(boolean shouldHit) {
         this.shouldHit = shouldHit;
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocationManager.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocationManager.java
index da130d6..ab2de4c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocationManager.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocationManager.java
@@ -26,7 +26,7 @@
     /**
      * Sets the value to return from {@link #isProviderEnabled(String)} for the given {@code provider}
      *
-     * @param provider name of the provider whose status to set
+     * @param provider  name of the provider whose status to set
      * @param isEnabled whether that provider should appear enabled
      */
     public void setProviderEnabled(String provider, boolean isEnabled) {
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapController.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapController.java
index d9f9d16..fac5f9f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapController.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapController.java
@@ -68,7 +68,7 @@
     /**
      * Non-Android accessor that returns the most recent value set by a call to either version of {@code animateTo()}
      *
-     * @return  the most recent value set by a call to either version of {@code animateTo()}
+     * @return the most recent value set by a call to either version of {@code animateTo()}
      */
     public GeoPoint getGeoPointAnimatedTo() {
         return geoPointAnimatedTo;
@@ -78,7 +78,7 @@
      * Non-Android accessor that allows the {@code MapView} being controlled to be set explicitly.
      *
      * @param shadowMapView the {@link ShadowMapView} to be controlled (either created explicitly or obtained via a call
-     * to {@link com.xtremelabs.robolectric.Robolectric.shadowOf(com.google.android.maps.MapView)})
+     *                      to {@link com.xtremelabs.robolectric.RobolectricForMaps.shadowOf(com.google.android.maps.MapView)})
      */
     void setShadowMapView(ShadowMapView shadowMapView) {
         this.shadowMapView = shadowMapView;
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrix.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrix.java
index e985e67..baf76c2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrix.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrix.java
@@ -32,7 +32,7 @@
     public void set(Matrix src) {
         transX = shadowOf(src).transX;
         scaleX = shadowOf(src).scaleX;
-        
+
         transY = shadowOf(src).transY;
         scaleY = shadowOf(src).scaleY;
     }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaPlayer.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaPlayer.java
index e6f97b6..93187f1 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaPlayer.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaPlayer.java
@@ -1,21 +1,20 @@
 package com.xtremelabs.robolectric.shadows;
 
 import android.media.MediaPlayer;
-
 import com.xtremelabs.robolectric.internal.Implementation;
 import com.xtremelabs.robolectric.internal.Implements;
 
 @Implements(MediaPlayer.class)
 public class ShadowMediaPlayer {
-	
-	private int currentPosition;
-	
-	@Implementation 
-	public int getCurrentPosition() {
-		return currentPosition;
-	}
-	
-	public void setCurrentPosition(int position) {
-		currentPosition = position;
-	}
+
+    private int currentPosition;
+
+    @Implementation
+    public int getCurrentPosition() {
+        return currentPosition;
+    }
+
+    public void setCurrentPosition(int position) {
+        currentPosition = position;
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMenuInflater.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMenuInflater.java
index ec62ea4..c39c45a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMenuInflater.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMenuInflater.java
@@ -18,7 +18,7 @@
     private Context context;
 
     public void __constructor__(Context context) {
-		this.context = context;
+        this.context = context;
     }
 
     @Implementation
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java
index c05a3fe..84d0a3c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java
@@ -11,9 +11,9 @@
 @Implements(NetworkInfo.class)
 public class ShadowNetworkInfo {
 
-	private boolean isConnected = true;
+    private boolean isConnected = true;
 
-	@Implementation
+    @Implementation
     public boolean isConnectedOrConnecting() {
         return isConnected;
     }
@@ -21,7 +21,7 @@
     /**
      * Non-Android accessor
      * Sets up the return value of {@link #isConnectedOrConnecting()}.
-     * 
+     *
      * @param isConnected the value that {@link #isConnectedOrConnecting()} will return.
      */
     public void setConnectionStatus(boolean isConnected) {
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
index 27ce002..e6a450d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
@@ -40,12 +40,12 @@
     public int getColor(int id) throws Resources.NotFoundException {
         return resourceLoader.getColorValue(id);
     }
-    
+
     @Implementation
     public Configuration getConfiguration() {
-    	Configuration configuration = new Configuration();
-    	configuration.setToDefaults();
-    	return configuration;
+        Configuration configuration = new Configuration();
+        configuration.setToDefaults();
+        return configuration;
     }
 
     @Implementation
@@ -61,9 +61,9 @@
 
     @Implementation
     public InputStream openRawResource(int id) throws Resources.NotFoundException {
-    	return resourceLoader.getRawValue(id);
+        return resourceLoader.getRawValue(id);
     }
-    
+
     @Implementation
     public String[] getStringArray(int id) throws Resources.NotFoundException {
         String[] arrayValue = resourceLoader.getStringArrayValue(id);
@@ -117,14 +117,14 @@
     }
 
     @Implementation
-    public AssetManager getAssets(){
+    public AssetManager getAssets() {
         return ShadowAssetManager.bind(Robolectric.newInstanceOf(AssetManager.class), resourceLoader);
     }
 
     /**
      * Non-Android accessor that sets the value to be returned by {@link #getDimension(int)}
      *
-     * @param id ID to set the dimension for
+     * @param id    ID to set the dimension for
      * @param value value to be returned
      */
     public void setDimension(int id, int value) {
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteDatabase.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteDatabase.java
index 77a52c5..4e98e14 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteDatabase.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteDatabase.java
@@ -173,6 +173,7 @@
     /**
      * Allows test cases access to the underlying JDBC connection, for use in
      * setup or assertions.
+     *
      * @return the connection
      */
     public Connection getConnection() {
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
index 65b08b7..3fbb94a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
@@ -146,7 +146,7 @@
 
     /**
      * Returns the text string of this {@code TextView}.
-     * 
+     * <p/>
      * Robolectric extension.
      */
     @Override
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowToast.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowToast.java
index 85a18de..dba083c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowToast.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowToast.java
@@ -74,7 +74,7 @@
      * or since {@link #reset()} has been called.
      *
      * @return the number of {@code Toast} requests that have been made during this test run
-     * or since {@link #reset()} has been called.
+     *         or since {@link #reset()} has been called.
      */
     public static int shownToastCount() {
         return Robolectric.getShadowApplication().getShownToasts().size();
@@ -84,7 +84,8 @@
      * Non-Android query method that returns whether or not a particular custom {@code Toast} has been shown.
      *
      * @param message the message to search for
-     * @param layoutResourceIdToCheckForMessage the id of the resource that contains the toast messages
+     * @param layoutResourceIdToCheckForMessage
+     *                the id of the resource that contains the toast messages
      * @return whether the {@code Toast} was requested
      */
     public static boolean showedCustomToast(CharSequence message, int layoutResourceIdToCheckForMessage) {
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
index 04f050a..28cf153 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
@@ -133,7 +133,7 @@
      */
     @Implementation
     public static View inflate(Context context, int resource, ViewGroup root) {
-       return ShadowLayoutInflater.from(context).inflate(resource, root);
+        return ShadowLayoutInflater.from(context).inflate(resource, root);
     }
 
     /**
@@ -371,7 +371,7 @@
 
     /**
      * Returns a string representation of this {@code View}. Unless overridden, it will be an empty string.
-     *
+     * <p/>
      * Robolectric extension.
      */
     public String innerText() {
@@ -454,16 +454,16 @@
     public int getBackgroundResourceId() {
         return backgroundResourceId;
     }
-    
-    @Implementation 
+
+    @Implementation
     public void setBackgroundColor(int color) {
-    	backgroundColor = color;
+        backgroundColor = color;
     }
-    
+
     public int getBackgroundColor() {
-    	return backgroundColor;
+        return backgroundColor;
     }
-   
+
     /**
      * Non-Android accessor.
      *
@@ -608,12 +608,12 @@
     }
 
     private void applyBackgroundAttribute() {
-    	String source = attributeSet.getAttributeValue("android", "background");
-    	if (source != null) {
-    		if (source.startsWith("@drawable/")) {
-    			setBackgroundResource(attributeSet.getAttributeResourceValue("android", "background", 0));    			
-    		}
-    	}
+        String source = attributeSet.getAttributeValue("android", "background");
+        if (source != null) {
+            if (source.startsWith("@drawable/")) {
+                setBackgroundResource(attributeSet.getAttributeResourceValue("android", "background", 0));
+            }
+        }
     }
 
     private boolean noParentHasFocus(View view) {
@@ -638,7 +638,7 @@
     public Bitmap getDrawingCache() {
         return Robolectric.newInstanceOf(Bitmap.class);
     }
-    
+
     @Implementation
     public void post(Runnable action) {
         Robolectric.getUiThreadScheduler().post(action);
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewGroup.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewGroup.java
index f056b48..358aeec 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewGroup.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewGroup.java
@@ -90,7 +90,7 @@
     /**
      * Returns a string representation of this {@code ViewGroup} by concatenating all of the strings contained in all
      * of the descendants of this {@code ViewGroup}.
-     *
+     * <p/>
      * Robolectric extension.
      */
     @Override
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebSettings.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebSettings.java
index 7bd3da6..7687209 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebSettings.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebSettings.java
@@ -1,162 +1,161 @@
 package com.xtremelabs.robolectric.shadows;
 
 import android.webkit.WebSettings;
-
 import com.xtremelabs.robolectric.internal.Implementation;
 import com.xtremelabs.robolectric.internal.Implements;
 
 @Implements(WebSettings.class)
 public class ShadowWebSettings {
-	
-	private boolean allowFileAccess = true;
-	private boolean blockNetworkImage = false;
-	private boolean blockNetworkLoads = false;
-	private boolean builtInZoomControls = true;
-	private boolean databaseEnabled = false;
-	private boolean domStorageEnabled = false;
-	private boolean javaScriptEnabled = false;
-	private boolean lightTouchEnabled = false;
-	private boolean loadWithOverviewMode = false;
-	private boolean needInitialFocus = false;
-	private boolean pluginsEnabled = false;
-	private WebSettings.PluginState pluginState = WebSettings.PluginState.OFF;
-	private boolean supportMultipleWindows = false;
-	private boolean supportZoom = true;
-	
+
+    private boolean allowFileAccess = true;
+    private boolean blockNetworkImage = false;
+    private boolean blockNetworkLoads = false;
+    private boolean builtInZoomControls = true;
+    private boolean databaseEnabled = false;
+    private boolean domStorageEnabled = false;
+    private boolean javaScriptEnabled = false;
+    private boolean lightTouchEnabled = false;
+    private boolean loadWithOverviewMode = false;
+    private boolean needInitialFocus = false;
+    private boolean pluginsEnabled = false;
+    private WebSettings.PluginState pluginState = WebSettings.PluginState.OFF;
+    private boolean supportMultipleWindows = false;
+    private boolean supportZoom = true;
+
     @Implementation
     public boolean getAllowFileAccess() {
-    	return allowFileAccess;
+        return allowFileAccess;
     }
 
     @Implementation
     public void setAllowFileAccess(boolean allow) {
-    	allowFileAccess = allow;
+        allowFileAccess = allow;
     }
-    
+
     @Implementation
     public synchronized boolean getBlockNetworkImage() {
-    	return blockNetworkImage;
+        return blockNetworkImage;
     }
-    
+
     @Implementation
     public synchronized void setBlockNetworkImage(boolean flag) {
-    	blockNetworkImage = flag;  	
+        blockNetworkImage = flag;
     }
-    
+
     @Implementation
     public synchronized boolean getBlockNetworkLoads() {
-    	return blockNetworkLoads;
+        return blockNetworkLoads;
     }
-    
+
     @Implementation
     public synchronized void setBlockNetworkLoads(boolean flag) {
-    	blockNetworkLoads = flag;  	
+        blockNetworkLoads = flag;
     }
-   
+
     @Implementation
     public boolean getBuiltInZoomControls() {
-    	return builtInZoomControls;
+        return builtInZoomControls;
     }
 
     @Implementation
     public void setBuiltInZoomControls(boolean enabled) {
-    	builtInZoomControls = enabled;
+        builtInZoomControls = enabled;
     }
-    
+
     @Implementation
     public synchronized boolean getDatabaseEnabled() {
-    	return databaseEnabled;
+        return databaseEnabled;
     }
-    
+
     @Implementation
     public synchronized void setDatabaseEnabled(boolean flag) {
-    	databaseEnabled = flag;  	
+        databaseEnabled = flag;
     }
 
     @Implementation
     public synchronized boolean getDomStorageEnabled() {
-    	return domStorageEnabled;
+        return domStorageEnabled;
     }
-    
+
     @Implementation
     public synchronized void setDomStorageEnabled(boolean flag) {
-    	domStorageEnabled = flag;  	
+        domStorageEnabled = flag;
     }
 
     @Implementation
     public synchronized boolean getJavaScriptEnabled() {
-    	return javaScriptEnabled;
+        return javaScriptEnabled;
     }
-    
+
     @Implementation
     public synchronized void setJavaScriptEnabled(boolean flag) {
-    	javaScriptEnabled = flag;  	
-    }   
+        javaScriptEnabled = flag;
+    }
 
     @Implementation
     public boolean getLightTouchEnabled() {
-    	return lightTouchEnabled;
+        return lightTouchEnabled;
     }
-    
+
     @Implementation
     public void setLightTouchEnabled(boolean flag) {
-    	lightTouchEnabled = flag;  	
-    }   
+        lightTouchEnabled = flag;
+    }
 
     @Implementation
     public boolean getLoadWithOverviewMode() {
-    	return loadWithOverviewMode;
+        return loadWithOverviewMode;
     }
-    
+
     @Implementation
     public void setLoadWithOverviewMode(boolean flag) {
-    	loadWithOverviewMode = flag;  	
-    }   
+        loadWithOverviewMode = flag;
+    }
 
     public boolean getNeedInitialFocus() {
-    	return needInitialFocus;
+        return needInitialFocus;
     }
-    
+
     @Implementation
     public void setNeedInitialFocus(boolean flag) {
-    	needInitialFocus = flag;  	
-    }  
-    
+        needInitialFocus = flag;
+    }
+
     @Implementation
     public synchronized boolean getPluginsEnabled() {
-    	return pluginsEnabled;
+        return pluginsEnabled;
     }
-    
+
     @Implementation
     public synchronized void setPluginsEnabled(boolean flag) {
-    	pluginsEnabled = flag;  	
-    }       
-    
+        pluginsEnabled = flag;
+    }
+
     @Implementation
     public synchronized WebSettings.PluginState getPluginState() {
-    	return pluginState;
+        return pluginState;
     }
-    
+
     @Implementation
     public synchronized void setPluginState(WebSettings.PluginState state) {
-    	pluginState = state;  	
-    }   
-    
-    public boolean getSupportMultipleWindows() {
-    	return supportMultipleWindows;
+        pluginState = state;
     }
-    
+
+    public boolean getSupportMultipleWindows() {
+        return supportMultipleWindows;
+    }
+
     @Implementation
     public synchronized void setSupportMultipleWindows(boolean support) {
-    	supportMultipleWindows = support;  	
-    }  
-    
-    public boolean getSupportZoom() {
-    	return supportZoom;
+        supportMultipleWindows = support;
     }
-    
+
+    public boolean getSupportZoom() {
+        return supportZoom;
+    }
+
     @Implementation
     public void setSupportZoom(boolean support) {
-    	supportZoom = support;  	
-    }         
+        supportZoom = support;
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebView.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebView.java
index 19b3a3c..250cb58 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebView.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebView.java
@@ -1,23 +1,22 @@
 package com.xtremelabs.robolectric.shadows;
 
-import java.util.HashMap;
-
 import android.content.Context;
 import android.util.AttributeSet;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.internal.Implementation;
 import com.xtremelabs.robolectric.internal.Implements;
 
+import java.util.HashMap;
+
 @SuppressWarnings({"UnusedDeclaration"})
 @Implements(WebView.class)
 public class ShadowWebView extends ShadowAbsoluteLayout {
 
     private String lastUrl;
-    private HashMap<String,Object> javascriptInterfaces = new HashMap<String,Object>();
+    private HashMap<String, Object> javascriptInterfaces = new HashMap<String, Object>();
     private WebSettings webSettings = Robolectric.newInstanceOf(WebSettings.class);
     private WebViewClient webViewClient = null;
 
@@ -29,7 +28,7 @@
     public void loadUrl(String url) {
         lastUrl = url;
     }
-    
+
     /**
      * Non-Android accessor.
      *
@@ -38,27 +37,27 @@
     public String getLastLoadedUrl() {
         return lastUrl;
     }
-    
-    @Implementation 
+
+    @Implementation
     public WebSettings getSettings() {
-    	return webSettings;
+        return webSettings;
     }
 
     @Implementation
     public void setWebViewClient(WebViewClient client) {
-    	webViewClient = client;
+        webViewClient = client;
     }
-    
+
     public WebViewClient getWebViewClient() {
-    	return webViewClient;
+        return webViewClient;
     }
-    
+
     @Implementation
     public void addJavascriptInterface(Object obj, String interfaceName) {
-    	javascriptInterfaces.put(interfaceName, obj);
+        javascriptInterfaces.put(interfaceName, obj);
     }
-    
+
     public Object getJavascriptInterface(String interfaceName) {
-    	return javascriptInterfaces.get(interfaceName);
-    } 
+        return javascriptInterfaces.get(interfaceName);
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/package.html b/src/main/java/com/xtremelabs/robolectric/shadows/package.html
index c0e990e..828a516 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/package.html
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/package.html
@@ -5,8 +5,8 @@
 <body bgcolor="white">
 
 Provides shadow implementations of classes in the Android SDK. All of the classes in this package ("Shadow" classes) are
-annotated with the {@link com.xtremelabs.robolectric.internal.Implements} annotation, which causes the implementations of
-the associated Android classes to be replaced, on a method by method basis, with their annotated counterparts on the
+annotated with the {@link com.xtremelabs.robolectric.internal.Implements} annotation, which causes the implementations
+of the associated Android classes to be replaced, on a method by method basis, with their annotated counterparts on the
 Shadow class.
 
 <!--
diff --git a/src/main/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorService.java b/src/main/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorService.java
index b502ee3..3ec9b5e 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorService.java
+++ b/src/main/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorService.java
@@ -4,7 +4,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 public class RobolectricBackgroundExecutorService implements ExecutorService {
     @Override public void shutdown() {
diff --git a/src/main/java/com/xtremelabs/robolectric/util/Strings.java b/src/main/java/com/xtremelabs/robolectric/util/Strings.java
index 2fe76ef..983dd62 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/Strings.java
+++ b/src/main/java/com/xtremelabs/robolectric/util/Strings.java
@@ -10,7 +10,7 @@
         byte[] buffer = new byte[bufSize];
         int inSize;
         StringBuilder stringBuilder = new StringBuilder();
-        while((inSize = inputStream.read(buffer)) > 0) {
+        while ((inSize = inputStream.read(buffer)) > 0) {
             stringBuilder.append(new String(buffer, 0, inSize));
         }
         return stringBuilder.toString();
diff --git a/src/main/java/overview.html b/src/main/java/overview.html
index af8d191..32dc92a 100644
--- a/src/main/java/overview.html
+++ b/src/main/java/overview.html
@@ -12,8 +12,9 @@
 different applications may place conflicting demands upon the tools that support them. For this reason the components
 that make up Robolectric have been designed to be extended or replaced as needed. <p>
 
-If you have created extensions to Robolectric that you believe to be of use to a larger audience, please consider forking
-the main Robolectric repository at http://github.com/pivotal/robolectric and submitting your changes as pull requests.
+If you have created extensions to Robolectric that you believe to be of use to a larger audience, please consider
+forking the main Robolectric repository at http://github.com/pivotal/robolectric and submitting your changes as pull
+requests.
 
 <!--
 <h2>Package Specification</h2>
diff --git a/src/test/java/com/xtremelabs/robolectric/R.java b/src/test/java/com/xtremelabs/robolectric/R.java
index 906d03a..5c00b1e 100644
--- a/src/test/java/com/xtremelabs/robolectric/R.java
+++ b/src/test/java/com/xtremelabs/robolectric/R.java
@@ -72,7 +72,7 @@
     }
 
     public static final class menu {
-		public static final int test = nextId++;
-	}
+        public static final int test = nextId++;
+    }
 
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/RobolectricTest.java b/src/test/java/com/xtremelabs/robolectric/RobolectricTest.java
index b802778..12678dd 100644
--- a/src/test/java/com/xtremelabs/robolectric/RobolectricTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/RobolectricTest.java
@@ -23,7 +23,7 @@
 
     private PrintStream originalSystemOut;
     private ByteArrayOutputStream buff;
-	private String defaultLineSeparator;
+    private String defaultLineSeparator;
 
     @Before
     public void setUp() {
@@ -35,10 +35,10 @@
         PrintStream testOut = new PrintStream(buff);
         System.setOut(testOut);
     }
-    
+
     @After
     public void tearDown() throws Exception {
-    	System.setProperty("line.separator", defaultLineSeparator);
+        System.setProperty("line.separator", defaultLineSeparator);
         System.setOut(originalSystemOut);
     }
 
@@ -70,7 +70,7 @@
         assertEquals("", output);
     }
 
-    @Test(expected= RuntimeException.class)
+    @Test(expected = RuntimeException.class)
     public void clickOn_shouldThrowIfViewIsDisabled() throws Exception {
         View view = new View(null);
         view.setEnabled(false);
diff --git a/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerTest.java b/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerTest.java
index 04d1f3c..8d5c20a 100644
--- a/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerTest.java
@@ -6,7 +6,9 @@
 import org.junit.runners.model.InitializationError;
 
 import static com.xtremelabs.robolectric.Robolectric.shadowOf;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 @RunWith(RobolectricTestRunnerTest.RunnerForTesting.class)
 public class RobolectricTestRunnerTest {
diff --git a/src/test/java/com/xtremelabs/robolectric/TemporaryBindingsTest.java b/src/test/java/com/xtremelabs/robolectric/TemporaryBindingsTest.java
index 2770821..5c56ce8 100644
--- a/src/test/java/com/xtremelabs/robolectric/TemporaryBindingsTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/TemporaryBindingsTest.java
@@ -34,5 +34,6 @@
     }
 
     @Implements(View.class)
-    public static class TemporaryShadowView {}
+    public static class TemporaryShadowView {
+    }
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/CustomRobolectricTestRunnerTest.java b/src/test/java/com/xtremelabs/robolectric/bytecode/CustomRobolectricTestRunnerTest.java
index db68962..5d2af05 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/CustomRobolectricTestRunnerTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/bytecode/CustomRobolectricTestRunnerTest.java
@@ -11,7 +11,9 @@
 
 import java.lang.reflect.Method;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(CustomRobolectricTestRunnerTest.CustomRobolectricTestRunner.class)
 public class CustomRobolectricTestRunnerTest {
diff --git a/src/test/java/com/xtremelabs/robolectric/content/TestSharedPreferencesTest.java b/src/test/java/com/xtremelabs/robolectric/content/TestSharedPreferencesTest.java
index ffef7c1..ed79b6d 100644
--- a/src/test/java/com/xtremelabs/robolectric/content/TestSharedPreferencesTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/content/TestSharedPreferencesTest.java
@@ -43,22 +43,22 @@
 
     @Test
     public void commit_shouldRemoveValues() throws Exception {
-    	editor.putString("deleteMe", "foobar");
-    	editor.remove("deleteMe");
-    	
-    	editor.putString("dontDeleteMe", "quux");
-    	editor.remove("dontDeleteMe");
-    	editor.putString("dontDeleteMe", "baz");
-    	
-    	editor.commit();
-    	
+        editor.putString("deleteMe", "foobar");
+        editor.remove("deleteMe");
+
+        editor.putString("dontDeleteMe", "quux");
+        editor.remove("dontDeleteMe");
+        editor.putString("dontDeleteMe", "baz");
+
+        editor.commit();
+
         TestSharedPreferences anotherSharedPreferences = new TestSharedPreferences(content, "prefsName", 3);
         assertTrue(anotherSharedPreferences.getBoolean("boolean", false));
         assertThat(anotherSharedPreferences.getFloat("float", 666f), equalTo(1.1f));
         assertThat(anotherSharedPreferences.getInt("int", 666), equalTo(2));
         assertThat(anotherSharedPreferences.getLong("long", 666l), equalTo(3l));
         assertThat(anotherSharedPreferences.getString("string", "wacka wa"), equalTo("foobar"));
-    	
+
         assertThat(anotherSharedPreferences.contains("deleteMe"), equalTo(false));
         assertThat(anotherSharedPreferences.getString("dontDeleteMe", "oops"), equalTo("baz"));
     }
@@ -81,5 +81,4 @@
         assertThat(anotherSharedPreferences.getLong("long", 666l), equalTo(666l));
         assertThat(anotherSharedPreferences.getString("string", "wacka wa"), equalTo("wacka wa"));
     }
-    
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/res/RawResourceLoaderTest.java b/src/test/java/com/xtremelabs/robolectric/res/RawResourceLoaderTest.java
index 8d33278..9df6d9d 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/RawResourceLoaderTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/res/RawResourceLoaderTest.java
@@ -6,7 +6,13 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
 
 import static com.xtremelabs.robolectric.util.TestUtil.resourceFile;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/com/xtremelabs/robolectric/res/ViewLoaderTest.java b/src/test/java/com/xtremelabs/robolectric/res/ViewLoaderTest.java
index 81989ea..43703aa 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/ViewLoaderTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/res/ViewLoaderTest.java
@@ -63,7 +63,7 @@
         WebView webView = (WebView) view.findViewById(R.id.web_view);
 
         webView.loadUrl("www.example.com");
-        
+
         assertThat(shadowOf(webView).getLastLoadedUrl(), equalTo("www.example.com"));
     }
 
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AbstractCursorTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/AbstractCursorTest.java
index 3d69728..6250fb0 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AbstractCursorTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/AbstractCursorTest.java
@@ -14,141 +14,141 @@
 
 @RunWith(WithTestDefaultsRunner.class)
 public class AbstractCursorTest {
-	
-	private TestCursor cursor;
 
-	@Before
-	public void setUp() throws Exception {
-		cursor = new TestCursor();
-	}
+    private TestCursor cursor;
 
-	@Test
-	public void testMoveToFirst() {
-		cursor.theTable.add( "Foobar" );		
-    	assertThat(cursor.moveToFirst(), equalTo(true));
-    	assertThat(cursor.getCount(), equalTo(1));
-	}
-	
-	@Test
-	public void testMoveToFirstEmptyList() {		
-    	assertThat(cursor.moveToFirst(), equalTo(false));
-    	assertThat(cursor.getCount(), equalTo(0));
-	}
+    @Before
+    public void setUp() throws Exception {
+        cursor = new TestCursor();
+    }
 
-	@Test
-	public void testGetPosition() {
-		cursor.theTable.add( "Foobar" );
-		cursor.theTable.add( "Bletch" );
-		
-    	assertThat(cursor.moveToFirst(), equalTo(true));
-		assertThat(cursor.getCount(), equalTo(2));
-    	assertThat(cursor.getPosition(), equalTo(0));
-	}
+    @Test
+    public void testMoveToFirst() {
+        cursor.theTable.add("Foobar");
+        assertThat(cursor.moveToFirst(), equalTo(true));
+        assertThat(cursor.getCount(), equalTo(1));
+    }
 
-	@Test
-	public void testGetPositionSingleEntry() {
-		cursor.theTable.add( "Foobar" );
-		
-    	assertThat(cursor.moveToFirst(), equalTo(true));
-		assertThat(cursor.getCount(), equalTo(1));
-    	assertThat(cursor.getPosition(), equalTo(0));
-	}
-	
-	@Test
-	public void testGetPositionEmptyList() {
-    	assertThat(cursor.moveToFirst(), equalTo(false));
-		assertThat(cursor.getCount(), equalTo(0));
-    	assertThat(cursor.getPosition(), equalTo(0));
-	}
-	
-	@Test
-	public void testMoveToNext() {
-		cursor.theTable.add( "Foobar" );
-		cursor.theTable.add( "Bletch" );
-		
-		assertThat(cursor.moveToFirst(), equalTo(true));
-		assertThat(cursor.getCount(), equalTo(2));
-    	assertThat(cursor.moveToNext(), equalTo(true));
-    	assertThat(cursor.getPosition(), equalTo(1));
-	}
-	
-	@Test
-	public void testAttemptToMovePastEnd() {
-		cursor.theTable.add( "Foobar" );
-		cursor.theTable.add( "Bletch" );
-		
-		assertThat(cursor.moveToFirst(), equalTo(true));
-		assertThat(cursor.getCount(), equalTo(2));
-    	assertThat(cursor.moveToNext(), equalTo(true));
-    	assertThat(cursor.moveToNext(), equalTo(false));
-    	assertThat(cursor.getPosition(), equalTo(1));
-	}
-	
-	@Test
-	public void testAttemptToMovePastSingleEntry() {
-		cursor.theTable.add( "Foobar" );
-		
-		assertThat(cursor.moveToFirst(), equalTo(true));
-		assertThat(cursor.getCount(), equalTo(1));
-    	assertThat(cursor.moveToNext(), equalTo(false));
-    	assertThat(cursor.getPosition(), equalTo(0));
-	}
-	
-	@Test
-	public void testAttemptToMovePastEmptyList() {
-		assertThat(cursor.moveToFirst(), equalTo(false));
-		assertThat(cursor.getCount(), equalTo(0));
-    	assertThat(cursor.moveToNext(), equalTo(false));
-    	assertThat(cursor.getPosition(), equalTo(0));
-	}
-	
-	private class TestCursor extends AbstractCursor {
+    @Test
+    public void testMoveToFirstEmptyList() {
+        assertThat(cursor.moveToFirst(), equalTo(false));
+        assertThat(cursor.getCount(), equalTo(0));
+    }
 
-		public List<Object> theTable = new ArrayList<Object>();
-    	
+    @Test
+    public void testGetPosition() {
+        cursor.theTable.add("Foobar");
+        cursor.theTable.add("Bletch");
+
+        assertThat(cursor.moveToFirst(), equalTo(true));
+        assertThat(cursor.getCount(), equalTo(2));
+        assertThat(cursor.getPosition(), equalTo(0));
+    }
+
+    @Test
+    public void testGetPositionSingleEntry() {
+        cursor.theTable.add("Foobar");
+
+        assertThat(cursor.moveToFirst(), equalTo(true));
+        assertThat(cursor.getCount(), equalTo(1));
+        assertThat(cursor.getPosition(), equalTo(0));
+    }
+
+    @Test
+    public void testGetPositionEmptyList() {
+        assertThat(cursor.moveToFirst(), equalTo(false));
+        assertThat(cursor.getCount(), equalTo(0));
+        assertThat(cursor.getPosition(), equalTo(0));
+    }
+
+    @Test
+    public void testMoveToNext() {
+        cursor.theTable.add("Foobar");
+        cursor.theTable.add("Bletch");
+
+        assertThat(cursor.moveToFirst(), equalTo(true));
+        assertThat(cursor.getCount(), equalTo(2));
+        assertThat(cursor.moveToNext(), equalTo(true));
+        assertThat(cursor.getPosition(), equalTo(1));
+    }
+
+    @Test
+    public void testAttemptToMovePastEnd() {
+        cursor.theTable.add("Foobar");
+        cursor.theTable.add("Bletch");
+
+        assertThat(cursor.moveToFirst(), equalTo(true));
+        assertThat(cursor.getCount(), equalTo(2));
+        assertThat(cursor.moveToNext(), equalTo(true));
+        assertThat(cursor.moveToNext(), equalTo(false));
+        assertThat(cursor.getPosition(), equalTo(1));
+    }
+
+    @Test
+    public void testAttemptToMovePastSingleEntry() {
+        cursor.theTable.add("Foobar");
+
+        assertThat(cursor.moveToFirst(), equalTo(true));
+        assertThat(cursor.getCount(), equalTo(1));
+        assertThat(cursor.moveToNext(), equalTo(false));
+        assertThat(cursor.getPosition(), equalTo(0));
+    }
+
+    @Test
+    public void testAttemptToMovePastEmptyList() {
+        assertThat(cursor.moveToFirst(), equalTo(false));
+        assertThat(cursor.getCount(), equalTo(0));
+        assertThat(cursor.moveToNext(), equalTo(false));
+        assertThat(cursor.getPosition(), equalTo(0));
+    }
+
+    private class TestCursor extends AbstractCursor {
+
+        public List<Object> theTable = new ArrayList<Object>();
+
         @Override
         public int getCount() {
             return theTable.size();
         }
 
-		@Override
-		public String[] getColumnNames() {
+        @Override
+        public String[] getColumnNames() {
             throw new UnsupportedOperationException();
-		}
+        }
 
-		@Override
-		public double getDouble(int columnIndex) {
+        @Override
+        public double getDouble(int columnIndex) {
             throw new UnsupportedOperationException();
-		}
+        }
 
-		@Override
-		public float getFloat(int columnIndex) {
+        @Override
+        public float getFloat(int columnIndex) {
             throw new UnsupportedOperationException();
-		}
+        }
 
-		@Override
-		public int getInt(int columnIndex) {
+        @Override
+        public int getInt(int columnIndex) {
             throw new UnsupportedOperationException();
-		}
+        }
 
-		@Override
-		public long getLong(int columnIndex) {
+        @Override
+        public long getLong(int columnIndex) {
             throw new UnsupportedOperationException();
-		}
+        }
 
-		@Override
-		public short getShort(int columnIndex) {
+        @Override
+        public short getShort(int columnIndex) {
             throw new UnsupportedOperationException();
-		}
+        }
 
-		@Override
-		public String getString(int columnIndex) {
+        @Override
+        public String getString(int columnIndex) {
             throw new UnsupportedOperationException();
-		}
+        }
 
-		@Override
-		public boolean isNull(int columnIndex) {
+        @Override
+        public boolean isNull(int columnIndex) {
             throw new UnsupportedOperationException();
-		}
+        }
     }
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ActivityTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ActivityTest.java
index 4b3ce75..9500018 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ActivityTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/ActivityTest.java
@@ -16,8 +16,11 @@
 
 import static com.xtremelabs.robolectric.Robolectric.shadowOf;
 import static com.xtremelabs.robolectric.util.TestUtil.resourceFile;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.core.StringStartsWith.startsWith;
-import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 @RunWith(WithTestDefaultsRunner.class)
@@ -82,30 +85,30 @@
         ShadowActivity shadowActivity = Robolectric.shadowOf(activity);
         Intent intent = new Intent().setClass(activity, MyActivity.class);
         assertThat(shadowActivity.getNextStartedActivity(), nullValue());
-        
+
         activity.startActivityForResult(intent, 142);
-        
+
         Intent startedIntent = shadowActivity.getNextStartedActivity();
         assertThat(startedIntent, notNullValue());
         assertThat(startedIntent, sameInstance(intent));
     }
-    
+
     @Test
     public void shouldSupportGetStartedActitivitesForResult() throws Exception {
         MyActivity activity = new MyActivity();
         ShadowActivity shadowActivity = Robolectric.shadowOf(activity);
         Intent intent = new Intent().setClass(activity, MyActivity.class);
-        
+
         activity.startActivityForResult(intent, 142);
-        
+
         ShadowActivity.IntentForResult intentForResult = shadowActivity.getNextStartedActivityForResult();
         assertThat(intentForResult, notNullValue());
-    	  assertThat(shadowActivity.getNextStartedActivityForResult(), nullValue());
-    	  assertThat(intentForResult.intent, notNullValue());
-    	  assertThat(intentForResult.intent, sameInstance(intent));
-    	  assertThat(intentForResult.requestCode, equalTo(142));
+        assertThat(shadowActivity.getNextStartedActivityForResult(), nullValue());
+        assertThat(intentForResult.intent, notNullValue());
+        assertThat(intentForResult.intent, sameInstance(intent));
+        assertThat(intentForResult.requestCode, equalTo(142));
     }
-    
+
     @Test
     public void shouldSupportPeekStartedActitivitesForResult() throws Exception {
         MyActivity activity = new MyActivity();
@@ -113,15 +116,15 @@
         Intent intent = new Intent().setClass(activity, MyActivity.class);
 
         activity.startActivityForResult(intent, 142);
-        
+
         ShadowActivity.IntentForResult intentForResult = shadowActivity.peekNextStartedActivityForResult();
         assertThat(intentForResult, notNullValue());
-    	  assertThat(shadowActivity.peekNextStartedActivityForResult(), sameInstance(intentForResult));
-    	  assertThat(intentForResult.intent, notNullValue());
-    	  assertThat(intentForResult.intent, sameInstance(intent));
-    	  assertThat(intentForResult.requestCode, equalTo(142));
+        assertThat(shadowActivity.peekNextStartedActivityForResult(), sameInstance(intentForResult));
+        assertThat(intentForResult.intent, notNullValue());
+        assertThat(intentForResult.intent, sameInstance(intent));
+        assertThat(intentForResult.requestCode, equalTo(142));
     }
-    
+
     @Test
     public void onContentChangedShouldBeCalledAfterContentViewIsSet() throws RuntimeException {
         final Transcript transcript = new Transcript();
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AdapterViewBehavior.java b/src/test/java/com/xtremelabs/robolectric/shadows/AdapterViewBehavior.java
index 2f717a7..6af3b71 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AdapterViewBehavior.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/AdapterViewBehavior.java
@@ -19,7 +19,7 @@
 public class AdapterViewBehavior {
     public static void shouldActAsAdapterView(AdapterView adapterView) throws Exception {
         Robolectric.shadowOf(Looper.getMainLooper()).pause();
-        
+
         testSetAdapter_ShouldCauseViewsToBeRenderedAsynchronously(adapterView);
         testSetAdapter_ShouldSelectFirstItemAsynchronously(adapterView);
         shouldOnlyUpdateOnceIfInvalidatedMultipleTimes(adapterView);
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AlarmManagerTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/AlarmManagerTest.java
index faf48bb..001f109 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AlarmManagerTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/AlarmManagerTest.java
@@ -1,87 +1,88 @@
 package com.xtremelabs.robolectric.shadows;
 
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-
-import java.util.Date;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Date;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertThat;
 
 @RunWith(WithTestDefaultsRunner.class)
 public class AlarmManagerTest {
-	
-	private MyActivity activity;
-	private AlarmManager alarmManager;
-	private ShadowAlarmManager shadowAlarmManager;
 
-	@Before
-	public void setUp() throws Exception { 
+    private MyActivity activity;
+    private AlarmManager alarmManager;
+    private ShadowAlarmManager shadowAlarmManager;
+
+    @Before
+    public void setUp() throws Exception {
         activity = new MyActivity();
         alarmManager = (AlarmManager) activity.getSystemService(Context.ALARM_SERVICE);
         shadowAlarmManager = Robolectric.shadowOf(alarmManager);
-	}
+    }
 
-	@After
-	public void tearDown() throws Exception {
-	}
-	
+    @After
+    public void tearDown() throws Exception {
+    }
+
     @Test
     public void shouldSupportSet() throws Exception {
-    	assertThat( shadowAlarmManager.getNextScheduledAlarm(), nullValue() );
-    	alarmManager.set(AlarmManager.ELAPSED_REALTIME, 0, PendingIntent.getActivity(activity, 0, new Intent(activity, activity.getClass()), 0));
-        
+        assertThat(shadowAlarmManager.getNextScheduledAlarm(), nullValue());
+        alarmManager.set(AlarmManager.ELAPSED_REALTIME, 0, PendingIntent.getActivity(activity, 0, new Intent(activity, activity.getClass()), 0));
+
         ShadowAlarmManager.ScheduledAlarm scheduledAlarm = shadowAlarmManager.getNextScheduledAlarm();
         assertThat(scheduledAlarm, notNullValue());
     }
-    
+
     @Test
     public void shouldSupportGetNextScheduledAlarm() throws Exception {
-    	assertThat(shadowAlarmManager.getNextScheduledAlarm(), nullValue());
-    	
-       	long now = new Date().getTime();
-    	PendingIntent pendingIntent = PendingIntent.getActivity(activity, 0, new Intent(activity, activity.getClass()), 0);
-    	alarmManager.set(AlarmManager.ELAPSED_REALTIME, now, pendingIntent);
+        assertThat(shadowAlarmManager.getNextScheduledAlarm(), nullValue());
+
+        long now = new Date().getTime();
+        PendingIntent pendingIntent = PendingIntent.getActivity(activity, 0, new Intent(activity, activity.getClass()), 0);
+        alarmManager.set(AlarmManager.ELAPSED_REALTIME, now, pendingIntent);
 
         ShadowAlarmManager.ScheduledAlarm scheduledAlarm = shadowAlarmManager.getNextScheduledAlarm();
         assertThat(shadowAlarmManager.getNextScheduledAlarm(), nullValue());
         assertScheduledAlarm(now, pendingIntent, scheduledAlarm);
     }
-    
+
     @Test
     public void shouldSupportPeekScheduledAlarm() throws Exception {
-    	assertThat(shadowAlarmManager.getNextScheduledAlarm(), nullValue());
+        assertThat(shadowAlarmManager.getNextScheduledAlarm(), nullValue());
 
-    	long now = new Date().getTime();
-    	PendingIntent pendingIntent = PendingIntent.getActivity(activity, 0, new Intent(activity, activity.getClass()), 0);
-    	alarmManager.set(AlarmManager.ELAPSED_REALTIME, now, pendingIntent);
+        long now = new Date().getTime();
+        PendingIntent pendingIntent = PendingIntent.getActivity(activity, 0, new Intent(activity, activity.getClass()), 0);
+        alarmManager.set(AlarmManager.ELAPSED_REALTIME, now, pendingIntent);
 
         ShadowAlarmManager.ScheduledAlarm scheduledAlarm = shadowAlarmManager.peekNextScheduledAlarm();
         assertThat(shadowAlarmManager.peekNextScheduledAlarm(), notNullValue());
         assertScheduledAlarm(now, pendingIntent, scheduledAlarm);
     }
 
-	private void assertScheduledAlarm(long now, PendingIntent pendingIntent,
-			ShadowAlarmManager.ScheduledAlarm scheduledAlarm) {
-		assertThat(scheduledAlarm, notNullValue());
+    private void assertScheduledAlarm(long now, PendingIntent pendingIntent,
+                                      ShadowAlarmManager.ScheduledAlarm scheduledAlarm) {
+        assertThat(scheduledAlarm, notNullValue());
         assertThat(scheduledAlarm.operation, notNullValue());
         assertThat(scheduledAlarm.operation, sameInstance(pendingIntent));
         assertThat(scheduledAlarm.type, equalTo(AlarmManager.ELAPSED_REALTIME));
         assertThat(scheduledAlarm.triggerAtTime, equalTo(now));
         assertThat(scheduledAlarm.interval, equalTo(0L));
-	}
+    }
 
     private static class MyActivity extends Activity {
         @Override protected void onDestroy() {
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java
index 2692732..38b6a4f 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java
@@ -13,7 +13,7 @@
 
 @RunWith(WithTestDefaultsRunner.class)
 public class AlertDialogTest {
-    
+
     @Test
     public void testBuilder() throws Exception {
         AlertDialog.Builder builder = new AlertDialog.Builder(new ContextWrapper(null));
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ArrayAdapterTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ArrayAdapterTest.java
index 8f67629..c9657ee 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ArrayAdapterTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/ArrayAdapterTest.java
@@ -17,33 +17,33 @@
 
 @RunWith(WithTestDefaultsRunner.class)
 public class ArrayAdapterTest {
-  
-  private ArrayAdapter<Integer> arrayAdapter;
-  
-  @Before public void setUp() throws Exception {
-    Robolectric.bindDefaultShadowClasses();
 
-    Robolectric.application = new Application();
-    
-    List<Integer> list = new ArrayList<Integer>();
-    list.add(1);
-    list.add(2);
-    list.add(3);
-    
-    arrayAdapter = new ArrayAdapter<Integer>(Robolectric.application, 0, list);
-  }
-  
-  @Test
-  public void verifyContext() {
-    assertEquals(Robolectric.application, arrayAdapter.getContext());
-  }
-  
-  @Test
-  public void verifyListContent() {
-    assertEquals(3, arrayAdapter.getCount());
-    assertEquals(new Integer(1), arrayAdapter.getItem(0));
-    assertEquals(new Integer(2), arrayAdapter.getItem(1));
-    assertEquals(new Integer(3), arrayAdapter.getItem(2));
-  }
+    private ArrayAdapter<Integer> arrayAdapter;
+
+    @Before public void setUp() throws Exception {
+        Robolectric.bindDefaultShadowClasses();
+
+        Robolectric.application = new Application();
+
+        List<Integer> list = new ArrayList<Integer>();
+        list.add(1);
+        list.add(2);
+        list.add(3);
+
+        arrayAdapter = new ArrayAdapter<Integer>(Robolectric.application, 0, list);
+    }
+
+    @Test
+    public void verifyContext() {
+        assertEquals(Robolectric.application, arrayAdapter.getContext());
+    }
+
+    @Test
+    public void verifyListContent() {
+        assertEquals(3, arrayAdapter.getCount());
+        assertEquals(new Integer(1), arrayAdapter.getItem(0));
+        assertEquals(new Integer(2), arrayAdapter.getItem(1));
+        assertEquals(new Integer(3), arrayAdapter.getItem(2));
+    }
 
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AssetManagerTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/AssetManagerTest.java
index 94ee0bb..2a94426 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AssetManagerTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/AssetManagerTest.java
@@ -20,8 +20,8 @@
 
 @RunWith(WithTestDefaultsRunner.class)
 public class AssetManagerTest {
-	AssetManager assetManager;
-	String sp = System.getProperty("file.separator");
+    AssetManager assetManager;
+    String sp = System.getProperty("file.separator");
 
     @Before
     public void setUp() throws Exception {
@@ -29,53 +29,53 @@
     }
 
     @Test
-	public void assertGetAssetsNotNull() {
-		assertNotNull(assetManager);
+    public void assertGetAssetsNotNull() {
+        assertNotNull(assetManager);
 
-		assetManager = Robolectric.application.getAssets();
-		assertNotNull(assetManager);
+        assetManager = Robolectric.application.getAssets();
+        assertNotNull(assetManager);
 
-		assetManager = Robolectric.application.getResources().getAssets();
-		assertNotNull(assetManager);
-	}
+        assetManager = Robolectric.application.getResources().getAssets();
+        assertNotNull(assetManager);
+    }
 
-	@Test
-	public void assetsPathListing() throws IOException {
-		List<String> files;
-		String testPath;
+    @Test
+    public void assetsPathListing() throws IOException {
+        List<String> files;
+        String testPath;
 
-		testPath = "";
-		files = Arrays.asList(assetManager.list(testPath));
-		assertTrue(files.contains("docs"));
-		assertTrue(files.contains("assetsHome.txt"));
+        testPath = "";
+        files = Arrays.asList(assetManager.list(testPath));
+        assertTrue(files.contains("docs"));
+        assertTrue(files.contains("assetsHome.txt"));
 
-		testPath = "docs";
-		files = Arrays.asList(assetManager.list(testPath));
-		assertTrue(files.contains("extra"));
+        testPath = "docs";
+        files = Arrays.asList(assetManager.list(testPath));
+        assertTrue(files.contains("extra"));
 
-		testPath = "docs" + sp + "extra";
-		files = Arrays.asList(assetManager.list(testPath));
-		assertTrue(files.contains("testing"));
+        testPath = "docs" + sp + "extra";
+        files = Arrays.asList(assetManager.list(testPath));
+        assertTrue(files.contains("testing"));
 
-		testPath = "docs" + sp + "extra" + sp + "testing";
-		files = Arrays.asList(assetManager.list(testPath));
-		assertTrue(files.contains("hello.txt"));
-	}
+        testPath = "docs" + sp + "extra" + sp + "testing";
+        files = Arrays.asList(assetManager.list(testPath));
+        assertTrue(files.contains("hello.txt"));
+    }
 
-	@Test
-	public void assetsInputStreams() throws IOException {
-		String testPath;
-		String fileContents;
-		InputStream inputStream;
+    @Test
+    public void assetsInputStreams() throws IOException {
+        String testPath;
+        String fileContents;
+        InputStream inputStream;
 
-		testPath = "assetsHome.txt";
-		inputStream = assetManager.open(testPath);
-		fileContents = Strings.fromStream(inputStream);
-		assertEquals("assetsHome!", fileContents);
+        testPath = "assetsHome.txt";
+        inputStream = assetManager.open(testPath);
+        fileContents = Strings.fromStream(inputStream);
+        assertEquals("assetsHome!", fileContents);
 
-		testPath = "docs" + sp + "extra" + sp + "testing" + sp + "hello.txt";
-		inputStream = assetManager.open(testPath);
-		fileContents = Strings.fromStream(inputStream);
-		assertEquals("hello!", fileContents);
-	}
+        testPath = "docs" + sp + "extra" + sp + "testing" + sp + "hello.txt";
+        inputStream = assetManager.open(testPath);
+        fileContents = Strings.fromStream(inputStream);
+        assertEquals("hello!", fileContents);
+    }
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/BitmapDrawableTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/BitmapDrawableTest.java
index ca60532..3615913 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/BitmapDrawableTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/BitmapDrawableTest.java
@@ -44,7 +44,7 @@
 
         assertEquals("Bitmap for resource:drawable/an_image", shadowOf(canvas).getDescription());
     }
-    
+
     @Test
     public void withColorFilterSet_draw_shouldCopyDescriptionToCanvas() throws Exception {
         BitmapDrawable drawable = (BitmapDrawable) resources.getDrawable(R.drawable.an_image);
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CameraParametersTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/CameraParametersTest.java
index ebbfbe0..6a6e9f9 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CameraParametersTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/CameraParametersTest.java
@@ -11,7 +11,9 @@
 
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.core.IsCollectionContaining.hasItem;
 import static org.junit.Assert.assertThat;
 
@@ -26,36 +28,36 @@
         parameters = Robolectric.newInstanceOf(Camera.Parameters.class);
         shadowParameters = Robolectric.shadowOf(parameters);
     }
-    
+
     @Test
     public void testPictureSize() throws Exception {
-    	assertThat(shadowParameters.getPictureHeight(), not(equalTo(600)));
-    	assertThat(shadowParameters.getPictureWidth(), not(equalTo(800)));
-    	parameters.setPictureSize(800, 600);
-    	Camera.Size pictureSize = parameters.getPictureSize();
-    	assertThat(pictureSize.width, equalTo(800));
-    	assertThat(pictureSize.height, equalTo(600));
-    	assertThat(shadowParameters.getPictureHeight(), equalTo(600));
-    	assertThat(shadowParameters.getPictureWidth(), equalTo(800));
+        assertThat(shadowParameters.getPictureHeight(), not(equalTo(600)));
+        assertThat(shadowParameters.getPictureWidth(), not(equalTo(800)));
+        parameters.setPictureSize(800, 600);
+        Camera.Size pictureSize = parameters.getPictureSize();
+        assertThat(pictureSize.width, equalTo(800));
+        assertThat(pictureSize.height, equalTo(600));
+        assertThat(shadowParameters.getPictureHeight(), equalTo(600));
+        assertThat(shadowParameters.getPictureWidth(), equalTo(800));
     }
-    
+
     @Test
     public void testPreviewFpsRange() throws Exception {
-    	int[] fpsRange = new int[2];
-    	parameters.getPreviewFpsRange(fpsRange);
-    	assertThat(fpsRange[1], not(equalTo(15)));
-    	assertThat(fpsRange[0], not(equalTo(25)));
-    	parameters.setPreviewFpsRange(15, 25);
-       	parameters.getPreviewFpsRange(fpsRange);
-    	assertThat(fpsRange[1], equalTo(25));
-    	assertThat(fpsRange[0], equalTo(15));
+        int[] fpsRange = new int[2];
+        parameters.getPreviewFpsRange(fpsRange);
+        assertThat(fpsRange[1], not(equalTo(15)));
+        assertThat(fpsRange[0], not(equalTo(25)));
+        parameters.setPreviewFpsRange(15, 25);
+        parameters.getPreviewFpsRange(fpsRange);
+        assertThat(fpsRange[1], equalTo(25));
+        assertThat(fpsRange[0], equalTo(15));
     }
-    
+
     @Test
     public void testPreviewFrameRate() throws Exception {
-    	assertThat(parameters.getPreviewFrameRate(), not(equalTo(15)));
-    	parameters.setPreviewFrameRate(15);
-    	assertThat(parameters.getPreviewFrameRate(), equalTo(15));
+        assertThat(parameters.getPreviewFrameRate(), not(equalTo(15)));
+        parameters.setPreviewFrameRate(15);
+        assertThat(parameters.getPreviewFrameRate(), equalTo(15));
     }
 
     @Test
@@ -92,42 +94,42 @@
         assertThat(supportedFormats.size(), equalTo(2));
         assertThat(supportedFormats, hasItem(new Integer(ImageFormat.NV21)));
     }
-    
+
     @Test
     public void testGetSupportedPictureSizes() throws Exception {
-    	List<Camera.Size> supportedSizes = parameters.getSupportedPictureSizes();
-    	assertThat(supportedSizes, notNullValue());
-    	assertThat(supportedSizes.size(), equalTo(3));
-    	assertThat(supportedSizes.get(0).width, equalTo(320));
-    	assertThat(supportedSizes.get(0).height, equalTo(240));
+        List<Camera.Size> supportedSizes = parameters.getSupportedPictureSizes();
+        assertThat(supportedSizes, notNullValue());
+        assertThat(supportedSizes.size(), equalTo(3));
+        assertThat(supportedSizes.get(0).width, equalTo(320));
+        assertThat(supportedSizes.get(0).height, equalTo(240));
     }
 
     @Test
     public void testGetSupportedPreviewSizes() throws Exception {
-    	List<Camera.Size> supportedSizes = parameters.getSupportedPreviewSizes();
-    	assertThat(supportedSizes, notNullValue());
-    	assertThat(supportedSizes.size(), equalTo(2));
-    	assertThat(supportedSizes.get(0).width, equalTo(320));
-    	assertThat(supportedSizes.get(0).height, equalTo(240));
+        List<Camera.Size> supportedSizes = parameters.getSupportedPreviewSizes();
+        assertThat(supportedSizes, notNullValue());
+        assertThat(supportedSizes.size(), equalTo(2));
+        assertThat(supportedSizes.get(0).width, equalTo(320));
+        assertThat(supportedSizes.get(0).height, equalTo(240));
     }
-    
+
     @Test
     public void testGetSupportedPreviewFpsRange() throws Exception {
-    	List<int[]> supportedRanges = parameters.getSupportedPreviewFpsRange();
-    	assertThat(supportedRanges, notNullValue());
+        List<int[]> supportedRanges = parameters.getSupportedPreviewFpsRange();
+        assertThat(supportedRanges, notNullValue());
         assertThat(supportedRanges.size(), equalTo(2));
-    	assertThat(supportedRanges.get(0)[0], equalTo(15));
-    	assertThat(supportedRanges.get(0)[1], equalTo(15));
-    	assertThat(supportedRanges.get(1)[0], equalTo(10));
-    	assertThat(supportedRanges.get(1)[1], equalTo(30));
+        assertThat(supportedRanges.get(0)[0], equalTo(15));
+        assertThat(supportedRanges.get(0)[1], equalTo(15));
+        assertThat(supportedRanges.get(1)[0], equalTo(10));
+        assertThat(supportedRanges.get(1)[1], equalTo(30));
     }
-    
+
     @Test
     public void testGetSupportedPreviewFrameRates() throws Exception {
-    	List<Integer> supportedRates = parameters.getSupportedPreviewFrameRates();
-       	assertThat(supportedRates, notNullValue());
+        List<Integer> supportedRates = parameters.getSupportedPreviewFrameRates();
+        assertThat(supportedRates, notNullValue());
         assertThat(supportedRates.size(), equalTo(3));
-    	assertThat(supportedRates.get(0), equalTo(10));
+        assertThat(supportedRates.get(0), equalTo(10));
     }
-    
+
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CameraSizeTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/CameraSizeTest.java
index 79e420c..1e9fe12 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CameraSizeTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/CameraSizeTest.java
@@ -1,47 +1,46 @@
 package com.xtremelabs.robolectric.shadows;
 
 
+import android.hardware.Camera;
+import com.xtremelabs.robolectric.Robolectric;
+import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.xtremelabs.robolectric.Robolectric;
-import com.xtremelabs.robolectric.WithTestDefaultsRunner;
-
-import android.hardware.Camera;
-
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertThat;
 
 @RunWith(WithTestDefaultsRunner.class)
 public class CameraSizeTest {
-	
-	private Camera.Size cameraSize;
 
-	@Before
-	public void setUp() throws Exception {
+    private Camera.Size cameraSize;
+
+    @Before
+    public void setUp() throws Exception {
         Robolectric.bindDefaultShadowClasses();
-		cameraSize = Robolectric.newInstanceOf(Camera.class).new Size(480, 320);
-	}
-	
-	@Test
-	public void testConstructor() throws Exception {
-		assertThat(cameraSize.width, equalTo(480));
-		assertThat(cameraSize.height, equalTo(320));
-	}
-	
-	@Test
-	public void testSetWidth() throws Exception {
-		assertThat(cameraSize.width, not(equalTo(640)));
-		cameraSize.width = 640;
-		assertThat(cameraSize.width, equalTo(640));
-	}
+        cameraSize = Robolectric.newInstanceOf(Camera.class).new Size(480, 320);
+    }
 
-	@Test
-	public void testSetHeight() throws Exception {
-		assertThat(cameraSize.height, not(equalTo(480)));
-		cameraSize.height = 480;
-		assertThat(cameraSize.height, equalTo(480));
-	}
+    @Test
+    public void testConstructor() throws Exception {
+        assertThat(cameraSize.width, equalTo(480));
+        assertThat(cameraSize.height, equalTo(320));
+    }
+
+    @Test
+    public void testSetWidth() throws Exception {
+        assertThat(cameraSize.width, not(equalTo(640)));
+        cameraSize.width = 640;
+        assertThat(cameraSize.width, equalTo(640));
+    }
+
+    @Test
+    public void testSetHeight() throws Exception {
+        assertThat(cameraSize.height, not(equalTo(480)));
+        cameraSize.height = 480;
+        assertThat(cameraSize.height, equalTo(480));
+    }
 
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java
index 576d079..c20c029 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java
@@ -1,33 +1,31 @@
 package com.xtremelabs.robolectric.shadows;
 
 
+import android.content.res.Configuration;
+import com.xtremelabs.robolectric.Robolectric;
+import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.xtremelabs.robolectric.Robolectric;
-import com.xtremelabs.robolectric.WithTestDefaultsRunner;
-
-import android.content.res.Configuration;
-
-import static org.junit.Assert.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
 
 @RunWith(WithTestDefaultsRunner.class)
 public class ConfigurationTest {
 
-	private Configuration configuration;
-	
-	@Before
-	public void setUp() throws Exception {
+    private Configuration configuration;
+
+    @Before
+    public void setUp() throws Exception {
         Robolectric.bindDefaultShadowClasses();
-		configuration = new Configuration();
-	}
-	
-	@Test
-	public void testSetToDefaults() throws Exception {
-		configuration.setToDefaults();
-		assertThat( configuration.screenLayout, equalTo( Configuration.SCREENLAYOUT_LONG_NO | Configuration.SCREENLAYOUT_SIZE_NORMAL ) );
-	}
+        configuration = new Configuration();
+    }
+
+    @Test
+    public void testSetToDefaults() throws Exception {
+        configuration.setToDefaults();
+        assertThat(configuration.screenLayout, equalTo(Configuration.SCREENLAYOUT_LONG_NO | Configuration.SCREENLAYOUT_SIZE_NORMAL));
+    }
 
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ConnectivityManagerTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ConnectivityManagerTest.java
index 9ee8422..650ba9f 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ConnectivityManagerTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/ConnectivityManagerTest.java
@@ -9,7 +9,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(WithTestDefaultsRunner.class)
 public class ConnectivityManagerTest {
@@ -26,21 +28,21 @@
 
     @Test
     public void getConnectivityManagerShouldNotBeNull() {
-    	assertNotNull(connectivityManager);
-    	assertNotNull(connectivityManager.getActiveNetworkInfo());
+        assertNotNull(connectivityManager);
+        assertNotNull(connectivityManager.getActiveNetworkInfo());
     }
 
     @Test
     public void networkInfoShouldReturnTrueCorrectly() {
-    	networkInfo.setConnectionStatus(true);
+        networkInfo.setConnectionStatus(true);
 
-    	assertTrue(connectivityManager.getActiveNetworkInfo().isConnectedOrConnecting());
+        assertTrue(connectivityManager.getActiveNetworkInfo().isConnectedOrConnecting());
     }
 
     @Test
     public void networkInfoShouldReturnFalseCorrectly() {
-    	networkInfo.setConnectionStatus(false);
+        networkInfo.setConnectionStatus(false);
 
-    	assertFalse(connectivityManager.getActiveNetworkInfo().isConnectedOrConnecting());
+        assertFalse(connectivityManager.getActiveNetworkInfo().isConnectedOrConnecting());
     }
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LayoutInflaterTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/LayoutInflaterTest.java
index 64f8214..e870efa 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LayoutInflaterTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/LayoutInflaterTest.java
@@ -1,18 +1,13 @@
 package com.xtremelabs.robolectric.shadows;
 
-import android.app.Application;
 import android.content.ContextWrapper;
 import android.view.LayoutInflater;
-import com.xtremelabs.robolectric.R;
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
-import com.xtremelabs.robolectric.res.ResourceLoader;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.io.File;
-
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LayoutParamsTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/LayoutParamsTest.java
index 5a6e743..b78ecb8 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LayoutParamsTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/LayoutParamsTest.java
@@ -1,8 +1,6 @@
 package com.xtremelabs.robolectric.shadows;
 
-import android.view.ViewGroup;
 import android.widget.Gallery;
-import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MediaPlayerTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/MediaPlayerTest.java
index 2af13ef..31c72ba 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MediaPlayerTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/MediaPlayerTest.java
@@ -1,36 +1,34 @@
 package com.xtremelabs.robolectric.shadows;
 
+import android.media.MediaPlayer;
+import com.xtremelabs.robolectric.Robolectric;
+import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
 
-import android.media.MediaPlayer;
-
-import com.xtremelabs.robolectric.Robolectric;
-import com.xtremelabs.robolectric.WithTestDefaultsRunner;
-
 @RunWith(WithTestDefaultsRunner.class)
 public class MediaPlayerTest {
 
-	private MediaPlayer mediaPlayer;
-	private ShadowMediaPlayer shadowMediaPlayer;
-	
+    private MediaPlayer mediaPlayer;
+    private ShadowMediaPlayer shadowMediaPlayer;
+
     @Before
     public void setUp() throws Exception {
-    	mediaPlayer = Robolectric.newInstanceOf(MediaPlayer.class);
-    	shadowMediaPlayer = Robolectric.shadowOf(mediaPlayer);
-    }	
-    
+        mediaPlayer = Robolectric.newInstanceOf(MediaPlayer.class);
+        shadowMediaPlayer = Robolectric.shadowOf(mediaPlayer);
+    }
+
     @Test
     public void testCurrentPosition() {
-    	int[] positions = { 0, 1, 2, 1024 };
-    	
-    	for( int position : positions ) {
-    		shadowMediaPlayer.setCurrentPosition(position);
-    		assertThat( mediaPlayer.getCurrentPosition(), equalTo(position));
-    	}
+        int[] positions = {0, 1, 2, 1024};
+
+        for (int position : positions) {
+            shadowMediaPlayer.setCurrentPosition(position);
+            assertThat(mediaPlayer.getCurrentPosition(), equalTo(position));
+        }
     }
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MenuInflaterTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/MenuInflaterTest.java
index 5cdc576..82cb2ee 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MenuInflaterTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/MenuInflaterTest.java
@@ -13,19 +13,18 @@
 
 @RunWith(WithTestDefaultsRunner.class)
 public class MenuInflaterTest {
-	@Test
-	public void canRetrieveMenuList()
-	{
+    @Test
+    public void canRetrieveMenuList() {
         TestMenu menu = new TestMenu();
-		new MenuInflater(Robolectric.application).inflate(R.menu.test, menu);
-		
+        new MenuInflater(Robolectric.application).inflate(R.menu.test, menu);
+
         TestMenuItem testMenuItem = (TestMenuItem) menu.getItem(0);
         assertEquals("Test menu item 1", testMenuItem.getTitle().toString());
         testMenuItem.click();
 
-		testMenuItem = (TestMenuItem) menu.getItem(1);
+        testMenuItem = (TestMenuItem) menu.getItem(1);
         assertEquals("Test menu item 2", testMenuItem.getTitle().toString());
         testMenuItem.click();
-	}
+    }
 
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java
index 72ec4ba..b43002a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java
@@ -7,26 +7,25 @@
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import com.xtremelabs.robolectric.res.ResourceLoader;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertThat;
-import static org.hamcrest.CoreMatchers.notNullValue;
-
 import java.io.File;
+
 import static com.xtremelabs.robolectric.util.TestUtil.resourceFile;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
 
 @RunWith(WithTestDefaultsRunner.class)
 public class ResourcesTest {
-	
-	@Before
-	public void setUp() throws Exception {
-        Robolectric.bindDefaultShadowClasses();		
+
+    @Before
+    public void setUp() throws Exception {
+        Robolectric.bindDefaultShadowClasses();
         Robolectric.application = ShadowApplication.bind(new Application(), new ResourceLoader(R.class, new File("test/res"), new File("test/assets")));
-	}
-	
+    }
+
     @Test(expected = Resources.NotFoundException.class)
     public void getStringArray_shouldThrowExceptionIfNotFound() throws Exception {
         Robolectric.bindDefaultShadowClasses();
@@ -34,9 +33,9 @@
 
         new Activity().getResources().getStringArray(-1);
     }
-    
+
     @Test
     public void testConfiguration() {
-        assertThat( new Activity().getResources().getConfiguration(), notNullValue() );
+        assertThat(new Activity().getResources().getConfiguration(), notNullValue());
     }
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringBuilderTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringBuilderTest.java
index 0b20da1..5b78491 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringBuilderTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringBuilderTest.java
@@ -1,9 +1,7 @@
 package com.xtremelabs.robolectric.shadows;
 
 import android.text.SpannableStringBuilder;
-import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -12,7 +10,7 @@
 
 @RunWith(WithTestDefaultsRunner.class)
 public class SpannableStringBuilderTest {
-    
+
     @Test
     public void testAppend() throws Exception {
         SpannableStringBuilder builder = new SpannableStringBuilder("abc");
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java
index d80f678..91ee8ef 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java
@@ -2,7 +2,6 @@
 
 import android.text.style.URLSpan;
 import android.widget.TextView;
-import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewGroupTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ViewGroupTest.java
index 239edd7..dd69b62 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewGroupTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/ViewGroupTest.java
@@ -8,7 +8,6 @@
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import com.xtremelabs.robolectric.res.ResourceLoader;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -22,11 +21,13 @@
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(WithTestDefaultsRunner.class)
 public class ViewGroupTest {
-	private String defaultLineSeparator;
+    private String defaultLineSeparator;
     private ViewGroup root;
     private View child1;
     private View child2;
@@ -54,14 +55,14 @@
 
         child3.addView(child3a);
         child3.addView(child3b);
-        
+
         defaultLineSeparator = System.getProperty("line.separator");
         System.setProperty("line.separator", "\n");
     }
-    
+
     @After
     public void tearDown() throws Exception {
-    	System.setProperty("line.separator", defaultLineSeparator);
+        System.setProperty("line.separator", defaultLineSeparator);
     }
 
     @Test
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java
index 482f60d..d8135ab 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java
@@ -85,7 +85,7 @@
     @Test
     public void shouldKnowIfThisOrAncestorsAreVisible() throws Exception {
         assertTrue(shadowOf(view).derivedIsVisible());
-        
+
         ViewGroup grandParent = new LinearLayout(null);
         ViewGroup parent = new LinearLayout(null);
         grandParent.addView(parent);
@@ -115,7 +115,7 @@
         assertTrue(clickListener.clicked);
     }
 
-    @Test(expected= RuntimeException.class)
+    @Test(expected = RuntimeException.class)
     public void checkedClick_shouldThrowIfViewIsNotVisible() throws Exception {
         ViewGroup grandParent = new LinearLayout(null);
         ViewGroup parent = new LinearLayout(null);
@@ -126,23 +126,23 @@
         shadowOf(view).checkedPerformClick();
     }
 
-    @Test(expected= RuntimeException.class)
+    @Test(expected = RuntimeException.class)
     public void checkedClick_shouldThrowIfViewIsDisabled() throws Exception {
         view.setEnabled(false);
         shadowOf(view).checkedPerformClick();
     }
 
-    
+
     @Test
     public void shouldRecordBackgroundColor() {
-        int[] colors = { 0, 1, 727 }; 
-        
-        for(int color : colors) {
-        	view.setBackgroundColor(color);
-        	assertThat(shadowOf(view).getBackgroundColor(), equalTo(color));
+        int[] colors = {0, 1, 727};
+
+        for (int color : colors) {
+            view.setBackgroundColor(color);
+            assertThat(shadowOf(view).getBackgroundColor(), equalTo(color));
         }
     }
- 
+
     @Test
     public void shouldPostActionsToTheMessageQueue() throws Exception {
         Robolectric.pauseMainLooper();
@@ -154,7 +154,7 @@
         Robolectric.unPauseMainLooper();
         assertTrue(runnable.wasRun);
     }
-    
+
     @Test
     public void shouldPostActionsToTheMessageQueueWithDelay() throws Exception {
         Robolectric.pauseMainLooper();
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/WebSettingsTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/WebSettingsTest.java
index 0ff4487..9662b60 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/WebSettingsTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/WebSettingsTest.java
@@ -1,165 +1,163 @@
 package com.xtremelabs.robolectric.shadows;
 
+import android.webkit.WebSettings;
+import com.xtremelabs.robolectric.Robolectric;
+import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
 
-import android.webkit.WebSettings;
-
-import com.xtremelabs.robolectric.Robolectric;
-import com.xtremelabs.robolectric.WithTestDefaultsRunner;
-
 
 @RunWith(WithTestDefaultsRunner.class)
 public class WebSettingsTest {
-	
-	private WebSettings webSettings;
-	private ShadowWebSettings shadowWebSettings;
-	
-	private boolean[] trueAndFalse = { true, false };
+
+    private WebSettings webSettings;
+    private ShadowWebSettings shadowWebSettings;
+
+    private boolean[] trueAndFalse = {true, false};
 
     @Before
     public void setUp() throws Exception {
-    	webSettings = Robolectric.newInstanceOf(WebSettings.class);
-    	shadowWebSettings = Robolectric.shadowOf(webSettings);
-   }
-    
+        webSettings = Robolectric.newInstanceOf(WebSettings.class);
+        shadowWebSettings = Robolectric.shadowOf(webSettings);
+    }
+
     @Test
     public void testDefaults() {
-    	assertThat(webSettings.getAllowFileAccess(), equalTo(true));
-    	assertThat(webSettings.getBlockNetworkImage(), equalTo(false));
-    	assertThat(webSettings.getBlockNetworkLoads(), equalTo(false));
-    	assertThat(webSettings.getBuiltInZoomControls(), equalTo(true));
-    	assertThat(webSettings.getDatabaseEnabled(), equalTo(false));
-    	assertThat(webSettings.getDomStorageEnabled(), equalTo(false));
-    	assertThat(webSettings.getJavaScriptEnabled(), equalTo(false));
-    	assertThat(webSettings.getLightTouchEnabled(), equalTo(false));
-    	assertThat(webSettings.getLoadWithOverviewMode(), equalTo(false));
-    	assertThat(shadowWebSettings.getNeedInitialFocus(), equalTo(false));
-    	assertThat(webSettings.getPluginsEnabled(), equalTo(false));
-    	assertThat(webSettings.getPluginState(), equalTo(WebSettings.PluginState.OFF));
-    	assertThat(shadowWebSettings.getSupportMultipleWindows(), equalTo(false));
-    	assertThat(shadowWebSettings.getSupportZoom(), equalTo(true));
+        assertThat(webSettings.getAllowFileAccess(), equalTo(true));
+        assertThat(webSettings.getBlockNetworkImage(), equalTo(false));
+        assertThat(webSettings.getBlockNetworkLoads(), equalTo(false));
+        assertThat(webSettings.getBuiltInZoomControls(), equalTo(true));
+        assertThat(webSettings.getDatabaseEnabled(), equalTo(false));
+        assertThat(webSettings.getDomStorageEnabled(), equalTo(false));
+        assertThat(webSettings.getJavaScriptEnabled(), equalTo(false));
+        assertThat(webSettings.getLightTouchEnabled(), equalTo(false));
+        assertThat(webSettings.getLoadWithOverviewMode(), equalTo(false));
+        assertThat(shadowWebSettings.getNeedInitialFocus(), equalTo(false));
+        assertThat(webSettings.getPluginsEnabled(), equalTo(false));
+        assertThat(webSettings.getPluginState(), equalTo(WebSettings.PluginState.OFF));
+        assertThat(shadowWebSettings.getSupportMultipleWindows(), equalTo(false));
+        assertThat(shadowWebSettings.getSupportZoom(), equalTo(true));
     }
 
     @Test
     public void testAllowFileAccess() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setAllowFileAccess(value);
-	    	assertThat(webSettings.getAllowFileAccess(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setAllowFileAccess(value);
+            assertThat(webSettings.getAllowFileAccess(), equalTo(value));
+        }
     }
 
     @Test
     public void testBlockNetworkImage() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setBlockNetworkImage(value);
-	    	assertThat(webSettings.getBlockNetworkImage(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setBlockNetworkImage(value);
+            assertThat(webSettings.getBlockNetworkImage(), equalTo(value));
+        }
     }
 
     @Test
     public void testBlockNetworkLoads() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setBlockNetworkLoads(value);
-	    	assertThat(webSettings.getBlockNetworkLoads(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setBlockNetworkLoads(value);
+            assertThat(webSettings.getBlockNetworkLoads(), equalTo(value));
+        }
     }
 
     @Test
     public void testBuiltInZoomControls() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setBuiltInZoomControls(value);
-	    	assertThat(webSettings.getBuiltInZoomControls(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setBuiltInZoomControls(value);
+            assertThat(webSettings.getBuiltInZoomControls(), equalTo(value));
+        }
     }
 
     @Test
     public void testDatabaseEnabled() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setDatabaseEnabled(value);
-	    	assertThat(webSettings.getDatabaseEnabled(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setDatabaseEnabled(value);
+            assertThat(webSettings.getDatabaseEnabled(), equalTo(value));
+        }
     }
-    
+
     @Test
     public void testDomStorageEnabled() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setDomStorageEnabled(value);
-	    	assertThat(webSettings.getDomStorageEnabled(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setDomStorageEnabled(value);
+            assertThat(webSettings.getDomStorageEnabled(), equalTo(value));
+        }
     }
-    
+
     @Test
     public void testJavaScriptEnabled() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setJavaScriptEnabled(value);
-	    	assertThat(webSettings.getJavaScriptEnabled(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setJavaScriptEnabled(value);
+            assertThat(webSettings.getJavaScriptEnabled(), equalTo(value));
+        }
     }
-    
+
     @Test
     public void testLightTouchEnabled() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setLightTouchEnabled(value);
-	    	assertThat(webSettings.getLightTouchEnabled(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setLightTouchEnabled(value);
+            assertThat(webSettings.getLightTouchEnabled(), equalTo(value));
+        }
     }
-    
+
     @Test
     public void testLoadWithOverviewMode() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setLoadWithOverviewMode(value);
-	    	assertThat(webSettings.getLoadWithOverviewMode(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setLoadWithOverviewMode(value);
+            assertThat(webSettings.getLoadWithOverviewMode(), equalTo(value));
+        }
     }
-    
+
     @Test
     public void testNeedInitialFocus() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setNeedInitialFocus(value);
-	    	assertThat(shadowWebSettings.getNeedInitialFocus(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setNeedInitialFocus(value);
+            assertThat(shadowWebSettings.getNeedInitialFocus(), equalTo(value));
+        }
     }
-    
+
     @Test
     public void testPluginsEnabled() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setPluginsEnabled(value);
-	    	assertThat(webSettings.getPluginsEnabled(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setPluginsEnabled(value);
+            assertThat(webSettings.getPluginsEnabled(), equalTo(value));
+        }
     }
-    
+
     @Test
     public void testPluginState() {
-    	WebSettings.PluginState[] states = { 
-    			WebSettings.PluginState.OFF, 
-    			WebSettings.PluginState.ON, 
-    			WebSettings.PluginState.ON_DEMAND 
-    	};
-    	
-    	for( WebSettings.PluginState state : states ) {
-    		webSettings.setPluginState(state);
-	    	assertThat(webSettings.getPluginState(), equalTo(state));
-    	}
+        WebSettings.PluginState[] states = {
+                WebSettings.PluginState.OFF,
+                WebSettings.PluginState.ON,
+                WebSettings.PluginState.ON_DEMAND
+        };
+
+        for (WebSettings.PluginState state : states) {
+            webSettings.setPluginState(state);
+            assertThat(webSettings.getPluginState(), equalTo(state));
+        }
     }
-    
+
     @Test
     public void testSupportMultipleWindows() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setSupportMultipleWindows(value);
-	    	assertThat(shadowWebSettings.getSupportMultipleWindows(), equalTo(value));
-    	}
+        for (boolean value : trueAndFalse) {
+            webSettings.setSupportMultipleWindows(value);
+            assertThat(shadowWebSettings.getSupportMultipleWindows(), equalTo(value));
+        }
     }
-    
+
     @Test
     public void testSupportZoom() {
-    	for( boolean value : trueAndFalse ) {
-    		webSettings.setSupportZoom(value);
-	    	assertThat(shadowWebSettings.getSupportZoom(), equalTo(value));
-    	}
-    }   
+        for (boolean value : trueAndFalse) {
+            webSettings.setSupportZoom(value);
+            assertThat(shadowWebSettings.getSupportZoom(), equalTo(value));
+        }
+    }
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/WebViewTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/WebViewTest.java
index 48155e9..1fd8a2d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/WebViewTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/WebViewTest.java
@@ -3,14 +3,16 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.xtremelabs.robolectric.Robolectric.shadowOf;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
 
 @RunWith(WithTestDefaultsRunner.class)
@@ -22,39 +24,39 @@
         webView.loadUrl("http://example.com");
         assertThat(shadowOf(webView).getLastLoadedUrl(), equalTo("http://example.com"));
     }
-    
+
     @Test
     public void shouldReturnSettings() {
         WebView webView = new WebView(null);
         WebSettings webSettings = webView.getSettings();
         ShadowWebSettings shadowWebSettings = Robolectric.shadowOf(webSettings);
-        
-        assertThat( webSettings, notNullValue());
-        assertThat( shadowWebSettings, notNullValue());
-   }
-    
+
+        assertThat(webSettings, notNullValue());
+        assertThat(shadowWebSettings, notNullValue());
+    }
+
     @Test
     public void shouldRecordWebViewClient() {
         WebView webView = new WebView(null);
         ShadowWebView shadowWebView = Robolectric.shadowOf(webView);
         WebViewClient webViewClient = new WebViewClient();
-     
-        assertThat(shadowWebView.getWebViewClient(), nullValue());        
-        webView.setWebViewClient( webViewClient );
-        assertThat(shadowWebView.getWebViewClient(), sameInstance(webViewClient));             
+
+        assertThat(shadowWebView.getWebViewClient(), nullValue());
+        webView.setWebViewClient(webViewClient);
+        assertThat(shadowWebView.getWebViewClient(), sameInstance(webViewClient));
     }
-    
+
     @Test
     public void shouldRecordJavascriptInteraces() {
         WebView webView = new WebView(null);
         ShadowWebView shadowWebView = Robolectric.shadowOf(webView);
 
-        String[] names = { "name1", "name2" };
-        for(String name : names) {
-        	Object obj = new Object();
-        	assertThat( shadowWebView.getJavascriptInterface(name), nullValue());
-        	webView.addJavascriptInterface(obj, name);
-        	assertThat( shadowWebView.getJavascriptInterface(name), sameInstance(obj));        	
+        String[] names = {"name1", "name2"};
+        for (String name : names) {
+            Object obj = new Object();
+            assertThat(shadowWebView.getJavascriptInterface(name), nullValue());
+            webView.addJavascriptInterface(obj, name);
+            assertThat(shadowWebView.getJavascriptInterface(name), sameInstance(obj));
         }
     }
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorServiceTest.java b/src/test/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorServiceTest.java
index 8e9bb72..2225406 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorServiceTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorServiceTest.java
@@ -9,7 +9,9 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(WithTestDefaultsRunner.class)
 public class RobolectricBackgroundExecutorServiceTest {
diff --git a/src/test/java/com/xtremelabs/robolectric/util/SchedulerTest.java b/src/test/java/com/xtremelabs/robolectric/util/SchedulerTest.java
index 446662a..89675cc 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/SchedulerTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/util/SchedulerTest.java
@@ -89,7 +89,7 @@
         scheduler.post(runnable);
 
         assertThat(runnable.wasRun, equalTo(false));
-        
+
         scheduler.reset();
         scheduler.post(runnable);
         assertThat(runnable.wasRun, equalTo(true));
@@ -108,7 +108,7 @@
 
         TestRunnable runnable2 = new TestRunnable();
         scheduler.post(runnable2);
-        
+
         assertThat(runnable1.wasRun, equalTo(false));
         assertThat(runnable2.wasRun, equalTo(true));
     }
diff --git a/src/test/java/com/xtremelabs/robolectric/util/TestOnClickListener.java b/src/test/java/com/xtremelabs/robolectric/util/TestOnClickListener.java
index 1245e64..a27064c 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/TestOnClickListener.java
+++ b/src/test/java/com/xtremelabs/robolectric/util/TestOnClickListener.java
@@ -4,6 +4,7 @@
 
 public class TestOnClickListener implements View.OnClickListener {
     public boolean clicked = false;
+
     @Override public void onClick(View v) {
         clicked = true;
     }