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

Fix sorting bug in open trades (#239)

Browse Source
This commit is contained in:
Manfred Karrer 2014-11-13 00:52:16 +01:00
parent 2d5f1fb0e6
commit f71d7c3bd4
5 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml
View File

@ -25,7 +25,7 @@
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="offersTab" text="Open offers" closable="false"/>
<Tab fx:id="pendingTradesTab" text="Open trades" closable="false"/>
<Tab fx:id="openTradesTab" text="Open trades" closable="false"/>
<Tab fx:id="closedTradesTab" text="History" closable="false"/>
</TabPane>

6
src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java
View File

@ -47,7 +47,7 @@ public class PortfolioViewCB extends CachedViewCB {
private Navigation.Listener navigationListener;
private ChangeListener<Tab> tabChangeListener;
@FXML Tab offersTab, pendingTradesTab, closedTradesTab;
@FXML Tab offersTab, openTradesTab, closedTradesTab;
///////////////////////////////////////////////////////////////////////////////////////////
@ -78,7 +78,7 @@ public class PortfolioViewCB extends CachedViewCB {
tabChangeListener = (ov, oldValue, newValue) -> {
if (newValue == offersTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.OFFERS);
else if (newValue == pendingTradesTab)
else if (newValue == openTradesTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO,
Navigation.Item.PENDING_TRADES);
else if (newValue == closedTradesTab)
@ -132,7 +132,7 @@ public class PortfolioViewCB extends CachedViewCB {
tab = offersTab;
break;
case PENDING_TRADES:
tab = pendingTradesTab;
tab = openTradesTab;
break;
case CLOSED_TRADES:
tab = closedTradesTab;

14
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
View File

@ -103,6 +103,8 @@ class PendingTradesModel extends UIModel {
list.add(new PendingTradesListItem(change.getValueAdded()));
else if (change.wasRemoved())
closedTrade = change.getValueRemoved();
sortList();
};
super.initialize();
@ -119,7 +121,7 @@ class PendingTradesModel extends UIModel {
tradeManager.getPendingTrades().addListener(mapChangeListener);
// we sort by date, earliest first
list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate()));
sortList();
// select either currentPendingTrade or first in the list
Optional<PendingTradesListItem> currentTradeItemOptional = list.stream()
@ -140,12 +142,6 @@ class PendingTradesModel extends UIModel {
selectTrade(null);
}
@SuppressWarnings("EmptyMethod")
@Override
public void terminate() {
super.terminate();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Methods
@ -327,5 +323,9 @@ class PendingTradesModel extends UIModel {
}
}
private void sortList() {
list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate()));
}
}

6
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
View File

@ -115,12 +115,6 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
model.tradeState.removeListener(stateChangeListener);
}
@SuppressWarnings("EmptyMethod")
@Override
public void terminate() {
super.terminate();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Methods

6
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
View File

@ -193,12 +193,6 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
presentationModel.state.removeListener(takerStateChangeListener);
}
@SuppressWarnings("EmptyMethod")
@Override
public void terminate() {
super.terminate();
}
///////////////////////////////////////////////////////////////////////////////////////////
// GUI handlers