From eea66e390bb079169b1ac6fdd7285bcc0c2eeb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 2 Oct 2015 16:41:08 -0700 Subject: [PATCH] Make some fields final as suggested by AS Most of these are fields initialized statically or in the constructor. --- F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java | 2 +- .../org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java | 2 +- .../src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java | 2 +- .../org/fdroid/fdroid/net/bluetooth/BluetoothServer.java | 2 +- .../org/fdroid/fdroid/net/bluetooth/httpish/Request.java | 6 +++--- .../org/fdroid/fdroid/net/bluetooth/httpish/Response.java | 4 ++-- .../fdroid/fdroid/net/bluetooth/httpish/headers/Header.java | 2 +- F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java | 6 +++--- .../src/org/fdroid/fdroid/views/swap/SwapConnecting.java | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java index 09e9e9998..1b46d65ee 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java @@ -85,7 +85,7 @@ public class SwapService extends Service { private static final String KEY_WIFI_ENABLED = "wifiEnabled"; @NonNull - private Set appsToSwap = new HashSet<>(); + private final Set appsToSwap = new HashSet<>(); public SwapService() { super(); diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java index 4f29b31ec..a97841579 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java @@ -9,7 +9,7 @@ import org.fdroid.fdroid.localrepo.type.BluetoothSwap; public class BluetoothPeer implements Peer { private static final String TAG = "BluetoothPeer"; - private BluetoothDevice device; + private final BluetoothDevice device; public BluetoothPeer(BluetoothDevice device) { this.device = device; diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java index 0da35cc0e..2d64c8ffd 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java @@ -8,7 +8,7 @@ import javax.jmdns.impl.FDroidServiceInfo; public class BonjourPeer extends WifiPeer { - private FDroidServiceInfo serviceInfo; + private final FDroidServiceInfo serviceInfo; public BonjourPeer(ServiceInfo serviceInfo) { this.serviceInfo = new FDroidServiceInfo(serviceInfo); diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java index c8eb786a4..a59ebb49e 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java @@ -31,7 +31,7 @@ public class BluetoothServer extends Thread { private static final String TAG = "BluetoothServer"; private BluetoothServerSocket serverSocket; - private List clients = new ArrayList<>(); + private final List clients = new ArrayList<>(); private final File webRoot; private final BluetoothSwap swap; diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java index 64b9d114c..420166996 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java @@ -26,9 +26,9 @@ public class Request { private String path; private Map headers; - private BluetoothConnection connection; - private Writer output; - private InputStream input; + private final BluetoothConnection connection; + private final Writer output; + private final InputStream input; private Request(String method, String path, BluetoothConnection connection) { this.method = method; diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java index e19c1d07a..2ba6cd6e1 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java @@ -22,8 +22,8 @@ public class Response { private static final String TAG = "bluetooth.Response"; - private int statusCode; - private Map headers; + private final int statusCode; + private final Map headers; private final InputStream contentStream; public Response(int statusCode, Map headers) { diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java index 1a529099d..57de6eda0 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java @@ -6,7 +6,7 @@ import java.util.Locale; public abstract class Header { - private static Header[] VALID_HEADERS = { + private static final Header[] VALID_HEADERS = { new ContentLengthHeader(), new ETagHeader(), }; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java index bdc9313e9..f254fbcf8 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java @@ -276,7 +276,7 @@ public class SwapAppsView extends ListView implements TextView statusInstalled; TextView statusIncompatible; - private BroadcastReceiver downloadProgressReceiver = new BroadcastReceiver() { + private final BroadcastReceiver downloadProgressReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { Apk apk = getApkToInstall(); @@ -297,7 +297,7 @@ public class SwapAppsView extends ListView implements } }; - private BroadcastReceiver apkDownloadReceiver = new BroadcastReceiver() { + private final BroadcastReceiver apkDownloadReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { Apk apk = getApkToInstall(); @@ -325,7 +325,7 @@ public class SwapAppsView extends ListView implements } }; - private ContentObserver appObserver = new ContentObserver(new Handler()) { + private final ContentObserver appObserver = new ContentObserver(new Handler()) { @Override public void onChange(boolean selfChange) { app = AppProvider.Helper.findById(getActivity().getContentResolver(), app.id); 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 b74b4539f..81c508e19 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java @@ -68,8 +68,8 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity prepareSwapReceiver, new IntentFilter(SwapWorkflowActivity.PrepareSwapRepo.ACTION)); } - private BroadcastReceiver repoUpdateReceiver = new ConnectSwapReceiver(); - private BroadcastReceiver prepareSwapReceiver = new PrepareSwapReceiver(); + private final BroadcastReceiver repoUpdateReceiver = new ConnectSwapReceiver(); + private final BroadcastReceiver prepareSwapReceiver = new PrepareSwapReceiver(); /** * Listens for feedback about a local repository being prepared: