Archived
0

add size of landpad in services

This commit is contained in:
iMoHax
2014-12-01 17:30:10 +03:00
parent 70676f078f
commit 1abd9cb9df
7 changed files with 22 additions and 2 deletions

View File

@@ -53,6 +53,10 @@ public class OffersController {
private CheckBox cbOutfit; private CheckBox cbOutfit;
@FXML @FXML
private CheckBox cbShipyard; private CheckBox cbShipyard;
@FXML
private CheckBox cbMediumLandpad;
@FXML
private CheckBox cbLargeLandpad;
private final List<OfferModel> sells = FXCollections.observableArrayList(); private final List<OfferModel> sells = FXCollections.observableArrayList();
private final List<OfferModel> buys = FXCollections.observableArrayList(); private final List<OfferModel> buys = FXCollections.observableArrayList();
@@ -146,6 +150,8 @@ public class OffersController {
cbRepair.setSelected(station.hasService(SERVICE_TYPE.REPAIR)); cbRepair.setSelected(station.hasService(SERVICE_TYPE.REPAIR));
cbOutfit.setSelected(station.hasService(SERVICE_TYPE.OUTFIT)); cbOutfit.setSelected(station.hasService(SERVICE_TYPE.OUTFIT));
cbShipyard.setSelected(station.hasService(SERVICE_TYPE.SHIPYARD)); 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()); sells.addAll(station.getSells());
buys.addAll(station.getBuys()); buys.addAll(station.getBuys());
} }

View File

@@ -58,6 +58,10 @@ public class StationEditorController {
private CheckBox cbOutfit; private CheckBox cbOutfit;
@FXML @FXML
private CheckBox cbShipyard; private CheckBox cbShipyard;
@FXML
private CheckBox cbMediumLandpad;
@FXML
private CheckBox cbLargeLandpad;
private StationUpdater updater; private StationUpdater updater;
@@ -102,6 +106,8 @@ public class StationEditorController {
cbRepair.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.REPAIR)); cbRepair.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.REPAIR));
cbOutfit.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.OUTFIT)); cbOutfit.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.OUTFIT));
cbShipyard.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.SHIPYARD)); 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()); items.setItems(updater.getOffers());
} }

View File

@@ -4,6 +4,8 @@ services.REPAIR=Repair
services.MUNITION=Munition services.MUNITION=Munition
services.OUTFIT=Outfit services.OUTFIT=Outfit
services.SHIPYARD=Shipyard services.SHIPYARD=Shipyard
services.MEDIUM_LANDPAD=Medium Pad
services.LARGE_LANDPAD=Large Pad
item.group.chemicals=Chemicals item.group.chemicals=Chemicals
item.explosives=Explosives item.explosives=Explosives
item.hydrogenfuel=Hydrogen Fuels item.hydrogenfuel=Hydrogen Fuels

View File

@@ -43,13 +43,15 @@
<Label text="%offers.text.distance"/> <Label text="%offers.text.distance"/>
<Label fx:id="distance" minWidth="60"/> <Label fx:id="distance" minWidth="60"/>
<Label text="%offers.text.services"/> <Label text="%offers.text.services"/>
<HBox spacing="20"> <HBox spacing="15">
<CheckBox fx:id="cbMarket" text="%services.MARKET"/> <CheckBox fx:id="cbMarket" text="%services.MARKET"/>
<CheckBox fx:id="cbBlackMarket" text="%services.BLACK_MARKET"/> <CheckBox fx:id="cbBlackMarket" text="%services.BLACK_MARKET"/>
<CheckBox fx:id="cbRepair" text="%services.REPAIR"/> <CheckBox fx:id="cbRepair" text="%services.REPAIR"/>
<CheckBox fx:id="cbMunition" text="%services.MUNITION"/> <CheckBox fx:id="cbMunition" text="%services.MUNITION"/>
<CheckBox fx:id="cbOutfit" text="%services.OUTFIT"/> <CheckBox fx:id="cbOutfit" text="%services.OUTFIT"/>
<CheckBox fx:id="cbShipyard" text="%services.SHIPYARD"/> <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>
</HBox> </HBox>

View File

@@ -28,6 +28,8 @@
<CheckBox fx:id="cbMunition" text="%services.MUNITION"/> <CheckBox fx:id="cbMunition" text="%services.MUNITION"/>
<CheckBox fx:id="cbOutfit" text="%services.OUTFIT"/> <CheckBox fx:id="cbOutfit" text="%services.OUTFIT"/>
<CheckBox fx:id="cbShipyard" text="%services.SHIPYARD"/> <CheckBox fx:id="cbShipyard" text="%services.SHIPYARD"/>
<CheckBox fx:id="cbMediumLandpad" text="%services.MEDIUM_LANDPAD"/>
<CheckBox fx:id="cbLargeLandpad" text="%services.LARGE_LANDPAD"/>
</TilePane> </TilePane>
</VBox> </VBox>
</HBox> </HBox>

View File

@@ -1,5 +1,5 @@
package ru.trader.core; package ru.trader.core;
public enum SERVICE_TYPE { public enum SERVICE_TYPE {
MARKET, BLACK_MARKET, REPAIR, MUNITION, OUTFIT, SHIPYARD MARKET, BLACK_MARKET, REPAIR, MUNITION, OUTFIT, SHIPYARD, MEDIUM_LANDPAD, LARGE_LANDPAD
} }

View File

@@ -81,6 +81,8 @@
<xs:enumeration value="MUNITION"/> <xs:enumeration value="MUNITION"/>
<xs:enumeration value="OUTFIT"/> <xs:enumeration value="OUTFIT"/>
<xs:enumeration value="SHIPYARD"/> <xs:enumeration value="SHIPYARD"/>
<xs:enumeration value="MEDIUM_LANDPAD"/>
<xs:enumeration value="LARGE_LANDPAD"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>