From 2b0e6dade11f8c8a6a5c9f6f60518fa95e5f0b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 8 Oct 2015 18:59:41 +0200 Subject: [PATCH] checkstyle: enable ModifierOrder and apply it --- F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java | 6 +++--- F-Droid/src/org/fdroid/fdroid/installer/Installer.java | 2 +- F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java | 6 +++--- .../fdroid/fdroid/localrepo/peers/BluetoothFinder.java | 2 +- .../org/fdroid/fdroid/localrepo/type/BluetoothSwap.java | 2 +- .../src/org/fdroid/fdroid/localrepo/type/SwapType.java | 8 ++++---- .../fdroid/privileged/views/AppSecurityPermissions.java | 3 ++- .../src/org/fdroid/fdroid/receiver/PackageReceiver.java | 4 ++-- F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java | 6 +++--- .../fdroid/fdroid/views/fragments/AppListFragment.java | 2 +- .../src/org/fdroid/fdroid/views/swap/SwapConnecting.java | 2 +- config/checkstyle/checkstyle.xml | 2 +- 12 files changed, 23 insertions(+), 22 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java b/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java index a3d3da1bd..4d243f75d 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java @@ -27,9 +27,9 @@ public abstract class FDroidProvider extends ContentProvider { private boolean isApplyingBatch = false; - abstract protected String getTableName(); + protected abstract String getTableName(); - abstract protected String getProviderName(); + protected abstract String getProviderName(); /** * Should always be the same as the provider:name in the AndroidManifest @@ -97,7 +97,7 @@ public abstract class FDroidProvider extends ContentProvider { return "vnd.android.cursor." + type + "/vnd." + AUTHORITY + "." + getProviderName(); } - abstract protected UriMatcher getMatcher(); + protected abstract UriMatcher getMatcher(); protected String generateQuestionMarksForInClause(int num) { StringBuilder sb = new StringBuilder(num * 2); diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java index 554379620..6ddb54afa 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java @@ -36,7 +36,7 @@ import java.util.List; * Abstract Installer class. Also provides static methods to automatically * instantiate a working Installer based on F-Droids granted permissions. */ -abstract public class Installer { +public abstract class Installer { protected final Context mContext; protected final PackageManager mPm; protected final InstallerCallback mCallback; diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java index d33330976..5c19ebf7f 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java @@ -139,7 +139,7 @@ public class SwapService extends Service { */ public static final int STEP_INITIAL_LOADING = 9; - private @SwapStep int step = STEP_INTRO; + @SwapStep private int step = STEP_INTRO; /** * Current screen that the swap process is up to. @@ -155,7 +155,7 @@ public class SwapService extends Service { return this; } - public @NonNull Set getAppsToSwap() { + @NonNull public Set getAppsToSwap() { return appsToSwap; } @@ -490,7 +490,7 @@ public class SwapService extends Service { private BonjourFinder bonjourFinder; private BluetoothFinder bluetoothFinder; - private final static int TIMEOUT = 900000; // 15 mins + private static final int TIMEOUT = 900000; // 15 mins /** * Used to automatically turn of swapping after a defined amount of time (15 mins). diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java index 6dc207f7d..cfa242ae4 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java @@ -15,7 +15,7 @@ public class BluetoothFinder extends PeerFinder { private static final String TAG = "BluetoothFinder"; - public final static int DISCOVERABLE_TIMEOUT = 3600; + public static final int DISCOVERABLE_TIMEOUT = 3600; private final BluetoothAdapter adapter; diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java index cff993e3d..df1af5b17 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java @@ -16,7 +16,7 @@ import org.fdroid.fdroid.net.bluetooth.BluetoothServer; public class BluetoothSwap extends SwapType { private static final String TAG = "BluetoothSwap"; - public final static String BLUETOOTH_NAME_TAG = "FDroid:"; + public static final String BLUETOOTH_NAME_TAG = "FDroid:"; private static BluetoothSwap mInstance = null; diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java index 761accb24..f11101729 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java @@ -17,7 +17,7 @@ import org.fdroid.fdroid.localrepo.SwapService; */ public abstract class SwapType { - private final static String TAG = "SwapType"; + private static final String TAG = "SwapType"; private boolean isConnected; @@ -28,11 +28,11 @@ public abstract class SwapType { this.context = context; } - abstract public void start(); + public abstract void start(); - abstract public void stop(); + public abstract void stop(); - abstract protected String getBroadcastAction(); + protected abstract String getBroadcastAction(); public boolean isDiscoverable() { return isConnected(); diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index e45dc46a1..6bee9ed23 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java @@ -63,11 +63,12 @@ import java.util.Set; */ public class AppSecurityPermissions { + private static final String TAG = "AppSecurityPermissions"; + public static final int WHICH_PERSONAL = 1<<0; public static final int WHICH_DEVICE = 1<<1; public static final int WHICH_NEW = 1<<2; - private final static String TAG = "AppSecurityPermissions"; private final Context mContext; private final LayoutInflater mInflater; private final PackageManager mPm; diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java index fc1d65213..acbd96267 100644 --- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java +++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java @@ -32,8 +32,8 @@ abstract class PackageReceiver extends BroadcastReceiver { private static final String TAG = "PackageReceiver"; - abstract protected boolean toDiscard(Intent intent); - abstract protected void handle(Context context, String appId); + protected abstract boolean toDiscard(Intent intent); + protected abstract void handle(Context context, String appId); protected PackageInfo getPackageInfo(Context context, String appId) { for (PackageInfo info : context.getPackageManager().getInstalledPackages(0)) { diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java index 77d553d64..f8fd34201 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java +++ b/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java @@ -18,7 +18,7 @@ import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.App; -abstract public class AppListAdapter extends CursorAdapter { +public abstract class AppListAdapter extends CursorAdapter { private Context mContext; private LayoutInflater mInflater; @@ -52,9 +52,9 @@ abstract public class AppListAdapter extends CursorAdapter { } - abstract protected boolean showStatusUpdate(); + protected abstract boolean showStatusUpdate(); - abstract protected boolean showStatusInstalled(); + protected abstract boolean showStatusInstalled(); private static class ViewHolder { TextView name; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java index 9e3d235f5..90f0cb776 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java @@ -24,7 +24,7 @@ import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.views.AppListAdapter; -abstract public class AppListFragment extends ThemeableListFragment implements +public abstract class AppListFragment extends ThemeableListFragment implements AdapterView.OnItemClickListener, Preferences.ChangeListener, LoaderManager.LoaderCallbacks { diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java index 81c508e19..56279bf4a 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java @@ -25,7 +25,7 @@ import org.fdroid.fdroid.localrepo.SwapService; public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity.InnerView { @SuppressWarnings("unused") - private final static String TAG = "SwapConnecting"; + private static final String TAG = "SwapConnecting"; public SwapConnecting(Context context) { super(context); diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 96c6845e2..34aba2ddb 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -45,7 +45,7 @@ - +