From 566dd8ccc9d0baeff18519ceeb49714fe0723d11 Mon Sep 17 00:00:00 2001 From: nicksavers Date: Wed, 2 Jul 2014 11:07:50 +0200 Subject: [PATCH] Move PeerListener to correct package --- .../main/java/org/ethereum/gui/ConnectionConsoleWindow.java | 1 + .../src/main/java/org/ethereum/{gui => net}/PeerListener.java | 2 +- .../src/main/java/org/ethereum/net/client/ClientPeer.java | 2 +- .../java/org/ethereum/net/client/EthereumProtocolHandler.java | 2 +- .../ethereum/net/peerdiscovery/EthereumPeerTasterHandler.java | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) rename ethereumj-core/src/main/java/org/ethereum/{gui => net}/PeerListener.java (86%) diff --git a/ethereumj-core/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java b/ethereumj-core/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java index 172173f2..fb9afc53 100644 --- a/ethereumj-core/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java +++ b/ethereumj-core/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java @@ -7,6 +7,7 @@ import java.awt.event.WindowEvent; import javax.swing.*; import org.ethereum.config.SystemProperties; +import org.ethereum.net.PeerListener; import org.ethereum.net.client.ClientPeer; import org.fife.ui.rsyntaxtextarea.*; import org.fife.ui.rtextarea.RTextScrollPane; diff --git a/ethereumj-core/src/main/java/org/ethereum/gui/PeerListener.java b/ethereumj-core/src/main/java/org/ethereum/net/PeerListener.java similarity index 86% rename from ethereumj-core/src/main/java/org/ethereum/gui/PeerListener.java rename to ethereumj-core/src/main/java/org/ethereum/net/PeerListener.java index 8ae2589c..ed73c95a 100644 --- a/ethereumj-core/src/main/java/org/ethereum/gui/PeerListener.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/PeerListener.java @@ -1,4 +1,4 @@ -package org.ethereum.gui; +package org.ethereum.net; /** * www.ethereumJ.com diff --git a/ethereumj-core/src/main/java/org/ethereum/net/client/ClientPeer.java b/ethereumj-core/src/main/java/org/ethereum/net/client/ClientPeer.java index 1d766ff8..e9fb4ee1 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/client/ClientPeer.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/client/ClientPeer.java @@ -8,8 +8,8 @@ import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import org.ethereum.core.Transaction; -import org.ethereum.gui.PeerListener; import org.ethereum.manager.MainData; +import org.ethereum.net.PeerListener; import org.ethereum.net.message.StaticMessages; import org.ethereum.net.message.TransactionsMessage; import org.ethereum.util.ByteUtil; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/client/EthereumProtocolHandler.java b/ethereumj-core/src/main/java/org/ethereum/net/client/EthereumProtocolHandler.java index 601824ff..1bd2e3ab 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/client/EthereumProtocolHandler.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/client/EthereumProtocolHandler.java @@ -12,10 +12,10 @@ import java.util.Timer; import java.util.TimerTask; import org.ethereum.core.Block; -import org.ethereum.gui.PeerListener; import org.ethereum.manager.MainData; import org.ethereum.manager.WorldManager; import org.ethereum.net.Command; +import org.ethereum.net.PeerListener; import org.ethereum.net.message.BlocksMessage; import org.ethereum.net.message.DisconnectMessage; import org.ethereum.net.message.GetChainMessage; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/EthereumPeerTasterHandler.java b/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/EthereumPeerTasterHandler.java index 991bdbcb..7fae1b32 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/EthereumPeerTasterHandler.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/EthereumPeerTasterHandler.java @@ -5,9 +5,10 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelOption; import io.netty.channel.FixedRecvByteBufAllocator; -import org.ethereum.gui.PeerListener; + import org.ethereum.manager.MainData; import org.ethereum.net.Command; +import org.ethereum.net.PeerListener; import org.ethereum.net.message.*; import org.ethereum.util.ByteUtil; import org.ethereum.util.RLP;