From 1abd9cb9df5fb0885359e543cfa6c7fc631cce38 Mon Sep 17 00:00:00 2001
From: iMoHax <born19th@gmail.com>
Date: Mon, 1 Dec 2014 17:30:10 +0300
Subject: [PATCH] add size of landpad in services

---
 .../main/java/ru/trader/controllers/OffersController.java   | 6 ++++++
 .../java/ru/trader/controllers/StationEditorController.java | 6 ++++++
 client/src/main/resources/lang/locale.properties            | 2 ++
 client/src/main/resources/view/offers.fxml                  | 4 +++-
 client/src/main/resources/view/vEditor.fxml                 | 2 ++
 core/src/main/java/ru/trader/core/SERVICE_TYPE.java         | 2 +-
 core/src/main/resources/store/trader.xsd                    | 2 ++
 7 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/OffersController.java b/client/src/main/java/ru/trader/controllers/OffersController.java
index a72c1c9..670f532 100644
--- a/client/src/main/java/ru/trader/controllers/OffersController.java
+++ b/client/src/main/java/ru/trader/controllers/OffersController.java
@@ -53,6 +53,10 @@ public class OffersController {
     private CheckBox cbOutfit;
     @FXML
     private CheckBox cbShipyard;
+    @FXML
+    private CheckBox cbMediumLandpad;
+    @FXML
+    private CheckBox cbLargeLandpad;
 
     private final List<OfferModel> sells = FXCollections.observableArrayList();
     private final List<OfferModel> buys = FXCollections.observableArrayList();
@@ -146,6 +150,8 @@ public class OffersController {
             cbRepair.setSelected(station.hasService(SERVICE_TYPE.REPAIR));
             cbOutfit.setSelected(station.hasService(SERVICE_TYPE.OUTFIT));
             cbShipyard.setSelected(station.hasService(SERVICE_TYPE.SHIPYARD));
+            cbMediumLandpad.setSelected(station.hasService(SERVICE_TYPE.MEDIUM_LANDPAD));
+            cbLargeLandpad.setSelected(station.hasService(SERVICE_TYPE.LARGE_LANDPAD));
             sells.addAll(station.getSells());
             buys.addAll(station.getBuys());
         }
diff --git a/client/src/main/java/ru/trader/controllers/StationEditorController.java b/client/src/main/java/ru/trader/controllers/StationEditorController.java
index c48fea7..c3e3ed1 100644
--- a/client/src/main/java/ru/trader/controllers/StationEditorController.java
+++ b/client/src/main/java/ru/trader/controllers/StationEditorController.java
@@ -58,6 +58,10 @@ public class StationEditorController {
     private CheckBox cbOutfit;
     @FXML
     private CheckBox cbShipyard;
+    @FXML
+    private CheckBox cbMediumLandpad;
+    @FXML
+    private CheckBox cbLargeLandpad;
 
     private StationUpdater updater;
 
@@ -102,6 +106,8 @@ public class StationEditorController {
         cbRepair.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.REPAIR));
         cbOutfit.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.OUTFIT));
         cbShipyard.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.SHIPYARD));
+        cbMediumLandpad.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.MEDIUM_LANDPAD));
+        cbLargeLandpad.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.LARGE_LANDPAD));
         items.setItems(updater.getOffers());
     }
 
diff --git a/client/src/main/resources/lang/locale.properties b/client/src/main/resources/lang/locale.properties
index 54302c1..aa72907 100644
--- a/client/src/main/resources/lang/locale.properties
+++ b/client/src/main/resources/lang/locale.properties
@@ -4,6 +4,8 @@ services.REPAIR=Repair
 services.MUNITION=Munition
 services.OUTFIT=Outfit
 services.SHIPYARD=Shipyard
+services.MEDIUM_LANDPAD=Medium Pad
+services.LARGE_LANDPAD=Large Pad
 item.group.chemicals=Chemicals
 item.explosives=Explosives
 item.hydrogenfuel=Hydrogen Fuels
diff --git a/client/src/main/resources/view/offers.fxml b/client/src/main/resources/view/offers.fxml
index 79e18a7..a439ee3 100644
--- a/client/src/main/resources/view/offers.fxml
+++ b/client/src/main/resources/view/offers.fxml
@@ -43,13 +43,15 @@
             <Label text="%offers.text.distance"/>
             <Label fx:id="distance" minWidth="60"/>
             <Label text="%offers.text.services"/>
-            <HBox spacing="20">
+            <HBox spacing="15">
                 <CheckBox fx:id="cbMarket" text="%services.MARKET"/>
                 <CheckBox fx:id="cbBlackMarket" text="%services.BLACK_MARKET"/>
                 <CheckBox fx:id="cbRepair" text="%services.REPAIR"/>
                 <CheckBox fx:id="cbMunition" text="%services.MUNITION"/>
                 <CheckBox fx:id="cbOutfit" text="%services.OUTFIT"/>
                 <CheckBox fx:id="cbShipyard" text="%services.SHIPYARD"/>
+                <CheckBox fx:id="cbMediumLandpad" text="%services.MEDIUM_LANDPAD"/>
+                <CheckBox fx:id="cbLargeLandpad" text="%services.LARGE_LANDPAD"/>
             </HBox>
         </HBox>
 
diff --git a/client/src/main/resources/view/vEditor.fxml b/client/src/main/resources/view/vEditor.fxml
index cfc23be..f20e597 100644
--- a/client/src/main/resources/view/vEditor.fxml
+++ b/client/src/main/resources/view/vEditor.fxml
@@ -28,6 +28,8 @@
                 <CheckBox fx:id="cbMunition" text="%services.MUNITION"/>
                 <CheckBox fx:id="cbOutfit" text="%services.OUTFIT"/>
                 <CheckBox fx:id="cbShipyard" text="%services.SHIPYARD"/>
+                <CheckBox fx:id="cbMediumLandpad" text="%services.MEDIUM_LANDPAD"/>
+                <CheckBox fx:id="cbLargeLandpad" text="%services.LARGE_LANDPAD"/>
             </TilePane>
         </VBox>
     </HBox>
diff --git a/core/src/main/java/ru/trader/core/SERVICE_TYPE.java b/core/src/main/java/ru/trader/core/SERVICE_TYPE.java
index c3c548d..ae337af 100644
--- a/core/src/main/java/ru/trader/core/SERVICE_TYPE.java
+++ b/core/src/main/java/ru/trader/core/SERVICE_TYPE.java
@@ -1,5 +1,5 @@
 package ru.trader.core;
 
 public enum SERVICE_TYPE {
-    MARKET, BLACK_MARKET, REPAIR, MUNITION, OUTFIT, SHIPYARD
+    MARKET, BLACK_MARKET, REPAIR, MUNITION, OUTFIT, SHIPYARD, MEDIUM_LANDPAD, LARGE_LANDPAD
 }
diff --git a/core/src/main/resources/store/trader.xsd b/core/src/main/resources/store/trader.xsd
index 2641ee5..a930bd8 100644
--- a/core/src/main/resources/store/trader.xsd
+++ b/core/src/main/resources/store/trader.xsd
@@ -81,6 +81,8 @@
             <xs:enumeration value="MUNITION"/>
             <xs:enumeration value="OUTFIT"/>
             <xs:enumeration value="SHIPYARD"/>
+            <xs:enumeration value="MEDIUM_LANDPAD"/>
+            <xs:enumeration value="LARGE_LANDPAD"/>
         </xs:restriction>
     </xs:simpleType>