Fix build breakage and indentation issues introduced by zhihongx

4 files changed, 102 insertions, 104 deletions

diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java
index c851ec2f6..3df65a7d6 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java
@@ -65,77 +65,77 @@ public class ShadowPendingIntent {
 
     @Implementation
     public static void writePendingIntentOrNullToParcel(PendingIntent sender, Parcel out) {
-    if (sender == null) {
-        out.writeInt(0);
-        return;
-    }
-    sender.writeToParcel(out, 0);
+        if (sender == null) {
+            out.writeInt(0);
+            return;
+        }
+        sender.writeToParcel(out, 0);
     }
 
     @Implementation
     public static PendingIntent readPendingIntentOrNullFromParcel(Parcel in) {
-    if (in.readInt() == 0) {
-        return null;
-    }
-    boolean isActivity = readBooleanFromParcel(in);
-    boolean isBroadcast = readBooleanFromParcel(in);
-    boolean isService = readBooleanFromParcel(in);
-    int requestCode = in.readInt();
-    Intent intent = null;
-    if (in.readInt() != 0) {
-        intent = new Intent();
-        intent.readFromParcel(in);
-    }
-    return create(null, intent, isActivity, isBroadcast, isService, requestCode);
+        if (in.readInt() == 0) {
+            return null;
+        }
+        boolean isActivity = readBooleanFromParcel(in);
+        boolean isBroadcast = readBooleanFromParcel(in);
+        boolean isService = readBooleanFromParcel(in);
+        int requestCode = in.readInt();
+        Intent intent = null;
+        if (in.readInt() != 0) {
+            intent = new Intent();
+            intent.readFromParcel(in);
+        }
+        return create(null, intent, isActivity, isBroadcast, isService, requestCode);
     }
 
     @Implementation
     public void writeToParcel(Parcel out, int flags) {
-    out.writeInt(1);
-    writeBooleanToParcel(isActivityIntent, out);
-    writeBooleanToParcel(isBroadcastIntent, out);
-    writeBooleanToParcel(isServiceIntent, out);
-    out.writeInt(requestCode);
-    if (savedIntent != null) {
         out.writeInt(1);
-        savedIntent.writeToParcel(out, flags);
-    } else {
-        out.writeInt(0);
-      }
+        writeBooleanToParcel(isActivityIntent, out);
+        writeBooleanToParcel(isBroadcastIntent, out);
+        writeBooleanToParcel(isServiceIntent, out);
+        out.writeInt(requestCode);
+        if (savedIntent != null) {
+            out.writeInt(1);
+            savedIntent.writeToParcel(out, flags);
+        } else {
+            out.writeInt(0);
+        }
     }
 
     @Override
     @Implementation
     public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + (isActivityIntent ? 1231 : 1237);
-      result = prime * result + (isBroadcastIntent ? 1231 : 1237);
-      result = prime * result + (isServiceIntent ? 1231 : 1237);
-      result = prime * result + requestCode;
-      result = prime * result + ((savedIntent == null) ? 0 : savedIntent.hashCode());
-      return result;
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (isActivityIntent ? 1231 : 1237);
+        result = prime * result + (isBroadcastIntent ? 1231 : 1237);
+        result = prime * result + (isServiceIntent ? 1231 : 1237);
+        result = prime * result + requestCode;
+        result = prime * result + ((savedIntent == null) ? 0 : savedIntent.hashCode());
+        return result;
     }
 
     @Override
     @Implementation
     public boolean equals(Object obj) {
-    if (obj == null) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj instanceof PendingIntent) {
+            return shadowEquals(Robolectric.shadowOf((PendingIntent) obj));
+        }
         return false;
     }
-    if (obj instanceof PendingIntent) {
-        return shadowEquals(Robolectric.shadowOf((PendingIntent) obj));
-    }
-    return false;
-    }
 
     private boolean shadowEquals(ShadowPendingIntent other) {
-    if (isActivityIntent != other.isActivityIntent) {
-        return false;
-    }
-    if (isBroadcastIntent != other.isBroadcastIntent) {
-        return false;
-    }
+        if (isActivityIntent != other.isActivityIntent) {
+            return false;
+        }
+        if (isBroadcastIntent != other.isBroadcastIntent) {
+            return false;
+        }
         if (isServiceIntent != other.isServiceIntent) {
             return false;
         }
@@ -178,7 +178,7 @@ public class ShadowPendingIntent {
 
     private static PendingIntent create(Context context, Intent intent, boolean isActivity, boolean isBroadcast, boolean isService, int requestCode) {
         PendingIntent pendingIntent = Robolectric.newInstanceOf(PendingIntent.class);
-        ShadowPendingIntent shadowPendingIntent = (ShadowPendingIntent) Robolectric.shadowOf(pendingIntent);
+        ShadowPendingIntent shadowPendingIntent = Robolectric.shadowOf(pendingIntent);
         shadowPendingIntent.savedIntent = intent;
         shadowPendingIntent.isActivityIntent = isActivity;
         shadowPendingIntent.isBroadcastIntent = isBroadcast;
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java
index 88b3eb437..5bd888b99 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java
@@ -402,25 +402,25 @@ public class IntentTest {
 
     @Test
     public void testParcelIo_explicitIntent() {
-    Intent intent = new Intent(new Activity(), getClass());
-    putTestExtras(intent);
-    verifyIntentReadIsWhatWasWrittenToParcel(intent);
+        Intent intent = new Intent(new Activity(), getClass());
+        putTestExtras(intent);
+        verifyIntentReadIsWhatWasWrittenToParcel(intent);
     }
 
     @Test
     public void testParcelIo_actionUri() {
-    Intent intent = new Intent("action");
-    shadowOf(intent).setURI("http://foo");
-    putTestExtras(intent);
-    verifyIntentReadIsWhatWasWrittenToParcel(intent);
+        Intent intent = new Intent("action");
+        shadowOf(intent).setURI("http://foo");
+        putTestExtras(intent);
+        verifyIntentReadIsWhatWasWrittenToParcel(intent);
     }
 
     @Test
     public void testParcelIo_actionTypeCategory() {
-    Intent intent = new Intent("action");
-    intent.setType("type");
-    intent.addCategory("category");
-    verifyIntentReadIsWhatWasWrittenToParcel(intent);
+        Intent intent = new Intent("action");
+        intent.setType("type");
+        intent.addCategory("category");
+        verifyIntentReadIsWhatWasWrittenToParcel(intent);
     }
 
     private void verifyIntentReadIsWhatWasWrittenToParcel(Intent expected) {
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java
index ea781e2ab..20cdaa0ee 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java
@@ -1,10 +1,19 @@
 package com.xtremelabs.robolectric.shadows;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Parcel;
+
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -13,17 +22,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 @RunWith(WithTestDefaultsRunner.class)
 public class ParcelTest {
 
@@ -69,8 +67,8 @@ public class ParcelTest {
 	public void testWriteNullString() {
 		parcel.writeString( null );
 		assertThat( parcel.readString(), nullValue() );
-		assertThat( shadowParcel.getIndex(), equalTo( 0 ) );
-		assertThat( shadowParcel.getParcelData().size(), equalTo( 0 ) );
+		assertThat( shadowParcel.getIndex(), equalTo( 1 ) );
+		assertThat( shadowParcel.getParcelData().size(), equalTo( 1 ) );
 	}
 
     @Test
@@ -288,19 +286,19 @@ public class ParcelTest {
 
     @Test
     public void testReadWriteStringList() {
-      final List<String> strings = Arrays.asList( "foo", "bar" );
-      parcel.writeStringList(strings);
-      List<String> extractedStrings = new ArrayList<String>();
-      parcel.readStringList(extractedStrings);
-      assertEquals(strings, extractedStrings);
+        final List<String> strings = Arrays.asList( "foo", "bar" );
+        parcel.writeStringList(strings);
+        List<String> extractedStrings = new ArrayList<String>();
+        parcel.readStringList(extractedStrings);
+        assertEquals(strings, extractedStrings);
     }
 
     @Test
     public void testWriteCreateStringArrayList() {
-      final List<String> strings = Arrays.asList( "foo", "bar" );
-      parcel.writeStringList(strings);
-      List<String> extractedStrings = parcel.createStringArrayList();
-      assertEquals(strings, extractedStrings);
+        final List<String> strings = Arrays.asList( "foo", "bar" );
+        parcel.writeStringList(strings);
+        List<String> extractedStrings = parcel.createStringArrayList();
+        assertEquals(strings, extractedStrings);
     }
 
     @Test
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java
index add7b99f5..ee8091a6d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java
@@ -86,24 +86,24 @@ public class PendingIntentTest {
 
     @Test
     public void testEquals() throws Exception {
-    PendingIntent pi1 = PendingIntent.getActivity(Robolectric.application, 99,
-        new Intent("action"), 100);
-    PendingIntent pi2 = PendingIntent.getActivity(null, 99, new Intent("action"), 100);
-    PendingIntent pi3 = PendingIntent.getService(Robolectric.application, 99,
-        new Intent("action"), 100);
-    assertThat(pi1, equalTo(pi2));
-    assertThat(pi1, not(equalTo(pi3)));
+        PendingIntent pi1 = PendingIntent.getActivity(Robolectric.application, 99,
+            new Intent("action"), 100);
+        PendingIntent pi2 = PendingIntent.getActivity(null, 99, new Intent("action"), 100);
+        PendingIntent pi3 = PendingIntent.getService(Robolectric.application, 99,
+            new Intent("action"), 100);
+        assertThat(pi1, equalTo(pi2));
+        assertThat(pi1, not(equalTo(pi3)));
     }
 
     @Test
     public void parcelIo_nullPendingIntent() {
-      verifyPendingIntentReadIsWhatWasWrittenToParcel(null);
+        verifyPendingIntentReadIsWhatWasWrittenToParcel(null);
     }
 
     @Test
     public void parcelIo_shouldGetBackBroadcastIntentWrittenToParcelWithNullIntent() {
-      verifyPendingIntentReadIsWhatWasWrittenToParcel(PendingIntent
-          .getBroadcast(Robolectric.application, 99, null, 100));
+        verifyPendingIntentReadIsWhatWasWrittenToParcel(PendingIntent
+            .getBroadcast(Robolectric.application, 99, null, 100));
     }
 
     @Test
@@ -114,24 +114,24 @@ public class PendingIntentTest {
 
     @Test
     public void parcelIo_shouldGetBackActivityIntentWrittenToParcel() {
-      verifyPendingIntentReadIsWhatWasWrittenToParcel(PendingIntent
-          .getActivity(Robolectric.application, 99, new Intent(), 100));
+        verifyPendingIntentReadIsWhatWasWrittenToParcel(PendingIntent
+            .getActivity(Robolectric.application, 99, new Intent(), 100));
     }
 
     @Test
     public void parcelIo_shouldGetBackServiceIntentWrittenToParcel() {
-      verifyPendingIntentReadIsWhatWasWrittenToParcel(PendingIntent
-          .getService(Robolectric.application, 99, new Intent(), 100));
+        verifyPendingIntentReadIsWhatWasWrittenToParcel(PendingIntent
+            .getService(Robolectric.application, 99, new Intent(), 100));
     }
 
     private void verifyPendingIntentReadIsWhatWasWrittenToParcel(PendingIntent expected) {
-      Parcel parcel = Parcel.obtain();
-      PendingIntent.writePendingIntentOrNullToParcel(expected, parcel);
-      PendingIntent actual = PendingIntent.readPendingIntentOrNullFromParcel(parcel);
-      if (expected == null) {
-      assertNull(actual);
-      } else {
-      assertThat(expected, equalTo(actual));
-      }
+        Parcel parcel = Parcel.obtain();
+        PendingIntent.writePendingIntentOrNullToParcel(expected, parcel);
+        PendingIntent actual = PendingIntent.readPendingIntentOrNullFromParcel(parcel);
+        if (expected == null) {
+            assertNull(actual);
+        } else {
+            assertThat(expected, equalTo(actual));
+        }
     }
 }