From 22443900a9792f5fff3b89b914af263e4696c1db Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 22 Nov 2014 20:56:06 +0100 Subject: [PATCH] Remove CloseListener --- .../java/io/bitsquare/gui/CloseListener.java | 22 ------------------- .../bitsquare/gui/main/trade/TradeView.java | 4 ++-- .../trade/createoffer/CreateOfferView.java | 16 +------------- .../main/trade/takeoffer/TakeOfferView.java | 16 +------------- 4 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 src/main/java/io/bitsquare/gui/CloseListener.java diff --git a/src/main/java/io/bitsquare/gui/CloseListener.java b/src/main/java/io/bitsquare/gui/CloseListener.java deleted file mode 100644 index e20cea8ab9..0000000000 --- a/src/main/java/io/bitsquare/gui/CloseListener.java +++ /dev/null @@ -1,22 +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 . - */ - -package io.bitsquare.gui; - -public interface CloseListener { - void onClosed(); -} diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java index 53acded3b9..fb0ed2b82f 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java @@ -177,7 +177,7 @@ public class TradeView extends ActivatableView implements TradeNavigator { createOfferViewCB.setParent(this); createOfferViewCB.initWithData(direction, amount, price); final Tab tab = new Tab("Create offer"); - createOfferViewCB.configCloseHandlers(this::onCreateOfferViewRemoved, tab.closableProperty()); + createOfferViewCB.configCloseHandlers(tab.closableProperty()); tab.setContent(createOfferView); tabPane.getTabs().add(tab); tabPane.getSelectionModel().select(tab); @@ -193,7 +193,7 @@ public class TradeView extends ActivatableView implements TradeNavigator { takeOfferViewCB.setParent(this); takeOfferViewCB.initWithData(direction, amount, offer); final Tab tab = new Tab("Take offer"); - takeOfferViewCB.setCloseListener(this::onCreateOfferViewRemoved, tab.closableProperty()); + takeOfferViewCB.configCloseHandlers(tab.closableProperty()); tab.setContent(takeOfferView); tabPane.getTabs().add(tab); tabPane.getSelectionModel().select(tab); diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java index 469be18d87..a99fd75f26 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java @@ -18,7 +18,6 @@ package io.bitsquare.gui.main.trade.createoffer; import io.bitsquare.gui.ActivatableView; -import io.bitsquare.gui.CloseListener; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.AddressTextField; @@ -80,7 +79,6 @@ public class CreateOfferView extends ActivatableView { private final Navigation navigation; private final OverlayManager overlayManager; - private CloseListener closeListener; private BooleanProperty tabIsClosable; private boolean detailsVisible; @@ -145,17 +143,6 @@ public class CreateOfferView extends ActivatableView { tabIsClosable.unbind(); } - @Override - public void terminate() { - super.terminate(); - - // Inform parent that we got removed. - // Needed to reset disable state of createOfferButton in OfferBookController - if (closeListener != null) - closeListener.onClosed(); - } - - /////////////////////////////////////////////////////////////////////////////////////////// // Public methods (called form other views/CB) /////////////////////////////////////////////////////////////////////////////////////////// @@ -169,8 +156,7 @@ public class CreateOfferView extends ActivatableView { imageView.setId("image-sell-large"); } - public void configCloseHandlers(CloseListener closeListener, BooleanProperty tabIsClosable) { - this.closeListener = closeListener; + public void configCloseHandlers(BooleanProperty tabIsClosable) { this.tabIsClosable = tabIsClosable; tabIsClosable.bind(model.tabIsClosable); } diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java index 04ec1f5c52..41ba7aee81 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java @@ -19,7 +19,6 @@ package io.bitsquare.gui.main.trade.takeoffer; import io.bitsquare.gui.ActivatableView; -import io.bitsquare.gui.CloseListener; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.AddressTextField; @@ -74,7 +73,6 @@ public class TakeOfferView extends ActivatableView { private final Navigation navigation; private final OverlayManager overlayManager; - private CloseListener closeListener; private BooleanProperty tabIsClosable; private boolean detailsVisible; @@ -133,16 +131,6 @@ public class TakeOfferView extends ActivatableView { setupBindings(); } - @Override - public void terminate() { - super.terminate(); - - // Inform parent that we got removed. - if (closeListener != null) - closeListener.onClosed(); - } - - /////////////////////////////////////////////////////////////////////////////////////////// // Public methods (called form other views/CB) /////////////////////////////////////////////////////////////////////////////////////////// @@ -177,13 +165,11 @@ public class TakeOfferView extends ActivatableView { acceptedArbitratorsTextField.setText(model.getAcceptedArbitrators()); } - public void setCloseListener(CloseListener closeListener, BooleanProperty tabIsClosable) { - this.closeListener = closeListener; + public void configCloseHandlers(BooleanProperty tabIsClosable) { this.tabIsClosable = tabIsClosable; tabIsClosable.bind(model.tabIsClosable); } - /////////////////////////////////////////////////////////////////////////////////////////// // UI Handlers ///////////////////////////////////////////////////////////////////////////////////////////