From 24a0f6d165033fd6f36c8b1ca184551bafe4a2c0 Mon Sep 17 00:00:00 2001 From: iMoHax Date: Thu, 14 Apr 2016 13:58:30 +0300 Subject: [PATCH] remove not using controller --- .../trader/controllers/RouterController.java | 359 ------------------ client/src/main/resources/view/router.fxml | 124 ------ 2 files changed, 483 deletions(-) delete mode 100644 client/src/main/java/ru/trader/controllers/RouterController.java delete mode 100644 client/src/main/resources/view/router.fxml diff --git a/client/src/main/java/ru/trader/controllers/RouterController.java b/client/src/main/java/ru/trader/controllers/RouterController.java deleted file mode 100644 index 74d17c0..0000000 --- a/client/src/main/java/ru/trader/controllers/RouterController.java +++ /dev/null @@ -1,359 +0,0 @@ -package ru.trader.controllers; - - -import javafx.beans.binding.Bindings; -import javafx.collections.FXCollections; -import javafx.collections.ListChangeListener; -import javafx.collections.ObservableList; -import javafx.fxml.FXML; -import javafx.scene.control.*; -import ru.trader.Main; -import ru.trader.analysis.CrawlerSpecificator; -import ru.trader.model.*; -import ru.trader.model.support.ChangeMarketListener; -import ru.trader.view.support.NumberField; -import ru.trader.view.support.RouteNode; -import ru.trader.view.support.autocomplete.AutoCompletion; -import ru.trader.view.support.autocomplete.CachedSuggestionProvider; -import ru.trader.view.support.autocomplete.SystemsProvider; - -import java.util.Optional; - - -public class RouterController { - - @FXML - private NumberField balance; - @FXML - private NumberField cargo; - @FXML - private NumberField distance; - @FXML - private NumberField tank; - @FXML - private NumberField jumps; - - @FXML - private ScrollPane path; - - @FXML - private Button addBtn; - - @FXML - private Button editBtn; - - @FXML - private Button removeBtn; - - @FXML - private TextField sourceText; - private AutoCompletion source; - - @FXML - private ComboBox sStation; - - @FXML - private TextField targetText; - private AutoCompletion target; - - @FXML - private ComboBox tStation; - - @FXML - private TableView tblOrders; - - @FXML - private NumberField totalProfit; - - @FXML - private NumberField totalBalance; - - private MarketModel market; - private RouteModel route; - private final ObservableList orders = FXCollections.observableArrayList(); - - @FXML - private void initialize(){ - init(); - balance.numberProperty().addListener((ov, o, n) -> { - totalBalance.setValue(n); - Main.SETTINGS.setBalance(n.doubleValue()); - }); - cargo.numberProperty().addListener((ov, o, n) -> Main.SETTINGS.setCargo(n.intValue())); - tank.numberProperty().addListener((ov, o, n) -> Main.SETTINGS.setTank(n.doubleValue())); - jumps.numberProperty().addListener((ov, o, n) -> Main.SETTINGS.setJumps(n.intValue())); - source.valueProperty().addListener((ov, o, n) -> { - if (n != null) { - sStation.setItems(n.getStationNamesList()); - } else { - sStation.setItems(FXCollections.emptyObservableList()); - } - sStation.getSelectionModel().selectFirst(); - }); - target.valueProperty().addListener((ov, o, n) -> { - if (n != null) { - tStation.setItems(n.getStationNamesList()); - } else { - tStation.setItems(FXCollections.emptyObservableList()); - } - tStation.getSelectionModel().selectFirst(); - }); - - - balance.setOnAction((v)->cargo.requestFocus()); - cargo.setOnAction((v) -> tank.requestFocus()); - tank.setOnAction((v) -> distance.requestFocus()); - distance.setOnAction((v)->jumps.requestFocus()); - jumps.setOnAction((v)->balance.requestFocus()); - - balance.setValue(Main.SETTINGS.getBalance()); - cargo.setValue(Main.SETTINGS.getCargo()); - tank.setValue(Main.SETTINGS.getTank()); - jumps.setValue(Main.SETTINGS.getJumps()); - - addBtn.disableProperty().bind(Bindings.createBooleanBinding(()-> { - SystemModel system = target.getValue(); - return ModelFabric.isFake(system); - }, target.valueProperty())); - - editBtn.disableProperty().bind(tblOrders.getSelectionModel().selectedIndexProperty().isEqualTo(-1)); - removeBtn.disableProperty().bind(Bindings.createBooleanBinding(()-> { - int sel = tblOrders.getSelectionModel().getSelectedIndex(); - return sel == -1 || sel != orders.size()-1; - }, tblOrders.getSelectionModel().selectedIndexProperty())); - - tblOrders.setItems(orders); - orders.addListener((ListChangeListener) c -> { - while (c.next()) { - if (c.wasRemoved()) { - c.getRemoved().forEach(this::onRemove); - } - if (c.wasAdded()) { - c.getAddedSubList().forEach(this::onAdd); - } - } - }); - } - - - void init(){ - if (market != null){ - market.getNotificator().remove(routerChangeListener); - } - market = MainController.getMarket(); - market.getNotificator().add(routerChangeListener); - SystemsProvider provider = market.getSystemsProvider(); - if (source == null){ - source = new AutoCompletion<>(sourceText, new CachedSuggestionProvider<>(provider), ModelFabric.NONE_SYSTEM, provider.getConverter()); - } else { - source.setSuggestions(provider.getPossibleSuggestions()); - source.setConverter(provider.getConverter()); - } - if (target == null){ - target = new AutoCompletion<>(targetText, new CachedSuggestionProvider<>(provider), ModelFabric.NONE_SYSTEM, provider.getConverter()); - } else { - target.setSuggestions(provider.getPossibleSuggestions()); - target.setConverter(provider.getConverter()); - } - orders.clear(); - sStation.setValue(ModelFabric.NONE_STATION.getName()); - tStation.setValue(ModelFabric.NONE_STATION.getName()); - totalBalance.setValue(balance.getValue()); - totalProfit.setValue(0); - } - - - private void onAdd(OrderModel order){ - totalProfit.add(order.getProfit()); - totalBalance.add(order.getProfit()); - source.setValue(order.getBuyer().getSystem()); - sStation.setValue(order.getBuyer().getName()); - target.setValue(ModelFabric.NONE_SYSTEM); - balance.setDisable(true); - } - - private void onRemove(OrderModel order) { - totalProfit.sub(order.getProfit()); - totalBalance.sub(order.getProfit()); - source.setValue(order.getSystem()); - sStation.setValue(order.getStation().getName()); - target.setValue(ModelFabric.NONE_SYSTEM); - if (orders.isEmpty()) { - balance.setDisable(false); - } - } - - public void addStationToRoute(){ - SystemModel s = source.getValue(); - SystemModel t = target.getValue(); - StationModel sS = s != null ? s.get(sStation.getValue()) : ModelFabric.NONE_STATION; - StationModel tS = t != null ? t.get(tStation.getValue()) : ModelFabric.NONE_STATION; - RouteModel r = market.getPath(s, sS, t, tS); - if (r == null) return; - if (route != null){ - route = route.add(r); - } else { - route = r; - } - refreshPath(); - source.setValue(target.getValue()); - sStation.setValue(tS.getName()); - } - - public void editOrders(){ - OrderModel sel = tblOrders.getSelectionModel().getSelectedItem(); - int index = tblOrders.getSelectionModel().getSelectedIndex(); - //TODO: implement -/* market.getOrders(sel.getStation(), sel.getBuyer(), sel.getBalance(), result -> { - Optional order = Screeners.showOrders(result); - if (order.isPresent()){ - orders.set(index, order.get()); - } - - });*/ - } - - public void removeSelected(){ - TableView.TableViewSelectionModel select = tblOrders.getSelectionModel(); - if (!select.isEmpty()){ - int index = select.getSelectedIndex(); - if (index > 0){ - route = route.remove(select.getSelectedItem()); - } else { - route = null; - } - orders.remove(index); - refreshPath(); - } - } - - public void recompute(){ - if (route != null){ - //TODO: implement -/// route.recompute(balance.getValue().doubleValue(), cargo.getValue().longValue()); - orders.clear(); - orders.addAll(route.getOrders()); - refreshPath(); - } - } - - public void rebuild(){ - if (route != null){ - RouteModel r = market.getRoute(route); - if (r != null){ - route = r; - orders.clear(); - orders.addAll(route.getOrders()); - refreshPath(); - } else { - recompute(); - } - } - } - - public void removeAll(){ - orders.clear(); - totalBalance.setValue(balance.getValue()); - totalProfit.setValue(0); - route = null; - refreshPath(); - } - - - public void showTopOrders(){ - market.getTop(totalBalance.getValue().doubleValue(), result -> { - Optional order = Screeners.showOrders(result); - if (order.isPresent()){ - orders.add(order.get()); - addOrderToPath(order.get()); - } - }); - } - - public void showOrders(){ - SystemModel s = source.getValue(); - SystemModel t = target.getValue(); - StationModel sS = s != null ? s.get(sStation.getValue()) : ModelFabric.NONE_STATION; - StationModel tS = t != null ? t.get(tStation.getValue()) : ModelFabric.NONE_STATION; - market.getOrders(s, sS, t, tS, totalBalance.getValue().doubleValue(), result -> { - Optional order = Screeners.showOrders(result); - if (order.isPresent()){ - orders.add(order.get()); - addOrderToPath(order.get()); - } - }); - } - - public void showRoutes(){ - SystemModel s = source.getValue(); - SystemModel t = target.getValue(); - StationModel sS = s != null ? s.get(sStation.getValue()) : ModelFabric.NONE_STATION; - StationModel tS = t != null ? t.get(tStation.getValue()) : ModelFabric.NONE_STATION; - market.getRoutes(s, sS, t, tS, totalBalance.getValue().doubleValue(), new CrawlerSpecificator(), routes -> { - Optional path = Screeners.showRouters(routes); - if (path.isPresent()){ - orders.addAll(path.get().getOrders()); - addRouteToPath(path.get()); - } - }); - } - - public void showTopRoutes(){ - market.getTopRoutes(totalBalance.getValue().doubleValue(), routes -> { - Optional path = Screeners.showRouters(routes); - if (path.isPresent()){ - orders.addAll(path.get().getOrders()); - addRouteToPath(path.get()); - } - }); - } - - private void addRouteToPath(RouteModel route){ - if (this.route == null){ - this.route = route; - } else { - this.route = this.route.add(route); - } - refreshPath(); - } - - private void addOrderToPath(OrderModel order){ - if (route != null){ - route = route.add(order); - } else { - route = market.getPath(order); - } - refreshPath(); - } - - private void refreshPath(){ - MainController.getProfile().setRoute(route); - if (route != null) - path.setContent(new RouteNode(route).getNode()); - else - path.setContent(null); - } - - private final ChangeMarketListener routerChangeListener = new ChangeMarketListener() { - - @Override - public void add(StationModel station) { - if (station.getSystem().equals(source.getValue())){ - sStation.getItems().add(station.getName()); - } - if (station.getSystem().equals(target.getValue())){ - tStation.getItems().add(station.getName()); - } - } - - @Override - public void remove(StationModel station) { - if (station.getSystem().equals(source.getValue())){ - sStation.getItems().remove(station.getName()); - } - if (station.getSystem().equals(target.getValue())){ - tStation.getItems().remove(station.getName()); - } - } - }; -} diff --git a/client/src/main/resources/view/router.fxml b/client/src/main/resources/view/router.fxml deleted file mode 100644 index 14ace1c..0000000 --- a/client/src/main/resources/view/router.fxml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -