From 964c4ada9ee05069129c41d317cbd1e342b0c630 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 11 Sep 2014 02:09:21 +0200
Subject: [PATCH] Resolve cyclic package dependencies in trade package

---
 .../gui/main/trade/{orderbook => }/OrderBookFilter.java         | 2 +-
 .../io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java  | 2 +-
 .../bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java | 2 +-
 .../java/io/bitsquare/gui/main/trade/orderbook/OrderBook.java   | 1 +
 .../bitsquare/gui/main/trade/orderbook/OrderBookController.java | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename src/main/java/io/bitsquare/gui/main/trade/{orderbook => }/OrderBookFilter.java (97%)

diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookFilter.java b/src/main/java/io/bitsquare/gui/main/trade/OrderBookFilter.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookFilter.java
rename to src/main/java/io/bitsquare/gui/main/trade/OrderBookFilter.java
index d21061f6d5..f91fe5b806 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookFilter.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/OrderBookFilter.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade.orderbook;
+package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.trade.Direction;
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java
index 972487cff7..eb0abb1fe3 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java
@@ -19,7 +19,7 @@ package io.bitsquare.gui.main.trade.createoffer;
 
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.main.trade.orderbook.OrderBookFilter;
+import io.bitsquare.gui.main.trade.OrderBookFilter;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcValidator;
 import io.bitsquare.gui.util.validation.FiatValidator;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
index 024a508063..b5171f5238 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
@@ -28,7 +28,7 @@ import io.bitsquare.gui.components.btc.AddressTextField;
 import io.bitsquare.gui.components.btc.BalanceTextField;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.main.trade.orderbook.OrderBookFilter;
+import io.bitsquare.gui.main.trade.OrderBookFilter;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.locale.BSResources;
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBook.java b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBook.java
index 7641482d85..77d8bd9349 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBook.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBook.java
@@ -19,6 +19,7 @@ package io.bitsquare.gui.main.trade.orderbook;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.bank.BankAccount;
+import io.bitsquare.gui.main.trade.OrderBookFilter;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.msg.MessageFacade;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java
index 60ddd5c4f9..45788cca25 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java
@@ -26,6 +26,7 @@ import io.bitsquare.gui.NavigationItem;
 import io.bitsquare.gui.OverlayController;
 import io.bitsquare.gui.ViewController;
 import io.bitsquare.gui.components.Popups;
+import io.bitsquare.gui.main.trade.OrderBookFilter;
 import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB;
 import io.bitsquare.gui.main.trade.takeoffer.TakeOfferController;
 import io.bitsquare.gui.util.BSFormatter;