Checkstyle fixes, version bumps, and pom fixes. Oh, my!

JakeWharton · Apr 14, 2013 · a41c1c3 · a41c1c3
1 parent bbcbb1e
commit a41c1c3
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 131 deletions.
diff --git a/actionbarsherlock-samples/known-bugs/project.properties b/actionbarsherlock-samples/known-bugs/project.properties
@@ -16,3 +16,4 @@ android.library.reference.1=../../actionbarsherlock
 
 
 
+
diff --git a/...onbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue882.java b/...onbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue882.java
@@ -21,111 +21,111 @@
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 public class Issue882 extends SherlockFragmentActivity implements
-		OnPageChangeListener, TabListener {
-	private static final int COUNT = 20;
-
-	ViewPager mPager;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.issue882);
-
-		mPager = (ViewPager) findViewById(R.id.pager);
-		mPager.setAdapter(new MyAdapter(getSupportFragmentManager()));
-		mPager.setOnPageChangeListener(this);
-
-		ActionBar ab = getSupportActionBar();
-		ab.setNavigationMode(NAVIGATION_MODE_TABS);
-		for (int i = 1; i <= COUNT; i++) {
-			ab.addTab(ab.newTab().setText("Fragment " + i).setTabListener(this));
-		}
-	}
-
-	@Override
-	public void onPageScrolled(int position, float positionOffset,
-			int positionOffsetPixels) {
-	}
-
-	@Override
-	public void onPageSelected(int position) {
-		getSupportActionBar().setSelectedNavigationItem(position);
-	}
-
-	@Override
-	public void onPageScrollStateChanged(int state) {
-	}
-
-	@Override
-	public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
-		mPager.setCurrentItem(tab.getPosition());
-	}
-
-	@Override
-	public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
-	}
-
-	@Override
-	public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
-	}
-
-	public static class MyAdapter extends FragmentStatePagerAdapter {
-		public MyAdapter(FragmentManager fm) {
-			super(fm);
-		}
-
-		@Override
-		public int getCount() {
-			return COUNT;
-		}
-
-		@Override
-		public Fragment getItem(int position) {
-			return BoringFragment.newInstance(position + 1);
-		}
-	}
-
-	public static class BoringFragment extends SherlockFragment {
-		int mNum;
-
-		/**
-		 * Create a new instance of CountingFragment, providing "num" as an
-		 * argument.
-		 */
-		static BoringFragment newInstance(int num) {
-			BoringFragment f = new BoringFragment();
-
-			// Supply num input as an argument.
-			Bundle args = new Bundle();
-			args.putInt("num", num);
-			f.setArguments(args);
-
-			return f;
-		}
-
-		/**
-		 * When creating, retrieve this instance's number from its arguments.
-		 */
-		@Override
-		public void onCreate(Bundle savedInstanceState) {
-			super.onCreate(savedInstanceState);
-			mNum = getArguments() != null ? getArguments().getInt("num") : 1;
-		}
-
-		/**
-		 * The Fragment's UI is just a simple text view showing its instance
-		 * number.
-		 */
-		@Override
-		public View onCreateView(LayoutInflater inflater, ViewGroup container,
-				Bundle savedInstanceState) {
-			TextView tv = new TextView(getActivity());
-			tv.setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT,
-					MATCH_PARENT));
-			tv.setText("Fragment #" + mNum);
-			tv.setGravity(CENTER);
-			return tv;
-		}
-
-	}
+        OnPageChangeListener, TabListener {
+    private static final int COUNT = 20;
+
+    ViewPager mPager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.issue882);
+
+        mPager = (ViewPager) findViewById(R.id.pager);
+        mPager.setAdapter(new MyAdapter(getSupportFragmentManager()));
+        mPager.setOnPageChangeListener(this);
+
+        ActionBar ab = getSupportActionBar();
+        ab.setNavigationMode(NAVIGATION_MODE_TABS);
+        for (int i = 1; i <= COUNT; i++) {
+            ab.addTab(ab.newTab().setText("Fragment " + i).setTabListener(this));
+        }
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset,
+            int positionOffsetPixels) {
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        getSupportActionBar().setSelectedNavigationItem(position);
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+    }
+
+    @Override
+    public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
+        mPager.setCurrentItem(tab.getPosition());
+    }
+
+    @Override
+    public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+
+    public static class MyAdapter extends FragmentStatePagerAdapter {
+        public MyAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public int getCount() {
+            return COUNT;
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return BoringFragment.newInstance(position + 1);
+        }
+    }
+
+    public static class BoringFragment extends SherlockFragment {
+        int mNum;
+
+        /**
+         * Create a new instance of CountingFragment, providing "num" as an
+         * argument.
+         */
+        static BoringFragment newInstance(int num) {
+            BoringFragment f = new BoringFragment();
+
+            // Supply num input as an argument.
+            Bundle args = new Bundle();
+            args.putInt("num", num);
+            f.setArguments(args);
+
+            return f;
+        }
+
+        /**
+         * When creating, retrieve this instance's number from its arguments.
+         */
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mNum = getArguments() != null ? getArguments().getInt("num") : 1;
+        }
+
+        /**
+         * The Fragment's UI is just a simple text view showing its instance
+         * number.
+         */
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            TextView tv = new TextView(getActivity());
+            tv.setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT,
+                    MATCH_PARENT));
+            tv.setText("Fragment #" + mNum);
+            tv.setGravity(CENTER);
+            return tv;
+        }
+
+    }
 }
diff --git a/actionbarsherlock-samples/styled/project.properties b/actionbarsherlock-samples/styled/project.properties
@@ -15,3 +15,4 @@ android.library.reference.1=../../actionbarsherlock
 
 
 
+
diff --git a/actionbarsherlock/pom.xml b/actionbarsherlock/pom.xml
@@ -64,7 +64,6 @@
       <plugin>
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>maven-replacer-plugin</artifactId>
-        <version>1.4.0</version>
         <executions>
           <execution>
             <phase>process-sources</phase>

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -84,7 +84,6 @@
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <!--module name="AvoidInlineConditionals"/-->
-        <module name="DoubleCheckedLocking"/>
         <!--module name="EmptyStatement"/-->
         <!--module name="EqualsHashCode"/-->
         <!--module name="HiddenField"/-->

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
     <!-- Compilation dependencies -->
     <android.version>4.0.1.2</android.version>
     <android-support.version>r7</android-support.version>
-    <fest.android.version>1.0.0</fest.android.version>
+    <fest.android.version>1.0.4</fest.android.version>
 
     <!-- Sample dependencies -->
     <nineoldandroids.version>2.4.0</nineoldandroids.version>
@@ -150,7 +150,7 @@
         <plugin>
           <groupId>com.jayway.maven.plugins.android.generation2</groupId>
           <artifactId>android-maven-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>3.5.3</version>
           <configuration>
             <nativeLibrariesDirectory>ignored</nativeLibrariesDirectory>
             <sdk>
@@ -191,6 +191,12 @@
             <skip>true</skip>
           </configuration>
         </plugin>
+
+        <plugin>
+          <groupId>com.google.code.maven-replacer-plugin</groupId>
+          <artifactId>maven-replacer-plugin</artifactId>
+          <version>1.4.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -207,7 +213,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
+        <version>2.10</version>
         <configuration>
           <failsOnError>true</failsOnError>
           <consoleOutput>true</consoleOutput>
@@ -222,25 +228,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>com.github.github</groupId>
-        <artifactId>site-maven-plugin</artifactId>
-        <version>0.7</version>
-        <inherited>false</inherited>
-        <executions>
-          <execution>
-            <phase>site</phase>
-            <goals>
-              <goal>site</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <message>Creating site for ${project.version}.</message>
-          <outputDirectory>website</outputDirectory>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ android.library.reference.1=../../actionbarsherlock
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,4 @@ android.library.reference.1=../../actionbarsherlock