diff --git a/client/src/main/java/ru/trader/model/MarketModel.java b/client/src/main/java/ru/trader/model/MarketModel.java index 3f943a3..a96169e 100644 --- a/client/src/main/java/ru/trader/model/MarketModel.java +++ b/client/src/main/java/ru/trader/model/MarketModel.java @@ -174,6 +174,10 @@ public class MarketModel { return BindingsHelper.observableList(analyzer.getVendors(filter), modeler::get); } + public ObservableList getSystems(MarketFilter filter){ + return BindingsHelper.observableList(analyzer.getSystems(filter), modeler::get); + } + public void getOrders(StationModel from, double balance, Consumer> result) { getOrders(ModelFabric.NONE_SYSTEM, from, ModelFabric.NONE_SYSTEM, ModelFabric.NONE_STATION, balance, result); } diff --git a/client/src/main/java/ru/trader/model/SystemModel.java b/client/src/main/java/ru/trader/model/SystemModel.java index dc512e5..17085dd 100644 --- a/client/src/main/java/ru/trader/model/SystemModel.java +++ b/client/src/main/java/ru/trader/model/SystemModel.java @@ -136,6 +136,10 @@ public class SystemModel { market.removeStation(station); } + public StationModel asTransit(){ + return asModel(system.asTransit()); + } + public boolean isEmpty(){ return system.isEmpty(); } diff --git a/core/src/main/java/ru/trader/core/MarketAnalyzer.java b/core/src/main/java/ru/trader/core/MarketAnalyzer.java index eb74d72..de6885c 100644 --- a/core/src/main/java/ru/trader/core/MarketAnalyzer.java +++ b/core/src/main/java/ru/trader/core/MarketAnalyzer.java @@ -43,6 +43,10 @@ public class MarketAnalyzer { return market.getVendors().filter(v -> !filter.isFiltered(v)).collect(Collectors.toList()); } + public List getSystems(MarketFilter filter){ + return market.get().filter(p -> !filter.isFiltered(p)).collect(Collectors.toList()); + } + public Collection getTop(int limit){ LOG.debug("Get top {}", limit); Collection places = getPlaces();