From 1a4839b7bddac7b54e1d456b012172b2219bc6cc Mon Sep 17 00:00:00 2001 From: iMoHax Date: Fri, 17 Apr 2015 14:48:33 +0300 Subject: [PATCH] remove don't used controllers --- client/src/main/java/ru/trader/Main.java | 2 - .../controllers/ItemEditorController.java | 4 - .../controllers/OffersEditorController.java | 63 ----------- .../trader/controllers/OrdersController.java | 106 ------------------ .../resources/lang/locale_en_US.properties | 7 -- .../resources/lang/locale_ru_RU.properties | 7 -- client/src/main/resources/view/oEditor.fxml | 16 --- client/src/main/resources/view/orders.fxml | 75 ------------- 8 files changed, 280 deletions(-) delete mode 100644 client/src/main/java/ru/trader/controllers/ItemEditorController.java delete mode 100644 client/src/main/java/ru/trader/controllers/OffersEditorController.java delete mode 100644 client/src/main/java/ru/trader/controllers/OrdersController.java delete mode 100644 client/src/main/resources/view/oEditor.fxml delete mode 100644 client/src/main/resources/view/orders.fxml diff --git a/client/src/main/java/ru/trader/Main.java b/client/src/main/java/ru/trader/Main.java index 9aae5d8..c4e944c 100644 --- a/client/src/main/java/ru/trader/Main.java +++ b/client/src/main/java/ru/trader/Main.java @@ -91,8 +91,6 @@ public class Main extends Application { private static void loadResources() throws IOException { Screeners.loadItemDescStage(getUrl(("itemDesc.fxml"))); Screeners.loadVEditorStage(getUrl(("vEditor.fxml"))); - Screeners.loadAddOfferStage(getUrl(("oEditor.fxml"))); - Screeners.loadOrdersStage(getUrl(("orders.fxml"))); Screeners.loadTopOrdersStage(getUrl(("topOrders.fxml"))); Screeners.loadPathsStage(getUrl(("paths.fxml"))); Screeners.loadSettingsStage(getUrl(("settings.fxml"))); diff --git a/client/src/main/java/ru/trader/controllers/ItemEditorController.java b/client/src/main/java/ru/trader/controllers/ItemEditorController.java deleted file mode 100644 index dc365e5..0000000 --- a/client/src/main/java/ru/trader/controllers/ItemEditorController.java +++ /dev/null @@ -1,4 +0,0 @@ -package ru.trader.controllers; - -public class ItemEditorController { -} diff --git a/client/src/main/java/ru/trader/controllers/OffersEditorController.java b/client/src/main/java/ru/trader/controllers/OffersEditorController.java deleted file mode 100644 index b83007e..0000000 --- a/client/src/main/java/ru/trader/controllers/OffersEditorController.java +++ /dev/null @@ -1,63 +0,0 @@ -package ru.trader.controllers; - -import javafx.fxml.FXML; -import javafx.scene.Parent; -import javafx.scene.control.Label; -import org.controlsfx.control.ButtonBar; -import org.controlsfx.control.action.Action; -import org.controlsfx.dialog.Dialog; -import org.controlsfx.dialog.DialogAction; -import ru.trader.model.ItemModel; -import ru.trader.view.support.NumberField; - -import java.util.Optional; - -public class OffersEditorController { - private final Action OK = new DialogAction("OK", ButtonBar.ButtonType.OK_DONE, false, true, false); - - - @FXML - private Label name; - - @FXML - private NumberField sell; - - @FXML - private NumberField buy; - - - public Optional showDialog(Parent parent, Parent content, ItemModel item, Number sell, Number buy) { - name.setText(item.getName()); - - this.sell.setValue(sell); - this.buy.setValue(buy); - - OK.disabledProperty().bind(this.sell.wrongProperty().or(this.buy.wrongProperty())); - - Dialog dlg = new Dialog(parent, "Создание заказов"); - dlg.setContent(content); - dlg.getActions().addAll(OK, Dialog.ACTION_CANCEL); - dlg.setResizable(false); - return Optional.ofNullable(dlg.show() == OK ? new DialogResult() : null); - } - - - public class DialogResult { - - private double _sell; - private double _buy; - - public DialogResult() { - _sell = sell.getValue().doubleValue(); - _buy = buy.getValue().doubleValue(); - } - - public double getSell() { - return _sell; - } - - public double getBuy() { - return _buy; - } - } -} diff --git a/client/src/main/java/ru/trader/controllers/OrdersController.java b/client/src/main/java/ru/trader/controllers/OrdersController.java deleted file mode 100644 index 65b9e4a..0000000 --- a/client/src/main/java/ru/trader/controllers/OrdersController.java +++ /dev/null @@ -1,106 +0,0 @@ -package ru.trader.controllers; - -import javafx.beans.property.SimpleDoubleProperty; -import javafx.collections.FXCollections; -import javafx.fxml.FXML; -import javafx.scene.Parent; -import javafx.scene.control.TableColumn; -import javafx.scene.control.TableView; -import javafx.scene.control.cell.TextFieldTableCell; -import javafx.util.converter.LongStringConverter; -import org.controlsfx.control.ButtonBar; -import org.controlsfx.control.action.Action; -import org.controlsfx.dialog.Dialog; -import org.controlsfx.dialog.DialogAction; -import ru.trader.model.OfferModel; -import ru.trader.model.OrderModel; -import ru.trader.model.support.BindingsHelper; -import ru.trader.view.support.Localization; - -import java.util.Collection; -import java.util.List; - -import static java.util.stream.Collectors.toList; - -public class OrdersController { - private final Action OK = new DialogAction("OK", ButtonBar.ButtonType.OK_DONE, false, true, false); - - @FXML - private TableView tblOrders; - - @FXML - private TableView tblBuyers; - - @FXML - private TableColumn count; - - @FXML - private TableColumn maxCount; - - @FXML - private TableColumn curProfit; - - @FXML - private TableColumn curDistance; - - private final List orders = FXCollections.observableArrayList(); - private final List buyers = FXCollections.observableArrayList(); - private OrderModel order; - - @FXML - private void initialize() { - count.setCellFactory(TextFieldTableCell.forTableColumn(new LongStringConverter())); - maxCount.setCellFactory(TextFieldTableCell.forTableColumn(new LongStringConverter())); - tblOrders.getSelectionModel().selectedItemProperty().addListener((v, o, n) -> changeOrder(n)); - tblBuyers.getSelectionModel().selectedItemProperty().addListener((v, o, n) -> setBuyer(n)); - curProfit.setCellValueFactory(param -> { - OfferModel offer = param.getValue(); - return order !=null ? order.getProfit(offer) : new SimpleDoubleProperty(Double.NaN); - }); - curDistance.setCellValueFactory(param -> { - OfferModel offer = param.getValue(); - return new SimpleDoubleProperty(order !=null ? order.getStation().getDistance(offer.getStation()) :Double.NaN).asObject(); - }); - BindingsHelper.setTableViewItems(tblOrders, orders); - BindingsHelper.setTableViewItems(tblBuyers, buyers); - - } - - - public Collection showDialog(Parent parent, Parent content, Collection offers, double balance, long max) { - - init(offers, balance, max); - - Dialog dlg = new Dialog(parent, Localization.getString("orders.title")); - dlg.setContent(content); - dlg.getActions().addAll(OK, Dialog.ACTION_CANCEL); - dlg.setResizable(false); - Collection res = dlg.show() == OK ? getOrders() : null; - orders.clear(); - return res; - } - - private List getOrders() { - return orders.stream().filter(o -> o.getCount() > 0 && o.getBuyOffer() != null).collect(toList()); - } - - private void init(Collection offers, double balance, long max) { - orders.clear(); - offers.forEach(o -> orders.add(new OrderModel(o, balance, max))); - } - - private void changeOrder(OrderModel order) { - this.order = order; - buyers.clear(); - if (order != null) buyers.addAll(order.getBuyers()); - tblBuyers.getSelectionModel().clearSelection(); - } - - private void setBuyer(OfferModel offer) { - if (order != null && offer!=null) { - order.setBuyOffer(offer); - order.setCount(order.getMax()); - } - } - -} \ No newline at end of file diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties index 31999cb..8dfe775 100644 --- a/client/src/main/resources/lang/locale_en_US.properties +++ b/client/src/main/resources/lang/locale_en_US.properties @@ -81,19 +81,12 @@ dialog.group.type=Type: itemDesc.sellers=Sellers: itemDesc.buyers=Buyers: -# oEditor.fxml -oEditor.sell=Sell: -oEditor.buy=Buy: - # offers.fxml offers.text.distance=Distance: offers.text.services=Services: offers.pane.sell=Selling commodities offers.pane.buy=Buying commodities -# orders.fxml -orders.title=Create orders - # topOrders.fxml topOrders.title=TOP orders diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties index 10bd82b..3ea5c3a 100644 --- a/client/src/main/resources/lang/locale_ru_RU.properties +++ b/client/src/main/resources/lang/locale_ru_RU.properties @@ -82,19 +82,12 @@ dialog.group.type=\u0422\u0438\u043F: itemDesc.sellers=\u041F\u0440\u043E\u0434\u0430\u0432\u0446\u044B: itemDesc.buyers=\u041F\u043E\u043A\u0443\u043F\u0430\u0442\u0435\u043B\u0438: -# oEditor.fxml -oEditor.sell=\u041F\u0440\u043E\u0434\u0430\u0436\u0430: -oEditor.buy=\u041F\u043E\u043A\u0443\u043F\u043A\u0430: - # offers.fxml offers.text.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F: offers.text.services=\u0421\u0435\u0440\u0432\u0438\u0441\u044B: offers.pane.sell=\u041F\u0440\u043E\u0434\u0430\u0432\u0430\u0435\u043C\u044B\u0435 \u0442\u043E\u0432\u0430\u0440\u044B offers.pane.buy=\u041F\u043E\u043A\u0443\u043F\u0430\u0435\u043C\u044B\u0435 \u0442\u043E\u0432\u0430\u0440\u044B -# orders.fxml -orders.title=\u0421\u043E\u0437\u0434\u0430\u043D\u0438\u0435 \u0437\u0430\u043A\u0430\u0437\u043E\u0432 - # topOrders.fxml topOrders.title=TOP \u0437\u0430\u043A\u0430\u0437\u043E\u0432 diff --git a/client/src/main/resources/view/oEditor.fxml b/client/src/main/resources/view/oEditor.fxml deleted file mode 100644 index 2320fa1..0000000 --- a/client/src/main/resources/view/oEditor.fxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - diff --git a/client/src/main/resources/view/orders.fxml b/client/src/main/resources/view/orders.fxml deleted file mode 100644 index 78e4962..0000000 --- a/client/src/main/resources/view/orders.fxml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -