Voomra/trader
Archived
0
Fork 0
Code Activity

add strong parameter to star system filter

Browse Source
This commit is contained in:
iMoHax
2016-11-02 16:40:13 +03:00
parent fdd3597846
commit d13c559f26
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/ru/trader/core/StarSystemFilter.java
View File

@@ -14,14 +14,28 @@ public class StarSystemFilter {
private final EnumSet<FACTION> factions; private final EnumSet<FACTION> factions;
private final EnumSet<GOVERNMENT> governments; private final EnumSet<GOVERNMENT> governments;
private final Collection<Place> excludes; private final Collection<Place> excludes;
private boolean strong;
public StarSystemFilter() { public StarSystemFilter() {
this(false);
}
public StarSystemFilter(boolean strong) {
this.powers = EnumSet.noneOf(POWER.class); this.powers = EnumSet.noneOf(POWER.class);
this.states = EnumSet.noneOf(POWER_STATE.class); this.states = EnumSet.noneOf(POWER_STATE.class);
this.factions = EnumSet.noneOf(FACTION.class); this.factions = EnumSet.noneOf(FACTION.class);
this.governments = EnumSet.noneOf(GOVERNMENT.class); this.governments = EnumSet.noneOf(GOVERNMENT.class);
this.excludes = new ArrayList<>(); this.excludes = new ArrayList<>();
this.distances = new ArrayList<>(); this.distances = new ArrayList<>();
this.strong = strong;
}
public boolean isStrong() {
return strong;
}
public void setStrong(boolean strong) {
this.strong = strong;
} }
public Collection<DistanceFilter> getDistanceFilters() { public Collection<DistanceFilter> getDistanceFilters() {
@@ -137,13 +151,13 @@ public class StarSystemFilter {
} }
if (excludes.contains(starSystem)) return true; if (excludes.contains(starSystem)) return true;
POWER power = starSystem.getPower(); POWER power = starSystem.getPower();
if (power != null && !powers.isEmpty() && !powers.contains(power)) return true; if ((strong || power != null) && !powers.isEmpty() && !powers.contains(power)) return true;
POWER_STATE state = starSystem.getPowerState(); POWER_STATE state = starSystem.getPowerState();
if (state != null && !states.isEmpty() && !states.contains(state)) return true; if ((strong || state != null) && !states.isEmpty() && !states.contains(state)) return true;
FACTION faction = starSystem.getFaction(); FACTION faction = starSystem.getFaction();
if (faction != null && !factions.isEmpty() && !factions.contains(faction)) return true; if ((strong || faction != null) && !factions.isEmpty() && !factions.contains(faction)) return true;
GOVERNMENT government = starSystem.getGovernment(); GOVERNMENT government = starSystem.getGovernment();
if (government != null && !governments.isEmpty() && !governments.contains(government)) return true; if ((strong || government != null) && !governments.isEmpty() && !governments.contains(government)) return true;
return false; return false;
} }