Skip to content

Commit 554d755

Browse files
JakeWhartonJakeWharton
committed
Checkstyle entire project.
1 parent 1f72c1a commit 554d755

29 files changed

+516
-518
lines changed

‎library/checkstyle.xml ‎checkstyle.xml

File renamed without changes.

‎library/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-checkstyle-plugin</artifactId>
4545
<configuration>
46-
<configLocation>${project.basedir}/checkstyle.xml</configLocation>
46+
<configLocation>../checkstyle.xml</configLocation>
4747
</configuration>
4848
<executions>
4949
<execution>

‎sample/pom.xml

+17-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<groupId>com.google.android</groupId>
2727
<artifactId>support-v4</artifactId>
2828
</dependency>
29-
29+
3030
<dependency>
3131
<groupId>com.viewpagerindicator</groupId>
3232
<artifactId>library</artifactId>
@@ -50,6 +50,22 @@
5050
<artifactId>android-maven-plugin</artifactId>
5151
<extensions>true</extensions>
5252
</plugin>
53+
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-checkstyle-plugin</artifactId>
57+
<configuration>
58+
<configLocation>../checkstyle.xml</configLocation>
59+
</configuration>
60+
<executions>
61+
<execution>
62+
<phase>verify</phase>
63+
<goals>
64+
<goal>checkstyle</goal>
65+
</goals>
66+
</execution>
67+
</executions>
68+
</plugin>
5369
</plugins>
5470
</build>
5571

‎sample/src/com/viewpagerindicator/sample/BaseSampleActivity.java

+37-38
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.Random;
44

55
import com.viewpagerindicator.PageIndicator;
6-
import com.viewpagerindicator.sample.R;
76

87
import android.support.v4.app.FragmentActivity;
98
import android.support.v4.view.ViewPager;
@@ -12,41 +11,41 @@
1211
import android.widget.Toast;
1312

1413
public abstract class BaseSampleActivity extends FragmentActivity {
15-
private static final Random RANDOM = new Random();
16-
17-
TestFragmentAdapter mAdapter;
18-
ViewPager mPager;
19-
PageIndicator mIndicator;
20-
21-
@Override
22-
public boolean onCreateOptionsMenu(Menu menu) {
23-
getMenuInflater().inflate(R.menu.menu, menu);
24-
return true;
25-
}
26-
27-
@Override
28-
public boolean onOptionsItemSelected(MenuItem item) {
29-
switch (item.getItemId()) {
30-
case R.id.random:
31-
final int page = RANDOM.nextInt(mAdapter.getCount());
32-
Toast.makeText(this, "Changing to page " + page, Toast.LENGTH_SHORT);
33-
mPager.setCurrentItem(page);
34-
return true;
35-
36-
case R.id.add_page:
37-
if (mAdapter.getCount() < 10) {
38-
mAdapter.setCount(mAdapter.getCount() + 1);
39-
mIndicator.notifyDataSetChanged();
40-
}
41-
return true;
42-
43-
case R.id.remove_page:
44-
if (mAdapter.getCount() > 1) {
45-
mAdapter.setCount(mAdapter.getCount() - 1);
46-
mIndicator.notifyDataSetChanged();
47-
}
48-
return true;
49-
}
50-
return super.onOptionsItemSelected(item);
51-
}
14+
private static final Random RANDOM = new Random();
15+
16+
TestFragmentAdapter mAdapter;
17+
ViewPager mPager;
18+
PageIndicator mIndicator;
19+
20+
@Override
21+
public boolean onCreateOptionsMenu(Menu menu) {
22+
getMenuInflater().inflate(R.menu.menu, menu);
23+
return true;
24+
}
25+
26+
@Override
27+
public boolean onOptionsItemSelected(MenuItem item) {
28+
switch (item.getItemId()) {
29+
case R.id.random:
30+
final int page = RANDOM.nextInt(mAdapter.getCount());
31+
Toast.makeText(this, "Changing to page " + page, Toast.LENGTH_SHORT);
32+
mPager.setCurrentItem(page);
33+
return true;
34+
35+
case R.id.add_page:
36+
if (mAdapter.getCount() < 10) {
37+
mAdapter.setCount(mAdapter.getCount() + 1);
38+
mIndicator.notifyDataSetChanged();
39+
}
40+
return true;
41+
42+
case R.id.remove_page:
43+
if (mAdapter.getCount() > 1) {
44+
mAdapter.setCount(mAdapter.getCount() - 1);
45+
mIndicator.notifyDataSetChanged();
46+
}
47+
return true;
48+
}
49+
return super.onOptionsItemSelected(item);
50+
}
5251
}

‎sample/src/com/viewpagerindicator/sample/ListSamples.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public class ListSamples extends ListActivity {
2121
@Override
2222
public void onCreate(Bundle savedInstanceState) {
2323
super.onCreate(savedInstanceState);
24-
24+
2525
Intent intent = getIntent();
2626
String path = intent.getStringExtra("com.jakewharton.android.viewpagerindicator.sample.Path");
27-
27+
2828
if (path == null) {
2929
path = "";
3030
}
@@ -49,16 +49,16 @@ protected List<Map<String, Object>> getData(String prefix) {
4949

5050
String[] prefixPath;
5151
String prefixWithSlash = prefix;
52-
52+
5353
if (prefix.equals("")) {
5454
prefixPath = null;
5555
} else {
5656
prefixPath = prefix.split("/");
5757
prefixWithSlash = prefix + "/";
5858
}
59-
59+
6060
int len = list.size();
61-
61+
6262
Map<String, Boolean> entries = new HashMap<String, Boolean>();
6363

6464
for (int i = 0; i < len; i++) {
@@ -67,9 +67,9 @@ protected List<Map<String, Object>> getData(String prefix) {
6767
String label = labelSeq != null
6868
? labelSeq.toString()
6969
: info.activityInfo.name;
70-
70+
7171
if (prefixWithSlash.length() == 0 || label.startsWith(prefixWithSlash)) {
72-
72+
7373
String[] labelPath = label.split("/");
7474

7575
String nextLabel = prefixPath == null ? labelPath[0] : labelPath[prefixPath.length];
@@ -87,12 +87,12 @@ protected List<Map<String, Object>> getData(String prefix) {
8787
}
8888
}
8989

90-
Collections.sort(myData, sDisplayNameComparator);
91-
90+
Collections.sort(myData, NAME_COMPARATOR);
91+
9292
return myData;
9393
}
9494

95-
private final static Comparator<Map<String, Object>> sDisplayNameComparator =
95+
private final static Comparator<Map<String, Object>> NAME_COMPARATOR =
9696
new Comparator<Map<String, Object>>() {
9797
private final Collator collator = Collator.getInstance();
9898

@@ -106,7 +106,7 @@ protected Intent activityIntent(String pkg, String componentName) {
106106
result.setClassName(pkg, componentName);
107107
return result;
108108
}
109-
109+
110110
protected Intent browseIntent(String path) {
111111
Intent result = new Intent();
112112
result.setClass(this, ListSamples.class);

‎sample/src/com/viewpagerindicator/sample/SampleCirclesDefault.java

+13-14
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
import android.os.Bundle;
44
import android.support.v4.view.ViewPager;
55
import com.viewpagerindicator.CirclePageIndicator;
6-
import com.viewpagerindicator.sample.R;
76

87
public class SampleCirclesDefault extends BaseSampleActivity {
9-
@Override
10-
protected void onCreate(Bundle savedInstanceState) {
11-
super.onCreate(savedInstanceState);
12-
setContentView(R.layout.simple_circles);
13-
14-
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
15-
16-
mPager = (ViewPager)findViewById(R.id.pager);
17-
mPager.setAdapter(mAdapter);
18-
19-
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
20-
mIndicator.setViewPager(mPager);
21-
}
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.simple_circles);
12+
13+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
14+
15+
mPager = (ViewPager)findViewById(R.id.pager);
16+
mPager.setAdapter(mAdapter);
17+
18+
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
19+
mIndicator.setViewPager(mPager);
20+
}
2221
}

‎sample/src/com/viewpagerindicator/sample/SampleCirclesInitialPage.java

+16-17
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@
33
import android.os.Bundle;
44
import android.support.v4.view.ViewPager;
55
import com.viewpagerindicator.CirclePageIndicator;
6-
import com.viewpagerindicator.sample.R;
76

87
public class SampleCirclesInitialPage extends BaseSampleActivity {
9-
@Override
10-
protected void onCreate(Bundle savedInstanceState) {
11-
super.onCreate(savedInstanceState);
12-
setContentView(R.layout.simple_circles);
13-
14-
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
15-
16-
mPager = (ViewPager)findViewById(R.id.pager);
17-
mPager.setAdapter(mAdapter);
18-
19-
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
20-
mIndicator.setViewPager(mPager);
21-
mIndicator.setCurrentItem(mAdapter.getCount() - 1);
22-
23-
//You can also do: indicator.setViewPager(pager, initialPage);
24-
}
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.simple_circles);
12+
13+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
14+
15+
mPager = (ViewPager)findViewById(R.id.pager);
16+
mPager.setAdapter(mAdapter);
17+
18+
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
19+
mIndicator.setViewPager(mPager);
20+
mIndicator.setCurrentItem(mAdapter.getCount() - 1);
21+
22+
//You can also do: indicator.setViewPager(pager, initialPage);
23+
}
2524
}

‎sample/src/com/viewpagerindicator/sample/SampleCirclesSnap.java

+15-16
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@
33
import android.os.Bundle;
44
import android.support.v4.view.ViewPager;
55
import com.viewpagerindicator.CirclePageIndicator;
6-
import com.viewpagerindicator.sample.R;
76

87
public class SampleCirclesSnap extends BaseSampleActivity {
9-
@Override
10-
protected void onCreate(Bundle savedInstanceState) {
11-
super.onCreate(savedInstanceState);
12-
setContentView(R.layout.simple_circles);
13-
14-
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
15-
16-
mPager = (ViewPager)findViewById(R.id.pager);
17-
mPager.setAdapter(mAdapter);
18-
19-
CirclePageIndicator indicator = (CirclePageIndicator)findViewById(R.id.indicator);
20-
mIndicator = indicator;
21-
indicator.setViewPager(mPager);
22-
indicator.setSnap(true);
23-
}
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.simple_circles);
12+
13+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
14+
15+
mPager = (ViewPager)findViewById(R.id.pager);
16+
mPager.setAdapter(mAdapter);
17+
18+
CirclePageIndicator indicator = (CirclePageIndicator)findViewById(R.id.indicator);
19+
mIndicator = indicator;
20+
indicator.setViewPager(mPager);
21+
indicator.setSnap(true);
22+
}
2423
}

‎sample/src/com/viewpagerindicator/sample/SampleCirclesStyledLayout.java

+13-14
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
import android.os.Bundle;
44
import android.support.v4.view.ViewPager;
55
import com.viewpagerindicator.CirclePageIndicator;
6-
import com.viewpagerindicator.sample.R;
76

87
public class SampleCirclesStyledLayout extends BaseSampleActivity {
9-
@Override
10-
protected void onCreate(Bundle savedInstanceState) {
11-
super.onCreate(savedInstanceState);
12-
setContentView(R.layout.themed_circles);
13-
14-
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
15-
16-
mPager = (ViewPager)findViewById(R.id.pager);
17-
mPager.setAdapter(mAdapter);
18-
19-
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
20-
mIndicator.setViewPager(mPager);
21-
}
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.themed_circles);
12+
13+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
14+
15+
mPager = (ViewPager)findViewById(R.id.pager);
16+
mPager.setAdapter(mAdapter);
17+
18+
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
19+
mIndicator.setViewPager(mPager);
20+
}
2221
}

‎sample/src/com/viewpagerindicator/sample/SampleCirclesStyledMethods.java

+21-22
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,28 @@
33
import android.os.Bundle;
44
import android.support.v4.view.ViewPager;
55
import com.viewpagerindicator.CirclePageIndicator;
6-
import com.viewpagerindicator.sample.R;
76

87
public class SampleCirclesStyledMethods extends BaseSampleActivity {
9-
@Override
10-
protected void onCreate(Bundle savedInstanceState) {
11-
super.onCreate(savedInstanceState);
12-
setContentView(R.layout.simple_circles);
13-
14-
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
15-
16-
mPager = (ViewPager)findViewById(R.id.pager);
17-
mPager.setAdapter(mAdapter);
18-
19-
CirclePageIndicator indicator = (CirclePageIndicator)findViewById(R.id.indicator);
20-
mIndicator = indicator;
21-
indicator.setViewPager(mPager);
22-
23-
final float density = getResources().getDisplayMetrics().density;
24-
indicator.setBackgroundColor(0xFFCCCCCC);
25-
indicator.setRadius(10 * density);
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.simple_circles);
12+
13+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
14+
15+
mPager = (ViewPager)findViewById(R.id.pager);
16+
mPager.setAdapter(mAdapter);
17+
18+
CirclePageIndicator indicator = (CirclePageIndicator)findViewById(R.id.indicator);
19+
mIndicator = indicator;
20+
indicator.setViewPager(mPager);
21+
22+
final float density = getResources().getDisplayMetrics().density;
23+
indicator.setBackgroundColor(0xFFCCCCCC);
24+
indicator.setRadius(10 * density);
2625
indicator.setPageColor(0x880000FF);
27-
indicator.setFillColor(0xFF888888);
28-
indicator.setStrokeColor(0xFF000000);
29-
indicator.setStrokeWidth(2 * density);
30-
}
26+
indicator.setFillColor(0xFF888888);
27+
indicator.setStrokeColor(0xFF000000);
28+
indicator.setStrokeWidth(2 * density);
29+
}
3130
}

0 commit comments

Comments
 (0)