Voomra/trader
Archived
0
Fork 0
Code Activity

fix search station if source is null

Browse Source
This commit is contained in:
iMoHax
2015-11-12 15:01:12 +03:00
parent 9c6c04b3fb
commit 0f91d20037
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/ru/trader/controllers/SearchController.java
View File

@@ -113,7 +113,6 @@ public class SearchController {
@FXML @FXML
private void searchStations(){ private void searchStations(){
MarketFilter filter = new MarketFilter(); MarketFilter filter = new MarketFilter();
//TODO: set center = source
filter.setDistance(distance.getValue().doubleValue()); filter.setDistance(distance.getValue().doubleValue());
if (cbMarket.isSelected()) filter.add(SERVICE_TYPE.MARKET); else filter.remove(SERVICE_TYPE.MARKET); if (cbMarket.isSelected()) filter.add(SERVICE_TYPE.MARKET); else filter.remove(SERVICE_TYPE.MARKET);
if (cbBlackMarket.isSelected()) filter.add(SERVICE_TYPE.BLACK_MARKET); else filter.remove(SERVICE_TYPE.BLACK_MARKET); if (cbBlackMarket.isSelected()) filter.add(SERVICE_TYPE.BLACK_MARKET); else filter.remove(SERVICE_TYPE.BLACK_MARKET);
@@ -168,7 +167,8 @@ public class SearchController {
private ResultEntry(StationModel station, OfferModel offer) { private ResultEntry(StationModel station, OfferModel offer) {
this.station = station; this.station = station;
this.offer = offer; this.offer = offer;
this.distance = new SimpleDoubleProperty(source.getValue().getDistance(station.getSystem())); SystemModel system = source.getValue();
this.distance = new SimpleDoubleProperty(ModelFabric.isFake(system)? Double.NaN : system.getDistance(station.getSystem()));
} }
public SystemModel getSystem(){ public SystemModel getSystem(){