From 467f76fd76202bd64b01f499c3cb88ddedd9b2de Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Thu, 6 Nov 2014 15:20:05 +0100
Subject: [PATCH] Introduce io.bitsquare.offer.tomp2p package

---
 .../io/bitsquare/app/BitsquareModule.java     |  5 ++-
 .../java/io/bitsquare/offer/OfferModule.java  |  8 +++--
 .../offer/tomp2p/TomP2POfferModule.java       | 36 +++++++++++++++++++
 .../{ => tomp2p}/TomP2POfferRepository.java   |  4 ++-
 4 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferModule.java
 rename src/main/java/io/bitsquare/offer/{ => tomp2p}/TomP2POfferRepository.java (99%)

diff --git a/src/main/java/io/bitsquare/app/BitsquareModule.java b/src/main/java/io/bitsquare/app/BitsquareModule.java
index da11e8aa60..32312a5913 100644
--- a/src/main/java/io/bitsquare/app/BitsquareModule.java
+++ b/src/main/java/io/bitsquare/app/BitsquareModule.java
@@ -24,6 +24,7 @@ import io.bitsquare.gui.GuiModule;
 import io.bitsquare.msg.DefaultMessageModule;
 import io.bitsquare.msg.MessageModule;
 import io.bitsquare.offer.OfferModule;
+import io.bitsquare.offer.tomp2p.TomP2POfferModule;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.settings.Settings;
 import io.bitsquare.trade.TradeModule;
@@ -97,9 +98,7 @@ public class BitsquareModule extends AbstractBitsquareModule {
         return new TradeModule(properties);
     }
 
-    protected OfferModule offerModule() {
-        return new OfferModule(properties);
-    }
+    protected OfferModule offerModule() { return new TomP2POfferModule(properties); }
 
     protected GuiModule guiModule() {
         return new GuiModule(properties, primaryStage);
diff --git a/src/main/java/io/bitsquare/offer/OfferModule.java b/src/main/java/io/bitsquare/offer/OfferModule.java
index dc7b826183..47f500b5a3 100644
--- a/src/main/java/io/bitsquare/offer/OfferModule.java
+++ b/src/main/java/io/bitsquare/offer/OfferModule.java
@@ -21,14 +21,16 @@ import io.bitsquare.AbstractBitsquareModule;
 
 import java.util.Properties;
 
-public class OfferModule extends AbstractBitsquareModule {
+public abstract class OfferModule extends AbstractBitsquareModule {
 
-    public OfferModule(Properties properties) {
+    protected OfferModule(Properties properties) {
         super(properties);
     }
 
     @Override
     protected void configure() {
-        bind(OfferRepository.class).to(TomP2POfferRepository.class).asEagerSingleton();
+        bind(OfferRepository.class).to(offerRepository()).asEagerSingleton();
     }
+
+    protected abstract Class<? extends OfferRepository> offerRepository();
 }
diff --git a/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferModule.java b/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferModule.java
new file mode 100644
index 0000000000..e60ea70bfb
--- /dev/null
+++ b/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferModule.java
@@ -0,0 +1,36 @@
+/*
+ * 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.offer.tomp2p;
+
+import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.offer.OfferModule;
+import io.bitsquare.offer.OfferRepository;
+
+import java.util.Properties;
+
+public class TomP2POfferModule extends OfferModule {
+
+    public TomP2POfferModule(Properties properties) {
+        super(properties);
+    }
+
+    @Override
+    public Class<? extends OfferRepository> offerRepository() {
+        return TomP2POfferRepository.class;
+    }
+}
diff --git a/src/main/java/io/bitsquare/offer/TomP2POfferRepository.java b/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferRepository.java
similarity index 99%
rename from src/main/java/io/bitsquare/offer/TomP2POfferRepository.java
rename to src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferRepository.java
index 19fd758847..2f18103e56 100644
--- a/src/main/java/io/bitsquare/offer/TomP2POfferRepository.java
+++ b/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferRepository.java
@@ -15,9 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.offer;
+package io.bitsquare.offer.tomp2p;
 
 import io.bitsquare.msg.P2PNode;
+import io.bitsquare.offer.Offer;
+import io.bitsquare.offer.OfferRepository;
 import io.bitsquare.util.task.FaultHandler;
 import io.bitsquare.util.task.ResultHandler;