From 8723e9ef0de2ece7f5d23a04c0b0f24e77bce179 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 10 Nov 2014 08:26:56 +0100 Subject: [PATCH] Move {MessageModule=>TomP2PMessageModule}#BOOTSTRAP_NODE_*_KEY --- src/main/java/io/bitsquare/app/ArgumentParser.java | 3 ++- src/main/java/io/bitsquare/app/cli/SeedNode.java | 2 +- src/main/java/io/bitsquare/app/gui/Main.java | 3 ++- src/main/java/io/bitsquare/msg/MessageModule.java | 3 --- .../java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java | 4 ++++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/bitsquare/app/ArgumentParser.java b/src/main/java/io/bitsquare/app/ArgumentParser.java index a685c7ef72..a97127f056 100644 --- a/src/main/java/io/bitsquare/app/ArgumentParser.java +++ b/src/main/java/io/bitsquare/app/ArgumentParser.java @@ -22,7 +22,8 @@ import net.sourceforge.argparse4j.inf.ArgumentParserException; import net.sourceforge.argparse4j.inf.Namespace; import static io.bitsquare.app.AppModule.APP_NAME_KEY; -import static io.bitsquare.msg.MessageModule.*; +import static io.bitsquare.msg.MessageModule.NETWORK_INTERFACE_KEY; +import static io.bitsquare.msg.tomp2p.TomP2PMessageModule.*; public class ArgumentParser { diff --git a/src/main/java/io/bitsquare/app/cli/SeedNode.java b/src/main/java/io/bitsquare/app/cli/SeedNode.java index 512fff52fb..de7772263a 100644 --- a/src/main/java/io/bitsquare/app/cli/SeedNode.java +++ b/src/main/java/io/bitsquare/app/cli/SeedNode.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import net.sourceforge.argparse4j.inf.Namespace; -import static io.bitsquare.msg.MessageModule.*; +import static io.bitsquare.msg.tomp2p.TomP2PMessageModule.*; public class SeedNode { private static final Logger log = LoggerFactory.getLogger(SeedNode.class); diff --git a/src/main/java/io/bitsquare/app/gui/Main.java b/src/main/java/io/bitsquare/app/gui/Main.java index 7d11f36d06..e5af8c5264 100644 --- a/src/main/java/io/bitsquare/app/gui/Main.java +++ b/src/main/java/io/bitsquare/app/gui/Main.java @@ -50,7 +50,8 @@ import lighthouse.files.AppDirectory; import net.sourceforge.argparse4j.inf.Namespace; import static io.bitsquare.app.AppModule.APP_NAME_KEY; -import static io.bitsquare.msg.MessageModule.*; +import static io.bitsquare.msg.MessageModule.NETWORK_INTERFACE_KEY; +import static io.bitsquare.msg.tomp2p.TomP2PMessageModule.*; public class Main extends Application { private static final Logger log = LoggerFactory.getLogger(Main.class); diff --git a/src/main/java/io/bitsquare/msg/MessageModule.java b/src/main/java/io/bitsquare/msg/MessageModule.java index 50761b82a5..f389605173 100644 --- a/src/main/java/io/bitsquare/msg/MessageModule.java +++ b/src/main/java/io/bitsquare/msg/MessageModule.java @@ -26,9 +26,6 @@ import java.util.Properties; public abstract class MessageModule extends BitsquareModule { - public static final String BOOTSTRAP_NODE_ID_KEY = "id"; - public static final String BOOTSTRAP_NODE_IP_KEY = "ip"; - public static final String BOOTSTRAP_NODE_PORT_KEY = "port"; public static final String NETWORK_INTERFACE_KEY = "networkInterface"; protected MessageModule(Properties properties) { diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java index 461841846e..d11dcdd2de 100644 --- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java +++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java @@ -29,6 +29,10 @@ import static io.bitsquare.network.BootstrapNodes.DEFAULT_BOOTSTRAP_NODE; public class TomP2PMessageModule extends MessageModule { + public static final String BOOTSTRAP_NODE_ID_KEY = "id"; + public static final String BOOTSTRAP_NODE_IP_KEY = "ip"; + public static final String BOOTSTRAP_NODE_PORT_KEY = "port"; + public TomP2PMessageModule(Properties properties) { super(properties); }