Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-12 14:58:26 +02:00
Code Issues Projects Releases Wiki Activity

[Fix] Fixed cyclic dependency - WorldAliasSettings

Browse Source
This commit is contained in:
Rsl1122 2018-09-29 13:47:19 +03:00
parent ea9a8b8812
commit e60e1abe9a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plan/src/main/java/com/djrapitops/plan/system/settings/WorldAliasSettings.java
View File

@ -23,6 +23,7 @@ import javax.inject.Singleton;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -34,14 +35,14 @@ import java.util.stream.Collectors;
public class WorldAliasSettings { public class WorldAliasSettings {
private final Lazy<PlanConfig> config; private final Lazy<PlanConfig> config;
private final Formatter<Double> percentageFormatter; private final Supplier<Formatter<Double>> percentageFormatter;
private final Processing processing; private final Processing processing;
private final ErrorHandler errorHandler; private final ErrorHandler errorHandler;
@Inject @Inject
public WorldAliasSettings( public WorldAliasSettings(
Lazy<PlanConfig> config, Lazy<PlanConfig> config,
Formatters formatters, Lazy<Formatters> formatters,
Processing processing, Processing processing,
ErrorHandler errorHandler ErrorHandler errorHandler
) { ) {
@ -49,7 +50,7 @@ public class WorldAliasSettings {
this.processing = processing; this.processing = processing;
this.errorHandler = errorHandler; this.errorHandler = errorHandler;
percentageFormatter = formatters.percentage(); percentageFormatter = () -> formatters.get().percentage();
} }
private ConfigNode getAliasSection() { private ConfigNode getAliasSection() {
@ -174,6 +175,6 @@ public class WorldAliasSettings {
double quotient = longest * 1.0 / total; double quotient = longest * 1.0 / total;
return theWorld + " (" + percentageFormatter.apply(quotient) + ")"; return theWorld + " (" + percentageFormatter.get().apply(quotient) + ")";
} }
} }