From c7f3910472a84c62f36f200b20562a3dbbaafe64 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 2 Jan 2020 20:28:35 +0100
Subject: [PATCH] fix PMD "Field has the same name as a method"

---
 .../main/java/org/fdroid/fdroid/data/FDroidProvider.java  | 8 ++++----
 .../org/fdroid/fdroid/views/apps/AppListItemState.java    | 6 +++---
 .../java/org/fdroid/fdroid/updater/Issue763MultiRepo.java | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java b/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java
index 4e561c407..1b4567ae3 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java
@@ -27,7 +27,7 @@ public abstract class FDroidProvider extends ContentProvider {
     static final int CODE_LIST = 1;
     static final int CODE_SINGLE = 2;
 
-    private boolean isApplyingBatch;
+    private boolean applyingBatch;
 
     protected abstract String getTableName();
 
@@ -47,7 +47,7 @@ public abstract class FDroidProvider extends ContentProvider {
      * Based on http://stackoverflow.com/a/15886915.
      */
     protected final boolean isApplyingBatch() {
-        return this.isApplyingBatch;
+        return this.applyingBatch;
     }
 
     @NonNull
@@ -55,7 +55,7 @@ public abstract class FDroidProvider extends ContentProvider {
     public ContentProviderResult[] applyBatch(@NonNull ArrayList<ContentProviderOperation> operations)
             throws OperationApplicationException {
         ContentProviderResult[] result = null;
-        isApplyingBatch = true;
+        applyingBatch = true;
         final SQLiteDatabase db = db();
         db.beginTransaction();
         try {
@@ -63,7 +63,7 @@ public abstract class FDroidProvider extends ContentProvider {
             db.setTransactionSuccessful();
         } finally {
             db.endTransaction();
-            isApplyingBatch = false;
+            applyingBatch = false;
         }
         return result;
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
index 464626fe2..4eaa14e82 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
@@ -21,7 +21,7 @@ public class AppListItemState {
     private int progressMax = -1;
     private boolean showInstallButton;
     private boolean showCheckBox;
-    private boolean isCheckBoxChecked;
+    private boolean checkBoxChecked;
 
     public AppListItemState(@NonNull App app) {
         this.app = app;
@@ -124,7 +124,7 @@ public class AppListItemState {
     }
 
     public boolean isCheckBoxChecked() {
-        return isCheckBoxChecked;
+        return checkBoxChecked;
     }
 
     /**
@@ -133,7 +133,7 @@ public class AppListItemState {
      */
     public AppListItemState setCheckBoxStatus(boolean checked) {
         this.showCheckBox = true;
-        this.isCheckBoxChecked = checked;
+        this.checkBoxChecked = checked;
         return this;
     }
 
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
index 277d521ca..f82744560 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
@@ -35,7 +35,7 @@ public class Issue763MultiRepo extends MultiIndexUpdaterTest {
     }
 
     @Test
-    public void antoxRepo() throws IndexUpdater.UpdateException {
+    public void testAntoxRepo() throws IndexUpdater.UpdateException {
         assertAntoxEmpty();
         setEnabled(microGRepo, true);
         updateAntox();
@@ -47,7 +47,7 @@ public class Issue763MultiRepo extends MultiIndexUpdaterTest {
     }
 
     @Test
-    public void microGRepo() throws IndexUpdater.UpdateException {
+    public void testMicroGRepo() throws IndexUpdater.UpdateException {
         assertMicroGEmpty();
         setEnabled(microGRepo, true);
         updateMicroG();