Voomra/trader
Archived
0
Fork 0
Code Activity

implement search systems by filter

Browse Source
This commit is contained in:
Mo
2016-01-10 20:09:46 +03:00
parent da689e1d3a
commit 745aacfb41
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/ru/trader/model/MarketModel.java
View File

@@ -174,6 +174,10 @@ public class MarketModel {
return BindingsHelper.observableList(analyzer.getVendors(filter), modeler::get); return BindingsHelper.observableList(analyzer.getVendors(filter), modeler::get);
} }
public ObservableList<SystemModel> getSystems(MarketFilter filter){
return BindingsHelper.observableList(analyzer.getSystems(filter), modeler::get);
}
public void getOrders(StationModel from, double balance, Consumer<ObservableList<OrderModel>> result) { public void getOrders(StationModel from, double balance, Consumer<ObservableList<OrderModel>> result) {
getOrders(ModelFabric.NONE_SYSTEM, from, ModelFabric.NONE_SYSTEM, ModelFabric.NONE_STATION, balance, result); getOrders(ModelFabric.NONE_SYSTEM, from, ModelFabric.NONE_SYSTEM, ModelFabric.NONE_STATION, balance, result);
} }

4
client/src/main/java/ru/trader/model/SystemModel.java
View File

@@ -136,6 +136,10 @@ public class SystemModel {
market.removeStation(station); market.removeStation(station);
} }
public StationModel asTransit(){
return asModel(system.asTransit());
}
public boolean isEmpty(){ public boolean isEmpty(){
return system.isEmpty(); return system.isEmpty();
} }

4
core/src/main/java/ru/trader/core/MarketAnalyzer.java
View File

@@ -43,6 +43,10 @@ public class MarketAnalyzer {
return market.getVendors().filter(v -> !filter.isFiltered(v)).collect(Collectors.toList()); return market.getVendors().filter(v -> !filter.isFiltered(v)).collect(Collectors.toList());
} }
public List<Place> getSystems(MarketFilter filter){
return market.get().filter(p -> !filter.isFiltered(p)).collect(Collectors.toList());
}
public Collection<Order> getTop(int limit){ public Collection<Order> getTop(int limit){
LOG.debug("Get top {}", limit); LOG.debug("Get top {}", limit);
Collection<Place> places = getPlaces(); Collection<Place> places = getPlaces();