From 395baf0274c9b08500efb57bab75426f0379ef27 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 31 Jan 2009 14:27:45 +0000
Subject: [PATCH] * Convert some inner classes to static (findbugs)
---
.../java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java | 8 ++++----
.../src/net/i2p/data/i2cp/RequestLeaseSetMessage.java | 4 ++--
router/java/src/net/i2p/router/Blocklist.java | 2 +-
router/java/src/net/i2p/router/Shitlist.java | 2 +-
.../src/net/i2p/router/tunnel/pool/TunnelPoolManager.java | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
index 252d4e1aa8..38c50f2661 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
@@ -361,24 +361,24 @@ public class SOCKS5Server extends SOCKSServer {
/*
* Some namespaces to enclose SOCKS protocol codes
*/
- private class Method {
+ private static class Method {
private static final int NO_AUTH_REQUIRED = 0x00;
private static final int NO_ACCEPTABLE_METHODS = 0xff;
}
- private class AddressType {
+ private static class AddressType {
private static final int IPV4 = 0x01;
private static final int DOMAINNAME = 0x03;
private static final int IPV6 = 0x04;
}
- private class Command {
+ private static class Command {
private static final int CONNECT = 0x01;
private static final int BIND = 0x02;
private static final int UDP_ASSOCIATE = 0x03;
}
- private class Reply {
+ private static class Reply {
private static final int SUCCEEDED = 0x00;
private static final int GENERAL_SOCKS_SERVER_FAILURE = 0x01;
private static final int CONNECTION_NOT_ALLOWED_BY_RULESET = 0x02;
diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
index 2cd630db61..b5fca013d7 100644
--- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
@@ -156,7 +156,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
return buf.toString();
}
- private class TunnelEndpoint {
+ private static class TunnelEndpoint {
private Hash _router;
private TunnelId _tunnelId;
@@ -186,4 +186,4 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
_tunnelId = tunnelId;
}
}
-}
\ No newline at end of file
+}
diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index 5f686c1923..1c50eaa65f 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -256,7 +256,7 @@ public class Blocklist {
}
}
- private class Entry {
+ private static class Entry {
String comment;
byte ip1[];
byte ip2[];
diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java
index 7d86926cfa..2005366c26 100644
--- a/router/java/src/net/i2p/router/Shitlist.java
+++ b/router/java/src/net/i2p/router/Shitlist.java
@@ -36,7 +36,7 @@ public class Shitlist {
private RouterContext _context;
private Map _entries;
- private class Entry {
+ private static class Entry {
/** when it should expire, per the i2p clock */
long expireOn;
/** why they were shitlisted */
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index 43120d0b08..c6b1f5b9a9 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -376,7 +376,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
_context.jobQueue().addJob(new BootstrapPool(_context, _outboundExploratory));
}
- private class BootstrapPool extends JobImpl {
+ private static class BootstrapPool extends JobImpl {
private TunnelPool _pool;
public BootstrapPool(RouterContext ctx, TunnelPool pool) {
super(ctx);
--
GitLab