Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkstyle: Finally add proper indentation checks

Browse Source 
Somewhat painful conversion, but should go much smoother from here
onward.
This commit is contained in:
Daniel Martí 2015-12-29 22:00:23 +01:00
parent dd4420965d
commit 9efe173380
22 changed files with 725 additions and 716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
F-Droid/src/org/fdroid/fdroid/compat/TabManager.java
View File

@ -67,7 +67,8 @@ public class TabManager {
@Override @Override
public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) { public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
} }
})); })
);
} }
} }

6
F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
View File

@ -242,9 +242,9 @@ public class DBHelper extends SQLiteOpenHelper {
); );
} }
private void insertRepo( private void insertRepo(SQLiteDatabase db, String name, String address,
SQLiteDatabase db, String name, String address, String description, String description, String pubKey, int version, int inUse,
String pubKey, int version, int inUse, int priority) { int priority) {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(RepoProvider.DataColumns.ADDRESS, address); values.put(RepoProvider.DataColumns.ADDRESS, address);

12
F-Droid/test/src/org/fdroid/fdroid/TestUtils.java
View File

@ -150,9 +150,9 @@ public class TestUtils {
* {@link org.fdroid.fdroid.receiver.PackageAddedReceiver}. This will in turn update the * {@link org.fdroid.fdroid.receiver.PackageAddedReceiver}. This will in turn update the
* "installed apps" table in the database. * "installed apps" table in the database.
*/ */
public static void installAndBroadcast( public static void installAndBroadcast(MockContextSwappableComponents context,
MockContextSwappableComponents context, MockInstallablePackageManager pm, MockInstallablePackageManager pm, String appId,
String appId, int versionCode, String versionName) { int versionCode, String versionName) {
context.setPackageManager(pm); context.setPackageManager(pm);
pm.install(appId, versionCode, versionName); pm.install(appId, versionCode, versionName);
@ -165,9 +165,9 @@ public class TestUtils {
/** /**
* @see org.fdroid.fdroid.TestUtils#installAndBroadcast(mock.MockContextSwappableComponents, mock.MockInstallablePackageManager, String, int, String) * @see org.fdroid.fdroid.TestUtils#installAndBroadcast(mock.MockContextSwappableComponents, mock.MockInstallablePackageManager, String, int, String)
*/ */
public static void upgradeAndBroadcast( public static void upgradeAndBroadcast(MockContextSwappableComponents context,
MockContextSwappableComponents context, MockInstallablePackageManager pm, MockInstallablePackageManager pm, String appId,
String appId, int versionCode, String versionName) { int versionCode, String versionName) {
/* /*
removeAndBroadcast(context, pm, appId); removeAndBroadcast(context, pm, appId);
installAndBroadcast(context, pm, appId, versionCode, versionName); installAndBroadcast(context, pm, appId, versionCode, versionName);

8
config/checkstyle/checkstyle.xml
View File

@ -41,6 +41,14 @@
<!--<module name="MethodLength" />--> <!--<module name="MethodLength" />-->
<!--<module name="ParameterNumber" />--> <!--<module name="ParameterNumber" />-->
<module name="Indentation">
<property name="basicOffset" value="4"/>
<property name="braceAdjustment" value="0"/>
<property name="caseIndent" value="4"/>
<property name="throwsIndent" value="8"/>
<property name="lineWrappingIndentation" value="8"/>
<property name="arrayInitIndent" value="4"/>
</module>
<module name="EmptyLineSeparator"> <module name="EmptyLineSeparator">
<property name="allowNoEmptyLineBetweenFields" value="true" /> <property name="allowNoEmptyLineBetweenFields" value="true" />
<property name="allowMultipleEmptyLines" value="false" /> <property name="allowMultipleEmptyLines" value="false" />