Voomra/trader
Archived
0
Fork 0
Code Activity

fix edit route

Browse Source
This commit is contained in:
iMoHax
2014-11-27 10:53:10 +03:00
parent b673914852
commit eb713c340f
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/main/java/ru/trader/controllers/RouterController.java
View File

@@ -4,6 +4,8 @@ package ru.trader.controllers;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ListChangeListener; import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
import javafx.collections.transformation.SortedList;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.ComboBox; import javafx.scene.control.ComboBox;
@@ -56,7 +58,7 @@ public class RouterController {
private MarketModel market; private MarketModel market;
private PathRouteModel route; private PathRouteModel route;
private final List<OrderModel> orders = FXCollections.observableArrayList(); private final ObservableList<OrderModel> orders = FXCollections.observableArrayList();
@FXML @FXML
private void initialize(){ private void initialize(){
@@ -97,11 +99,11 @@ public class RouterController {
editBtn.disableProperty().bind(tblOrders.getSelectionModel().selectedIndexProperty().isEqualTo(-1)); editBtn.disableProperty().bind(tblOrders.getSelectionModel().selectedIndexProperty().isEqualTo(-1));
removeBtn.disableProperty().bind(Bindings.createBooleanBinding(()-> { removeBtn.disableProperty().bind(Bindings.createBooleanBinding(()-> {
int sel = tblOrders.getSelectionModel().getSelectedIndex(); int sel = tblOrders.getSelectionModel().getSelectedIndex();
return sel == -1 || sel != tblOrders.getItems().size()-1; return sel == -1 || sel != orders.size()-1;
}, tblOrders.getSelectionModel().selectedIndexProperty())); }, tblOrders.getSelectionModel().selectedIndexProperty()));
BindingsHelper.setTableViewItems(tblOrders, orders); tblOrders.setItems(orders);
tblOrders.getItems().addListener((ListChangeListener<OrderModel>) c -> { orders.addListener((ListChangeListener<OrderModel>) c -> {
while (c.next()) { while (c.next()) {
if (c.wasRemoved()) { if (c.wasRemoved()) {
c.getRemoved().forEach(this::onRemove); c.getRemoved().forEach(this::onRemove);
@@ -150,7 +152,7 @@ public class RouterController {
OrderModel order = Screeners.showOrders(market.getOrders(sel.getStation(), sel.getBuyer(), sel.getBalance())); OrderModel order = Screeners.showOrders(market.getOrders(sel.getStation(), sel.getBuyer(), sel.getBalance()));
if (order!=null){ if (order!=null){
tblOrders.getItems().set(index, order); orders.set(index, order);
} }
} }
@@ -164,13 +166,13 @@ public class RouterController {
} else { } else {
route = null; route = null;
} }
tblOrders.getItems().remove(index); orders.remove(index);
refreshPath(); refreshPath();
} }
} }
public void removeAll(){ public void removeAll(){
tblOrders.getItems().clear(); orders.clear();
totalBalance.setValue(balance.getValue()); totalBalance.setValue(balance.getValue());
totalProfit.setValue(0); totalProfit.setValue(0);
route = null; route = null;