Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-03-15 10:26:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up orders package

Browse Source
This commit is contained in:
Manfred Karrer 2014-09-26 11:18:11 +02:00
parent 1130da6a8f
commit 33148a9a8a
14 changed files with 51 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/bitsquare/gui/main/orders/OrdersViewCB.java
View File

@ -145,12 +145,10 @@ public class OrdersViewCB extends CachedViewCB {
((ViewCB) childController).setParent(this);
} catch (IOException e) {
log.error("Loading view failed. FxmlUrl = " + Navigation.Item.ACCOUNT_SETUP.getFxmlUrl());
log.error("Loading view failed. FxmlUrl = " + navigationItem.getFxmlUrl());
e.printStackTrace();
}
return childController;
}
}

2
src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesModel.java
View File

@ -74,7 +74,7 @@ class ClosedTradesModel extends UIModel {
.forEach(e -> list.add(new ClosedTradesListItem(e)));
tradeManager.getClosedTrades().addListener(mapChangeListener);
// we sort by date
// We sort by date, earliest first
list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate()));
}

22
src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesPM.java
View File

@ -29,8 +29,10 @@ import org.slf4j.LoggerFactory;
class ClosedTradesPM extends PresentationModel<ClosedTradesModel> {
private static final Logger log = LoggerFactory.getLogger(ClosedTradesPM.class);
private final BSFormatter formatter;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
@ -42,6 +44,7 @@ class ClosedTradesPM extends PresentationModel<ClosedTradesModel> {
this.formatter = formatter;
}
///////////////////////////////////////////////////////////////////////////////////////////
// Lifecycle
///////////////////////////////////////////////////////////////////////////////////////////
@ -70,15 +73,15 @@ class ClosedTradesPM extends PresentationModel<ClosedTradesModel> {
super.terminate();
}
public ObservableList<ClosedTradesListItem> getList() {
return model.getList();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Getters
///////////////////////////////////////////////////////////////////////////////////////////
public ObservableList<ClosedTradesListItem> getList() {
return model.getList();
}
String getTradeId(ClosedTradesListItem item) {
return item.getTrade().getId();
}
@ -103,15 +106,4 @@ class ClosedTradesPM extends PresentationModel<ClosedTradesModel> {
return formatter.formatDateTime(item.getTrade().getDate());
}
///////////////////////////////////////////////////////////////////////////////////////////
// Setters
///////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////////////////////////////
}

1
src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java
View File

@ -36,7 +36,6 @@ import org.slf4j.LoggerFactory;
public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
private static final Logger log = LoggerFactory.getLogger(ClosedTradesViewCB.class);
@FXML TableColumn<ClosedTradesListItem, ClosedTradesListItem> priceColumn, amountColumn, volumeColumn,
directionColumn, dateColumn, tradeIdColumn;
@FXML TableView<ClosedTradesListItem> table;

4
src/main/java/io/bitsquare/gui/main/orders/offer/OffersModel.java
View File

@ -73,6 +73,10 @@ class OffersModel extends UIModel {
list.clear();
list.addAll(tradeManager.getOffers().values().stream().map(OfferListItem::new).collect(Collectors.toList()));
// we sort by date, earliest first
list.sort((o1, o2) -> o2.getOffer().getCreationDate().compareTo(o1.getOffer().getCreationDate()));
tradeManager.getOffers().addListener(offerMapChangeListener);
}

22
src/main/java/io/bitsquare/gui/main/orders/offer/OffersPM.java
View File

@ -29,8 +29,10 @@ import org.slf4j.LoggerFactory;
class OffersPM extends PresentationModel<OffersModel> {
private static final Logger log = LoggerFactory.getLogger(OffersPM.class);
private final BSFormatter formatter;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
@ -42,6 +44,7 @@ class OffersPM extends PresentationModel<OffersModel> {
this.formatter = formatter;
}
///////////////////////////////////////////////////////////////////////////////////////////
// Lifecycle
///////////////////////////////////////////////////////////////////////////////////////////
@ -70,10 +73,6 @@ class OffersPM extends PresentationModel<OffersModel> {
super.terminate();
}
public ObservableList<OfferListItem> getList() {
return model.getList();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Public methods
@ -88,6 +87,10 @@ class OffersPM extends PresentationModel<OffersModel> {
// Getters
///////////////////////////////////////////////////////////////////////////////////////////
public ObservableList<OfferListItem> getList() {
return model.getList();
}
String getTradeId(OfferListItem item) {
return item.getOffer().getId();
}
@ -112,15 +115,4 @@ class OffersPM extends PresentationModel<OffersModel> {
return formatter.formatDateTime(item.getOffer().getCreationDate());
}
///////////////////////////////////////////////////////////////////////////////////////////
// Setters
///////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////////////////////////////
}

1
src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java
View File

@ -37,7 +37,6 @@ import org.slf4j.LoggerFactory;
public class OffersViewCB extends CachedViewCB<OffersPM> {
private static final Logger log = LoggerFactory.getLogger(OffersViewCB.class);
@FXML TableColumn<OfferListItem, OfferListItem> priceColumn, amountColumn, volumeColumn,
directionColumn, dateColumn, offerIdColumn, removeItemColumn;
@FXML TableView<OfferListItem> table;

3
src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java
View File

@ -108,7 +108,7 @@ class PendingTradesModel extends UIModel {
.forEach(e -> list.add(new PendingTradesListItem(e)));
tradeManager.getPendingTrades().addListener(mapChangeListener);
// we sort by date
// we sort by date, earliest first
list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate()));
// select either currentPendingTrade or first in the list
@ -205,6 +205,7 @@ class PendingTradesModel extends UIModel {
}
}
///////////////////////////////////////////////////////////////////////////////////////////
// Getters
///////////////////////////////////////////////////////////////////////////////////////////

7
src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java
View File

@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
private static final Logger log = LoggerFactory.getLogger(PendingTradesPM.class);
private final BSFormatter formatter;
private InvalidationListener stateChangeListener;
enum State {
TAKER_SELLER_WAIT_TX_CONF,
@ -51,6 +49,10 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
OFFERER_BUYER_COMPLETED,
}
private final BSFormatter formatter;
private InvalidationListener stateChangeListener;
final StringProperty txId = new SimpleStringProperty();
final ObjectProperty<State> state = new SimpleObjectProperty<>();
final ObjectProperty<Throwable> fault = new SimpleObjectProperty<>();
@ -128,6 +130,7 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
model.closeSummary();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Getters
///////////////////////////////////////////////////////////////////////////////////////////

1
src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml
View File

@ -17,7 +17,6 @@
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
-->
<?import io.bitsquare.gui.components.InfoDisplay?>
<?import io.bitsquare.gui.components.processbar.ProcessStepBar?>
<?import io.bitsquare.gui.components.TextFieldWithCopyIcon?>

28
src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java
View File

@ -48,6 +48,13 @@ import org.slf4j.LoggerFactory;
public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
private static final Logger log = LoggerFactory.getLogger(PendingTradesViewCB.class);
private ChangeListener<PendingTradesListItem> selectedItemChangeListener;
private ListChangeListener<PendingTradesListItem> listChangeListener;
private ChangeListener<String> txIdChangeListener;
private ChangeListener<PendingTradesPM.State> offererStateChangeListener;
private ChangeListener<PendingTradesPM.State> takerStateChangeListener;
private ChangeListener<Throwable> faultChangeListener;
@FXML TitledGroupBg titledGroupBg, paymentsGroupBg, summaryGroupBg;
@FXML ProcessStepBar processBar;
@FXML Label statusLabel, txIdLabel, paymentMethodLabel, holderNameLabel, primaryIdLabel, secondaryIdLabel,
@ -61,12 +68,6 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
@FXML TableView<PendingTradesListItem> table;
@FXML TableColumn<PendingTradesListItem, PendingTradesListItem> priceColumn, amountColumn, volumeColumn,
directionColumn, dateColumn, tradeIdColumn, selectColumn;
private ChangeListener<PendingTradesListItem> selectedItemChangeListener;
private ListChangeListener<PendingTradesListItem> listChangeListener;
private ChangeListener<String> txIdChangeListener;
private ChangeListener<PendingTradesPM.State> offererStateChangeListener;
private ChangeListener<PendingTradesPM.State> takerStateChangeListener;
private ChangeListener<Throwable> faultChangeListener;
///////////////////////////////////////////////////////////////////////////////////////////
@ -99,15 +100,10 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
txIdTextField.setup(presentationModel.getWalletFacade(), newValue);
selectedItemChangeListener = (obsValue, oldValue, newValue) -> {
if (oldValue != newValue) {
if (oldValue != null && newValue != null)
presentationModel.selectTrade(newValue);
else if (newValue == null)
table.getSelectionModel().clearSelection();
}
else {
log.warn("should never happen!");
}
if (oldValue != null && newValue != null)
presentationModel.selectTrade(newValue);
else if (newValue == null)
table.getSelectionModel().clearSelection();
};
listChangeListener = change -> {
@ -578,7 +574,5 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
}
});
}
}

2
src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
View File

@ -20,7 +20,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsController"
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsViewCB"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">

15
src/main/java/io/bitsquare/gui/main/settings/SettingsController.java → src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java
View File

@ -31,8 +31,8 @@ import javafx.fxml.Initializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SettingsController extends CachedViewCB {
private static final Logger log = LoggerFactory.getLogger(SettingsController.class);
public class SettingsViewCB extends CachedViewCB {
private static final Logger log = LoggerFactory.getLogger(SettingsViewCB.class);
///////////////////////////////////////////////////////////////////////////////////////////
@ -40,28 +40,37 @@ public class SettingsController extends CachedViewCB {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public SettingsController() {
public SettingsViewCB() {
}
///////////////////////////////////////////////////////////////////////////////////////////
// Lifecycle
///////////////////////////////////////////////////////////////////////////////////////////
@SuppressWarnings("EmptyMethod")
@Override
public void initialize(URL url, ResourceBundle rb) {
super.initialize(url, rb);
}
@SuppressWarnings("EmptyMethod")
@Override
public void deactivate() {
super.deactivate();
}
@SuppressWarnings("EmptyMethod")
@Override
public void activate() {
super.activate();
}
@SuppressWarnings("EmptyMethod")
@Override
public void terminate() {
super.terminate();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Navigation

1
src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java
View File

@ -181,7 +181,6 @@ public class BuyerAcceptsOfferProtocol {
log.debug("onResultHandleTakeOfferRequest called " + step++);
if (takeOfferRequestAccepted) {
trade.setState(Trade.State.OFFERER_ACCEPTED);
messageFacade.removeOffer(offer);
listener.onOfferAccepted(offer);
listener.onWaitingForPeerResponse(state);
}