move trademsg

src/main/java/io/bitsquare/msg/MessageFacade.java

@@ -4,6 +4,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.inject.name.Named;
 import io.bitsquare.msg.listeners.*;
 import io.bitsquare.trade.Offer;
+import io.bitsquare.trade.protocol.TradeMessage;
 import io.bitsquare.user.Arbitrator;
 import io.bitsquare.user.User;
 import java.io.IOException;

src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java

@@ -1,6 +1,6 @@
 package io.bitsquare.msg.listeners;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import net.tomp2p.peers.PeerAddress;
 
 public interface IncomingTradeMessageListener

src/main/java/io/bitsquare/trade/Trading.java

@@ -8,9 +8,9 @@ import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.crypto.CryptoFacade;
 import io.bitsquare.gui.popups.Popups;
 import io.bitsquare.msg.MessageFacade;
-import io.bitsquare.msg.TradeMessage;
 import io.bitsquare.msg.listeners.TakeOfferRequestListener;
 import io.bitsquare.storage.Storage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import io.bitsquare.trade.protocol.offerer.*;
 import io.bitsquare.trade.protocol.taker.*;
 import io.bitsquare.user.User;

src/main/java/io/bitsquare/trade/protocol/TradeMessage.java

@@ -1,4 +1,4 @@
-package io.bitsquare.msg;
+package io.bitsquare.trade.protocol;
 
 public interface TradeMessage
 {

src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java

@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.offerer;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 import java.math.BigInteger;
 

src/main/java/io/bitsquare/trade/protocol/offerer/DepositTxPublishedMessage.java

@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.offerer;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class DepositTxPublishedMessage implements Serializable, TradeMessage

src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPaymentMessage.java

@@ -1,7 +1,7 @@
 package io.bitsquare.trade.protocol.offerer;
 
 import io.bitsquare.bank.BankAccount;
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class RequestTakerDepositPaymentMessage implements Serializable, TradeMessage

src/main/java/io/bitsquare/trade/protocol/offerer/RespondToTakeOfferRequestMessage.java

@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.offerer;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class RespondToTakeOfferRequestMessage implements Serializable, TradeMessage

src/main/java/io/bitsquare/trade/protocol/taker/PayoutTxPublishedMessage.java

@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.taker;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class PayoutTxPublishedMessage implements Serializable, TradeMessage

src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java

@@ -1,7 +1,7 @@
 package io.bitsquare.trade.protocol.taker;
 
 import io.bitsquare.bank.BankAccount;
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 import java.security.PublicKey;
 

src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOfferMessage.java

@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.taker;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class RequestTakeOfferMessage implements Serializable, TradeMessage

src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java

@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.taker;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 import java.math.BigInteger;