Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-10 22:01:00 +01:00
Code Issues Projects Releases Wiki Activity

Prevented NPE of #352 from occurring

Browse Source
This commit is contained in:
Rsl1122 2017-10-24 12:39:01 +03:00
parent cfd69de910
commit 0093e7d245
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java
View File

@ -1,6 +1,5 @@
package main.java.com.djrapitops.plan.data;
import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.data.analysis.*;
import main.java.com.djrapitops.plan.utilities.Benchmark;
@ -38,7 +37,6 @@ public class AnalysisData extends RawData {
private final TPSPart tpsPart;
private final WorldPart worldPart;
private long refreshDate;
private String planVersion;
private String pluginsTabLayout;
private Map<String, Serializable> additionalDataReplaceMap;
private String playersTable;
@ -97,26 +95,10 @@ public class AnalysisData extends RawData {
worldPart);
}
public String getPlanVersion() {
return planVersion;
}
public void setPlanVersion(String planVersion) {
this.planVersion = planVersion;
}
public String getPluginsTabLayout() {
return pluginsTabLayout;
}
public void setPluginsTabLayout(String pluginsTabLayout) {
this.pluginsTabLayout = pluginsTabLayout;
}
public Map<String, Serializable> getAdditionalDataReplaceMap() {
return additionalDataReplaceMap;
}
public void setAdditionalDataReplaceMap(Map<String, Serializable> additionalDataReplaceMap) {
this.additionalDataReplaceMap = additionalDataReplaceMap;
}
@ -127,12 +109,15 @@ public class AnalysisData extends RawData {
@Override
protected void analyse() {
Verify.nullCheck(playersTable);
Verify.nullCheck(pluginsTabLayout);
Verify.nullCheck(planVersion);
if (playersTable == null) {
playersTable = "";
}
if (pluginsTabLayout == null) {
pluginsTabLayout = "";
}
addValue("tableBodyPlayerList", playersTable);
addValue("version", planVersion);
addValue("version", MiscUtils.getIPlan().getVersion());
final List<RawData> parts = getAllParts();
parts.forEach(part -> {
@ -157,8 +142,4 @@ public class AnalysisData extends RawData {
public long getRefreshDate() {
return refreshDate;
}
public void setRefreshDate(long refreshDate) {
this.refreshDate = refreshDate;
}
}

1
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
View File

@ -110,7 +110,6 @@ public class Analysis {
AnalysisData analysisData = new AnalysisData();
List<PluginData> thirdPartyPlugins = plugin.getHookHandler().getAdditionalDataSources();
analysisData.setPluginsTabLayout(HtmlStructure.createAnalysisPluginsTabLayout(thirdPartyPlugins));
analysisData.setPlanVersion(plugin.getVersion());
Benchmark.stop("Analysis", "Create Empty dataset");
fillDataset(analysisData, db);