commit f106b16b7637593b9db1d44ae4546940c7ce3c1a Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Fri Oct 26 12:46:10 2012 -0400 Organize imports, fix whitespace issues. --- .../db/bridgedescs/SanitizedBridgesWriter.java | 27 +++++++++++++++---- .../ernie/db/main/LoggingConfiguration.java | 3 +- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java index ec7ad4b..85b0883 100644 --- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java @@ -2,16 +2,31 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db.bridgedescs; -import java.io.*; -import java.security.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.security.GeneralSecurityException; +import java.security.SecureRandom; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; -import java.util.logging.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.codec.DecoderException; -import org.apache.commons.codec.digest.*; -import org.apache.commons.codec.binary.*; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; /** * Sanitizes bridge descriptors, i.e., removes all possibly sensitive diff --git a/src/org/torproject/ernie/db/main/LoggingConfiguration.java b/src/org/torproject/ernie/db/main/LoggingConfiguration.java index b0ddeaa..78a60d1 100644 --- a/src/org/torproject/ernie/db/main/LoggingConfiguration.java +++ b/src/org/torproject/ernie/db/main/LoggingConfiguration.java @@ -2,8 +2,6 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db.main; -import java.io.BufferedWriter; -import java.io.FileWriter; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; @@ -15,6 +13,7 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; + /** * Initialize logging configuration. *