From a51a6d57f90ae56c774857535a3ed957ad96f9ce Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 29 Jan 2019 13:28:11 +0000
Subject: [PATCH] rename class
---
.../i2p/router/networkdb/kademlia/BundleRouterInfos.java | 4 ++--
.../src/net/i2p/router/transport/CommSystemFacadeImpl.java | 6 +++---
.../transport/{BadCountries.java => StrictCountries.java} | 5 +++--
3 files changed, 8 insertions(+), 7 deletions(-)
rename router/java/src/net/i2p/router/transport/{BadCountries.java => StrictCountries.java} (93%)
diff --git a/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java b/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
index f6df2055dc..6a544d45f3 100644
--- a/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
+++ b/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
@@ -29,7 +29,7 @@ import net.i2p.data.DataFormatException;
import net.i2p.data.Hash;
import net.i2p.data.router.RouterAddress;
import net.i2p.data.router.RouterInfo;
-import net.i2p.router.transport.BadCountries;
+import net.i2p.router.transport.StrictCountries;
import net.i2p.router.transport.GeoIP;
import net.i2p.util.FileUtil;
@@ -227,7 +227,7 @@ public class BundleRouterInfos {
for (Map.Entry<String, String> e : ipMap.entrySet()) {
String co = geoIP.get(e.getKey());
if (co != null) {
- if (BadCountries.contains(co)) {
+ if (StrictCountries.contains(co)) {
String name = e.getValue();
File toFile = new File(toDir, name);
if (toFile.delete()) {
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index 450cb6348e..ef35ea5740 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -438,7 +438,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
@Override
public boolean isInBadCountry() {
String us = getOurCountry();
- return (us != null && BadCountries.contains(us)) || _context.getBooleanProperty("router.forceBadCountry");
+ return (us != null && StrictCountries.contains(us)) || _context.getBooleanProperty("router.forceBadCountry");
}
/**
@@ -449,7 +449,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
@Override
public boolean isInBadCountry(Hash peer) {
String c = getCountry(peer);
- return c != null && BadCountries.contains(c);
+ return c != null && StrictCountries.contains(c);
}
/**
@@ -463,7 +463,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
if (ip == null)
return false;
String c = _geoIP.get(ip);
- return c != null && BadCountries.contains(c);
+ return c != null && StrictCountries.contains(c);
}
/**
diff --git a/router/java/src/net/i2p/router/transport/BadCountries.java b/router/java/src/net/i2p/router/transport/StrictCountries.java
similarity index 93%
rename from router/java/src/net/i2p/router/transport/BadCountries.java
rename to router/java/src/net/i2p/router/transport/StrictCountries.java
index dc848d8598..c54f531ca2 100644
--- a/router/java/src/net/i2p/router/transport/BadCountries.java
+++ b/router/java/src/net/i2p/router/transport/StrictCountries.java
@@ -6,10 +6,11 @@ import java.util.Locale;
import java.util.Set;
/**
- * Maintain a list of bad places.
+ * Maintain a list of countries that may have
+ * tight restrictions on applications like ours.
* @since 0.8.13
*/
-public abstract class BadCountries {
+public abstract class StrictCountries {
private static final Set<String> _countries;
--
GitLab