From 3355851e35bf35ebaedab0213f442f846750978d Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 13 Nov 2012 14:17:29 +0000
Subject: [PATCH] No point having public ID fields on package-private classes.

---
 src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java   | 3 +--
 src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java | 3 +--
 src/net/sf/briar/plugins/email/GmailPlugin.java           | 3 +--
 src/net/sf/briar/plugins/file/RemovableDrivePlugin.java   | 3 +--
 src/net/sf/briar/plugins/tcp/LanTcpPlugin.java            | 3 +--
 src/net/sf/briar/plugins/tcp/WanTcpPlugin.java            | 3 +--
 src/net/sf/briar/plugins/tor/TorPlugin.java               | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java b/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
index 839471aeb6..a46a9b8cad 100644
--- a/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
+++ b/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
@@ -38,11 +38,10 @@ import net.sf.briar.util.StringUtils;
 class BluetoothPlugin implements DuplexPlugin {
 
 	// Share an ID with the Android Bluetooth plugin
-	public static final byte[] TRANSPORT_ID =
+	private static final byte[] TRANSPORT_ID =
 			StringUtils.fromHexString("d99c9313c04417dcf22fc60d12a187ea"
 					+ "00a539fd260f08a13a0d8a900cde5e49"
 					+ "1b4df2ffd42e40c408f2db7868f518aa");
-
 	private static final TransportId ID = new TransportId(TRANSPORT_ID);
 	private static final Logger LOG =
 			Logger.getLogger(BluetoothPlugin.class.getName());
diff --git a/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java b/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
index e9ddc1daab..5563625798 100644
--- a/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
+++ b/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
@@ -43,11 +43,10 @@ import android.content.IntentFilter;
 class DroidtoothPlugin implements DuplexPlugin {
 
 	// Share an ID with the J2SE Bluetooth plugin
-	public static final byte[] TRANSPORT_ID =
+	private static final byte[] TRANSPORT_ID =
 			StringUtils.fromHexString("d99c9313c04417dcf22fc60d12a187ea"
 					+ "00a539fd260f08a13a0d8a900cde5e49"
 					+ "1b4df2ffd42e40c408f2db7868f518aa");
-
 	private static final TransportId ID = new TransportId(TRANSPORT_ID);
 	private static final Logger LOG =
 			Logger.getLogger(DroidtoothPlugin.class.getName());
diff --git a/src/net/sf/briar/plugins/email/GmailPlugin.java b/src/net/sf/briar/plugins/email/GmailPlugin.java
index 3b346f64ab..8787e7ee3d 100644
--- a/src/net/sf/briar/plugins/email/GmailPlugin.java
+++ b/src/net/sf/briar/plugins/email/GmailPlugin.java
@@ -45,11 +45,10 @@ import net.sf.briar.util.StringUtils;
 
 class GmailPlugin implements SimplexPlugin {
 
-	public static final byte[] TRANSPORT_ID = StringUtils
+	private static final byte[] TRANSPORT_ID = StringUtils
 			.fromHexString("57ead1961d2120bbbbe8256ff9ce6ae2"
 					+ "ef5535e44330c04cedcbafac4d756f0c"
 					+ "e8dd928ed1d7a9e7b89fd62210aa30bf");
-
 	private static final TransportId ID = new TransportId(TRANSPORT_ID);
 	private static final Logger LOG =
 			Logger.getLogger(GmailPlugin.class.getName());
diff --git a/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java b/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java
index 5281909ffa..90c0082173 100644
--- a/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java
+++ b/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java
@@ -20,11 +20,10 @@ import net.sf.briar.util.StringUtils;
 class RemovableDrivePlugin extends FilePlugin
 implements RemovableDriveMonitor.Callback {
 
-	public static final byte[] TRANSPORT_ID =
+	private static final byte[] TRANSPORT_ID =
 			StringUtils.fromHexString("7c81bf5c9b1cd557685548c85f976bbd"
 					+ "e633d2418ea2e230e5710fb43c6f8cc0"
 					+ "68abca3a9d0edb13bcea13b851725c5d");
-
 	private static final TransportId ID = new TransportId(TRANSPORT_ID);
 	private static final Logger LOG =
 			Logger.getLogger(RemovableDrivePlugin.class.getName());
diff --git a/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java b/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
index e0a2dccd86..358bb0782e 100644
--- a/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
+++ b/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
@@ -33,11 +33,10 @@ import net.sf.briar.util.StringUtils;
 /** A socket plugin that supports exchanging invitations over a LAN. */
 class LanTcpPlugin extends TcpPlugin {
 
-	public static final byte[] TRANSPORT_ID =
+	private static final byte[] TRANSPORT_ID =
 			StringUtils.fromHexString("0d79357fd7f74d66c2f6f6ad0f7fff81"
 					+ "d21c53a43b90b0507ed0683872d8e2fc"
 					+ "5a88e8f953638228dc26669639757bbf");
-
 	private static final TransportId ID = new TransportId(TRANSPORT_ID);
 	private static final Logger LOG =
 			Logger.getLogger(LanTcpPlugin.class.getName());
diff --git a/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java b/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
index 37f76849fd..4fcca98908 100644
--- a/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
+++ b/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
@@ -24,11 +24,10 @@ import net.sf.briar.util.StringUtils;
 
 class WanTcpPlugin extends TcpPlugin {
 
-	public static final byte[] TRANSPORT_ID =
+	private static final byte[] TRANSPORT_ID =
 			StringUtils.fromHexString("58c66d999e492b85065924acfd739d80"
 					+ "c65a62f87e5a4fc6c284f95908b9007d"
 					+ "512a93ebf89bf68f50a29e96eebf97b6");
-
 	private static final TransportId ID = new TransportId(TRANSPORT_ID);
 	private static final Logger LOG =
 			Logger.getLogger(WanTcpPlugin.class.getName());
diff --git a/src/net/sf/briar/plugins/tor/TorPlugin.java b/src/net/sf/briar/plugins/tor/TorPlugin.java
index 8141b14f55..ad555b45bd 100644
--- a/src/net/sf/briar/plugins/tor/TorPlugin.java
+++ b/src/net/sf/briar/plugins/tor/TorPlugin.java
@@ -35,11 +35,10 @@ import org.silvertunnel.netlib.layer.tor.util.RSAKeyPair;
 
 class TorPlugin implements DuplexPlugin {
 
-	public static final byte[] TRANSPORT_ID =
+	private static final byte[] TRANSPORT_ID =
 			StringUtils.fromHexString("f264721575cb7ee710772f35abeb3db4"
 					+ "a91f474e14de346be296c2efc99effdd"
 					+ "f35921e6ed87a25c201f044da4767981");
-
 	private static final TransportId ID = new TransportId(TRANSPORT_ID);
 	private static final Logger LOG =
 			Logger.getLogger(TorPlugin.class.getName());
-- 
GitLab