From 25367197490dd6e2477b067e2f185f878a980d49 Mon Sep 17 00:00:00 2001
From: Jan Berkel <jan.berkel@gmail.com>
Date: Fri, 12 Dec 2014 07:03:14 +0000
Subject: [PATCH] Naming

---
 src/com/fsck/k9/Account.java                | 24 ++++++++++-----------
 src/com/fsck/k9/mail/store/StoreConfig.java | 11 +++++-----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index d7413b6d1..ac61af945 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -1078,8 +1078,8 @@ public class Account implements BaseAccount, StoreConfig {
         return mDraftsFolderName;
     }
 
-    public synchronized void setDraftsFolderName(String draftsFolderName) {
-        mDraftsFolderName = draftsFolderName;
+    public synchronized void setDraftsFolderName(String name) {
+        mDraftsFolderName = name;
     }
 
     /**
@@ -1098,8 +1098,8 @@ public class Account implements BaseAccount, StoreConfig {
         return K9.ERROR_FOLDER_NAME;
     }
 
-    public synchronized void setSentFolderName(String sentFolderName) {
-        mSentFolderName = sentFolderName;
+    public synchronized void setSentFolderName(String name) {
+        mSentFolderName = name;
     }
 
     /**
@@ -1115,8 +1115,8 @@ public class Account implements BaseAccount, StoreConfig {
         return mTrashFolderName;
     }
 
-    public synchronized void setTrashFolderName(String trashFolderName) {
-        mTrashFolderName = trashFolderName;
+    public synchronized void setTrashFolderName(String name) {
+        mTrashFolderName = name;
     }
 
     /**
@@ -1147,8 +1147,8 @@ public class Account implements BaseAccount, StoreConfig {
         return mSpamFolderName;
     }
 
-    public synchronized void setSpamFolderName(String spamFolderName) {
-        mSpamFolderName = spamFolderName;
+    public synchronized void setSpamFolderName(String name) {
+        mSpamFolderName = name;
     }
 
     /**
@@ -1167,8 +1167,8 @@ public class Account implements BaseAccount, StoreConfig {
         return mAutoExpandFolderName;
     }
 
-    public synchronized void setAutoExpandFolderName(String autoExpandFolderName) {
-        mAutoExpandFolderName = autoExpandFolderName;
+    public synchronized void setAutoExpandFolderName(String name) {
+        mAutoExpandFolderName = name;
     }
 
     public synchronized int getAccountNumber() {
@@ -1659,8 +1659,8 @@ public class Account implements BaseAccount, StoreConfig {
         return mInboxFolderName;
     }
 
-    public void setInboxFolderName(String mInboxFolderName) {
-        this.mInboxFolderName = mInboxFolderName;
+    public void setInboxFolderName(String name) {
+        this.mInboxFolderName = name;
     }
 
     public synchronized boolean syncRemoteDeletions() {
diff --git a/src/com/fsck/k9/mail/store/StoreConfig.java b/src/com/fsck/k9/mail/store/StoreConfig.java
index ba83ba201..23d177d90 100644
--- a/src/com/fsck/k9/mail/store/StoreConfig.java
+++ b/src/com/fsck/k9/mail/store/StoreConfig.java
@@ -12,12 +12,11 @@ public interface StoreConfig {
     String getOutboxFolderName();
     String getDraftsFolderName();
 
-    void setInboxFolderName(String folderName);
-    void setDraftsFolderName(String decodedFolderName);
-    void setTrashFolderName(String decodedFolderName);
-    void setSpamFolderName(String decodedFolderName);
-    void setSentFolderName(String decodedFolderName);
-    void setAutoExpandFolderName(String folderName);
+    void setDraftsFolderName(String name);
+    void setTrashFolderName(String name);
+    void setSpamFolderName(String name);
+    void setSentFolderName(String name);
+    void setAutoExpandFolderName(String name);
 
     int getMaximumAutoDownloadMessageSize();