[or-cvs] [metrics-db/master 1/3] Remove unused countries parameter.

[karsten@xxxxxxxxxxxxxx]

Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Mon, 16 Aug 2010 08:32:39 +0200
Subject: Remove unused countries parameter.
Commit: 8ef2217c24e89fcba614d75307044e01c799981e

---
 .../torproject/ernie/db/BridgeSnapshotReader.java  |    2 +-
 src/org/torproject/ernie/db/Main.java              |    5 ++---
 .../ernie/db/SanitizedBridgesReader.java           |    3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/org/torproject/ernie/db/BridgeSnapshotReader.java b/src/org/torproject/ernie/db/BridgeSnapshotReader.java
index 1386eb7..1e660bd 100644
--- a/src/org/torproject/ernie/db/BridgeSnapshotReader.java
+++ b/src/org/torproject/ernie/db/BridgeSnapshotReader.java
@@ -13,7 +13,7 @@ import org.apache.commons.compress.archivers.tar.*;
  */
 public class BridgeSnapshotReader {
   public BridgeSnapshotReader(BridgeDescriptorParser bdp,
-      String bridgeDirectoriesDir, Set<String> countries) {
+      String bridgeDirectoriesDir) {
     Logger logger =
         Logger.getLogger(BridgeSnapshotReader.class.getName());
     SortedSet<String> parsed = new TreeSet<String>();
diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java
index ac9b002..7fcf1fd 100644
--- a/src/org/torproject/ernie/db/Main.java
+++ b/src/org/torproject/ernie/db/Main.java
@@ -154,12 +154,11 @@ public class Main {
     // Import bridge descriptors
     if (bdp != null && config.getImportSanitizedBridges()) {
       new SanitizedBridgesReader(bdp,
-          config.getSanitizedBridgesDirectory(), countries,
+          config.getSanitizedBridgesDirectory(),
           config.getKeepSanitizedBridgesImportHistory());
     }
     if (bdp != null && config.getImportBridgeSnapshots()) {
-      new BridgeSnapshotReader(bdp, config.getBridgeSnapshotsDirectory(),
-          countries);
+      new BridgeSnapshotReader(bdp, config.getBridgeSnapshotsDirectory());
     }
 
     // Finish writing sanitized bridge descriptors to disk
diff --git a/src/org/torproject/ernie/db/SanitizedBridgesReader.java b/src/org/torproject/ernie/db/SanitizedBridgesReader.java
index 3d46ac3..efca2c1 100644
--- a/src/org/torproject/ernie/db/SanitizedBridgesReader.java
+++ b/src/org/torproject/ernie/db/SanitizedBridgesReader.java
@@ -8,8 +8,7 @@ import java.util.logging.*;
 
 public class SanitizedBridgesReader {
   public SanitizedBridgesReader(BridgeDescriptorParser bdp,
-      String bridgesDir, SortedSet<String> countries,
-      boolean keepImportHistory) {
+      String bridgesDir, boolean keepImportHistory) {
     Logger logger =
         Logger.getLogger(SanitizedBridgesReader.class.getName());
     SortedSet<String> bridgesImportHistory = new TreeSet<String>();
-- 
1.7.1