Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 11:46:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix tx history update bug (#234)

Browse source
This commit is contained in:
Manfred Karrer 2014-11-13 02:00:40 +01:00
parent a86add2d9b
commit e459ce8419
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/io/bitsquare/gui/main/funds/FundsViewCB.java
View file

@ -44,6 +44,7 @@ public class FundsViewCB extends CachedViewCB {
private Navigation.Listener navigationListener; private Navigation.Listener navigationListener;
private ChangeListener<Tab> tabChangeListener; private ChangeListener<Tab> tabChangeListener;
private Tab currentTab;
@FXML Tab withdrawalTab, transactionsTab; @FXML Tab withdrawalTab, transactionsTab;
@ -103,12 +104,6 @@ public class FundsViewCB extends CachedViewCB {
navigation.removeListener(navigationListener); navigation.removeListener(navigationListener);
} }
@SuppressWarnings("EmptyMethod")
@Override
public void terminate() {
super.terminate();
}
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Navigation // Navigation
@ -118,19 +113,22 @@ public class FundsViewCB extends CachedViewCB {
protected Initializable loadView(Navigation.Item navigationItem) { protected Initializable loadView(Navigation.Item navigationItem) {
super.loadView(navigationItem); super.loadView(navigationItem);
// we want to get activate/deactivate called, so we remove the old view on tab change
if (currentTab != null)
currentTab.setContent(null);
final ViewLoader loader = new ViewLoader(navigationItem); final ViewLoader loader = new ViewLoader(navigationItem);
Node view = loader.load(); Node view = loader.load();
Tab tab = null;
switch (navigationItem) { switch (navigationItem) {
case WITHDRAWAL: case WITHDRAWAL:
tab = withdrawalTab; currentTab = withdrawalTab;
break; break;
case TRANSACTIONS: case TRANSACTIONS:
tab = transactionsTab; currentTab = transactionsTab;
break; break;
} }
tab.setContent(view); currentTab.setContent(view);
((TabPane) root).getSelectionModel().select(tab); ((TabPane) root).getSelectionModel().select(currentTab);
Initializable childController = loader.getController(); Initializable childController = loader.getController();
((ViewCB) childController).setParent(this); ((ViewCB) childController).setParent(this);

11
src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java
View file

@ -44,12 +44,11 @@ public class PortfolioViewCB extends CachedViewCB {
private final Navigation navigation; private final Navigation navigation;
private final TradeManager tradeManager; private final TradeManager tradeManager;
private Tab currentTab;
private Navigation.Listener navigationListener; private Navigation.Listener navigationListener;
private ChangeListener<Tab> tabChangeListener; private ChangeListener<Tab> tabChangeListener;
@FXML Tab offersTab, openTradesTab, closedTradesTab; @FXML Tab offersTab, openTradesTab, closedTradesTab;
private Parent currentView;
private Tab currentTab;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -125,14 +124,14 @@ public class PortfolioViewCB extends CachedViewCB {
@Override @Override
protected Initializable loadView(Navigation.Item navigationItem) { protected Initializable loadView(Navigation.Item navigationItem) {
super.loadView(navigationItem);
// we want to get activate/deactivate called, so we remove the old view on tab change // we want to get activate/deactivate called, so we remove the old view on tab change
if (currentTab != null) if (currentTab != null)
currentTab.setContent(null); currentTab.setContent(null);
super.loadView(navigationItem);
final ViewLoader loader = new ViewLoader(navigationItem); final ViewLoader loader = new ViewLoader(navigationItem);
currentView = loader.load(); Node view = loader.load();
switch (navigationItem) { switch (navigationItem) {
case OFFERS: case OFFERS:
currentTab = offersTab; currentTab = offersTab;
@ -144,7 +143,7 @@ public class PortfolioViewCB extends CachedViewCB {
currentTab = closedTradesTab; currentTab = closedTradesTab;
break; break;
} }
currentTab.setContent(currentView); currentTab.setContent(view);
((TabPane) root).getSelectionModel().select(currentTab); ((TabPane) root).getSelectionModel().select(currentTab);
Initializable childController = loader.getController(); Initializable childController = loader.getController();
((ViewCB) childController).setParent(this); ((ViewCB) childController).setParent(this);