From cabfb4eb3e57f890c57183b4d2cc1e106d1835a5 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Mon, 9 Mar 2015 12:47:29 +0100
Subject: [PATCH] Refactor check if offer is available process

---
 .../bitsquare/trade/TradeMessageService.java  |  6 ++---
 .../trade/listeners/NewMessageListener.java   | 25 -------------------
 .../tomp2p/TomP2PTradeMessageService.java     | 14 +++++------
 3 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100644 gui/src/main/java/io/bitsquare/trade/listeners/NewMessageListener.java

diff --git a/gui/src/main/java/io/bitsquare/trade/TradeMessageService.java b/gui/src/main/java/io/bitsquare/trade/TradeMessageService.java
index 0bf9c29ca9..9255065573 100644
--- a/gui/src/main/java/io/bitsquare/trade/TradeMessageService.java
+++ b/gui/src/main/java/io/bitsquare/trade/TradeMessageService.java
@@ -21,7 +21,7 @@ import io.bitsquare.network.Message;
 import io.bitsquare.network.MessageBroker;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.listeners.GetPeerAddressListener;
-import io.bitsquare.trade.listeners.NewMessageListener;
+import io.bitsquare.trade.listeners.HandleNewMessageListener;
 import io.bitsquare.trade.listeners.SendMessageListener;
 
 import java.security.PublicKey;
@@ -34,9 +34,9 @@ public interface TradeMessageService extends MessageBroker {
 
     void sendMessage(Peer peer, Message message, SendMessageListener listener);
 
-    void addHandleNewMessageListener(NewMessageListener listener);
+    void addHandleNewMessageListener(HandleNewMessageListener listener);
 
-    void removeHandleNewMessageListener(NewMessageListener listener);
+    void removeHandleNewMessageListener(HandleNewMessageListener listener);
 
     void getPeerAddress(PublicKey messagePublicKey, GetPeerAddressListener getPeerAddressListener);
 }
diff --git a/gui/src/main/java/io/bitsquare/trade/listeners/NewMessageListener.java b/gui/src/main/java/io/bitsquare/trade/listeners/NewMessageListener.java
deleted file mode 100644
index c8a4e055dc..0000000000
--- a/gui/src/main/java/io/bitsquare/trade/listeners/NewMessageListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is part of Bitsquare.
- *
- * Bitsquare is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.bitsquare.trade.listeners;
-
-import io.bitsquare.network.Message;
-import io.bitsquare.network.Peer;
-
-public interface NewMessageListener {
-    void handleMessage(Message message, Peer sender);
-}
diff --git a/gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java b/gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
index 5ae1e4fb88..f6f990c992 100644
--- a/gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
+++ b/gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
@@ -23,7 +23,7 @@ import io.bitsquare.network.tomp2p.TomP2PNode;
 import io.bitsquare.network.tomp2p.TomP2PPeer;
 import io.bitsquare.trade.TradeMessageService;
 import io.bitsquare.trade.listeners.GetPeerAddressListener;
-import io.bitsquare.trade.listeners.NewMessageListener;
+import io.bitsquare.trade.listeners.HandleNewMessageListener;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.user.User;
 
@@ -58,7 +58,7 @@ public class TomP2PTradeMessageService implements TradeMessageService {
 
     private final TomP2PNode tomP2PNode;
     private final User user;
-    private final List<NewMessageListener> newMessageListeners = new ArrayList<>();
+    private final List<HandleNewMessageListener> handleNewMessageListeners = new ArrayList<>();
     private Executor executor;
 
 
@@ -133,12 +133,12 @@ public class TomP2PTradeMessageService implements TradeMessageService {
     // Event Listeners
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void addHandleNewMessageListener(NewMessageListener listener) {
-        newMessageListeners.add(listener);
+    public void addHandleNewMessageListener(HandleNewMessageListener listener) {
+        handleNewMessageListeners.add(listener);
     }
 
-    public void removeHandleNewMessageListener(NewMessageListener listener) {
-        newMessageListeners.remove(listener);
+    public void removeHandleNewMessageListener(HandleNewMessageListener listener) {
+        handleNewMessageListeners.remove(listener);
     }
 
 
@@ -149,7 +149,7 @@ public class TomP2PTradeMessageService implements TradeMessageService {
     @Override
     public void handleMessage(Object message, Peer sender) {
         if (message instanceof Message && sender instanceof TomP2PPeer) {
-            executor.execute(() -> newMessageListeners.stream().forEach(e ->
+            executor.execute(() -> handleNewMessageListeners.stream().forEach(e ->
                     e.handleMessage((Message) message, sender)));
         }
     }