From 8a3001465f0a46c1112eff90cec4431c5de5b1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 20 May 2015 19:01:23 +0200 Subject: [PATCH] Take some suggestions from PMD --- F-Droid/src/org/fdroid/fdroid/AppDetails.java | 2 +- F-Droid/src/org/fdroid/fdroid/UpdateService.java | 2 +- F-Droid/src/org/fdroid/fdroid/data/AppProvider.java | 2 +- F-Droid/src/org/fdroid/fdroid/data/ValueObject.java | 2 +- F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java | 2 +- .../org/fdroid/fdroid/installer/DefaultInstallerSdk14.java | 2 +- F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java | 4 ++-- F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java | 2 +- F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java | 4 ++-- .../org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index 984f5cf02..110dd6611 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -1264,7 +1264,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A for (final String af : getApp().antiFeatures) { final String afdesc = descAntiFeature(af); if (afdesc != null) { - sb.append("\t• ").append(afdesc).append("\n"); + sb.append("\t• ").append(afdesc).append('\n'); } } if (sb.length() > 0) { diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java index 1496dc327..fcd910327 100644 --- a/F-Droid/src/org/fdroid/fdroid/UpdateService.java +++ b/F-Droid/src/org/fdroid/fdroid/UpdateService.java @@ -177,7 +177,7 @@ public class UpdateService extends IntentService implements ProgressListener { msgB.append(error); } if (resultCode == STATUS_ERROR_LOCAL_SMALL) { - msgB.append("\n").append(context.getString(R.string.all_other_repos_fine)); + msgB.append('\n').append(context.getString(R.string.all_other_repos_fine)); } Toast.makeText(context, msgB.toString(), Toast.LENGTH_LONG).show(); finished = true; diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index 120043fca..5329e8d91 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -567,7 +567,7 @@ public class AppProvider extends FDroidProvider { } else { selection.append("OR "); } - selection.append("("); + selection.append('('); boolean firstKeyword = true; for (final String keyword : keywords) { if (firstKeyword) { diff --git a/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java b/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java index 78c5a51b8..0ac07d84b 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java +++ b/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java @@ -2,7 +2,7 @@ package org.fdroid.fdroid.data; import android.database.Cursor; -abstract class ValueObject { +public class ValueObject { protected void checkCursorPosition(Cursor cursor) throws IllegalArgumentException { if (cursor.getPosition() == -1) { diff --git a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java index b5e743f4f..ce3b8205c 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java @@ -37,7 +37,7 @@ import java.util.List; * unattended installations. */ public class DefaultInstaller extends Installer { - private Activity mActivity; + private final Activity mActivity; public DefaultInstaller(Activity activity, PackageManager pm, InstallerCallback callback) throws AndroidNotCompatibleException { diff --git a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java index 5756af7d8..3373e65ef 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java @@ -40,7 +40,7 @@ import java.util.List; */ @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public class DefaultInstallerSdk14 extends Installer { - private Activity mActivity; + private final Activity mActivity; public DefaultInstallerSdk14(Activity activity, PackageManager pm, InstallerCallback callback) throws AndroidNotCompatibleException { diff --git a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java index 02d968f88..fa155ac74 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java @@ -60,8 +60,8 @@ public class SystemInstaller extends Installer { private static final String TAG = "SystemInstaller"; - private PackageInstallObserver mInstallObserver; - private PackageDeleteObserver mDeleteObserver; + private final PackageInstallObserver mInstallObserver; + private final PackageDeleteObserver mDeleteObserver; private Method mInstallMethod; private Method mDeleteMethod; diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java index d0fd211ed..3624aef9e 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java @@ -450,7 +450,7 @@ public class LocalRepoManager { for (String permission : app.installedApk.permissions) { buff.append(permission.replace("android.permission.", "")); - buff.append(","); + buff.append(','); } String out = buff.toString(); if (!TextUtils.isEmpty(out)) diff --git a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java index 6b403e257..bbc731278 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java +++ b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java @@ -387,10 +387,10 @@ public class LocalHTTPD extends NanoHTTPD { if (len < 1024) { msg.append(len).append(" bytes"); } else if (len < 1024 * 1024) { - msg.append(len / 1024).append(".").append(len % 1024 / 10 % 100) + msg.append(len / 1024).append('.').append(len % 1024 / 10 % 100) .append(" KB"); } else { - msg.append(len / (1024 * 1024)).append(".") + msg.append(len / (1024 * 1024)).append('.') .append(len % (1024 * 1024) / 10 % 100).append(" MB"); } msg.append(")"); diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java index 92f29b413..8e2fc727c 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java +++ b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java @@ -17,7 +17,7 @@ import org.fdroid.fdroid.views.fragments.InstalledAppsFragment; */ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter { - private FDroid parent = null; + private final FDroid parent; public AppListFragmentPagerAdapter(FDroid parent) { super(parent.getSupportFragmentManager());