From c071b327a986da6342819eed05ba33fe136e62f5 Mon Sep 17 00:00:00 2001
From: iMoHax <born19th@gmail.com>
Date: Thu, 17 Mar 2016 14:33:01 +0300
Subject: [PATCH] add remove route entry button

---
 .../trader/controllers/RouteTrackController.java  |  7 +++++++
 .../src/main/java/ru/trader/model/RouteModel.java |  6 ++++++
 client/src/main/resources/view/routeTrack.fxml    | 15 ++++++++-------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/RouteTrackController.java b/client/src/main/java/ru/trader/controllers/RouteTrackController.java
index 532d447..e3e00f3 100644
--- a/client/src/main/java/ru/trader/controllers/RouteTrackController.java
+++ b/client/src/main/java/ru/trader/controllers/RouteTrackController.java
@@ -291,6 +291,13 @@ public class RouteTrackController {
         }
     }
 
+    @FXML
+    private void removeLast(){
+        if (route != null && route.getJumps() > 0){
+            updateRoute(route.dropLast());
+        }
+    }
+
     @FXML
     private void addOrder(){
         if (route != null){
diff --git a/client/src/main/java/ru/trader/model/RouteModel.java b/client/src/main/java/ru/trader/model/RouteModel.java
index 16fb997..d854635 100644
--- a/client/src/main/java/ru/trader/model/RouteModel.java
+++ b/client/src/main/java/ru/trader/model/RouteModel.java
@@ -204,6 +204,12 @@ public class RouteModel {
         return copyFill(res, offset);
     }
 
+    public RouteModel dropLast(){
+        Route res = Route.clone(_route);
+        res.dropTo(entries.size()-2);
+        return copyFill(res, entries.size()-2);
+    }
+
     public RouteModel remove(OrderModel order) {
         Route res = Route.clone(_route);
         res.dropTo(ModelFabric.get(order.getStation()));
diff --git a/client/src/main/resources/view/routeTrack.fxml b/client/src/main/resources/view/routeTrack.fxml
index 39efc0b..6f57613 100644
--- a/client/src/main/resources/view/routeTrack.fxml
+++ b/client/src/main/resources/view/routeTrack.fxml
@@ -65,14 +65,15 @@
     <ScrollPane GridPane.rowIndex="0" GridPane.columnIndex="3" GridPane.rowSpan="5" GridPane.fillHeight="true">
         <VBox>
             <AnchorPane fx:id="track"/>
-            <VBox>
-                <HBox><TextField fx:id="newEntrySystemText"/><Button minWidth="30" onAction="#newEntryAsCurrent"><graphic><Glyph text="FontAwesome|MAP_MARKER"/></graphic></Button></HBox>
+            <VBox spacing="4">
+                <HBox spacing="2"><TextField fx:id="newEntrySystemText"/><Button minWidth="30" onAction="#newEntryAsCurrent"><graphic><Glyph text="FontAwesome|MAP_MARKER"/></graphic></Button></HBox>
                 <HBox><ComboBox fx:id="newEntryStation"/></HBox>
-                <HBox>
-                    <Button onAction="#addEntry"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
-                    <Button onAction="#setActive"><graphic><Glyph text="FontAwesome|CHECK"/></graphic></Button>
-                    <Button onAction="#clear"><graphic><Glyph text="FontAwesome|TRASH"/></graphic></Button>
-                    <Button onAction="#copyToClipboard"><graphic><Glyph text="FontAwesome|COPY"/></graphic></Button>
+                <HBox spacing="2">
+                    <Button prefWidth="30" onAction="#addEntry"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
+                    <Button prefWidth="30" onAction="#removeLast"><graphic><Glyph text="FontAwesome|MINUS"/></graphic></Button>
+                    <Button prefWidth="30" onAction="#clear"><graphic><Glyph text="FontAwesome|TRASH"/></graphic></Button>
+                    <Button prefWidth="30" onAction="#copyToClipboard"><graphic><Glyph text="FontAwesome|COPY"/></graphic></Button>
+                    <Button prefWidth="30" onAction="#setActive"><graphic><Glyph text="FontAwesome|CHECK"/></graphic></Button>
                 </HBox>
             </VBox>
         </VBox>