Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-05 10:20:23 +01:00
Code Issues Projects Releases Wiki Activity

Fixes to PluginData parsing

Browse Source
This commit is contained in:
Rsl1122 2017-11-26 17:42:06 +02:00
parent 91c2a3850a
commit b897e3ac29
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/pom.xml
View File

@ -87,7 +87,7 @@
<dependency> <dependency>
<groupId>com.djrapitops</groupId> <groupId>com.djrapitops</groupId>
<artifactId>PlanPluginBridge</artifactId> <artifactId>PlanPluginBridge</artifactId>
<version>4.0.5</version> <version>4.1.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Testing --> <!-- Testing -->

3
Plan/src/main/java/com/djrapitops/plan/data/additional/InspectContainer.java
View File

@ -49,11 +49,14 @@ public class InspectContainer {
public final String parseHtml() { public final String parseHtml() {
StringBuilder html = new StringBuilder(); StringBuilder html = new StringBuilder();
html.append("<div class=\"body\">");
for (Map.Entry<String, String> entry : values.entrySet()) { for (Map.Entry<String, String> entry : values.entrySet()) {
html.append("<p>").append(entry.getKey()).append(": ").append(entry.getValue()).append("</p>"); html.append("<p>").append(entry.getKey()).append(": ").append(entry.getValue()).append("</p>");
} }
html.append("</div>");
for (Map.Entry<String, String> entry : this.html.entrySet()) { for (Map.Entry<String, String> entry : this.html.entrySet()) {
html.append(entry.getValue()); html.append(entry.getValue());
} }

8
Plan/src/main/java/com/djrapitops/plan/data/additional/TableContainer.java
View File

@ -37,7 +37,7 @@ public final class TableContainer {
} }
public String parseHtml() { public String parseHtml() {
return Html.TABLE_COLORED.parse(color != null ? color : "") + return Html.TABLE.parse() +
parseHeader() + parseHeader() +
parseBody() + parseBody() +
"</table>"; "</table>";
@ -49,6 +49,7 @@ public final class TableContainer {
addRow("No Data"); addRow("No Data");
} }
body.append("<tbody>");
for (Serializable[] row : values) { for (Serializable[] row : values) {
int maxIndex = row.length - 1; int maxIndex = row.length - 1;
body.append("<tr>"); body.append("<tr>");
@ -63,6 +64,7 @@ public final class TableContainer {
} }
body.append("</tr>"); body.append("</tr>");
} }
body.append("</tbody>");
return Html.TABLE_BODY.parse(body.toString()); return Html.TABLE_BODY.parse(body.toString());
} }
@ -72,11 +74,11 @@ public final class TableContainer {
} }
public String parseHeader() { public String parseHeader() {
StringBuilder header = new StringBuilder("<tr>"); StringBuilder header = new StringBuilder("<thead" + (color != null ? " bg-" + color : "") + "><tr>");
for (String title : this.header) { for (String title : this.header) {
header.append("<th>").append(title).append("</th>"); header.append("<th>").append(title).append("</th>");
} }
header.append("</tr>"); header.append("</tr></thead>");
return Html.TABLE_HEAD.parse(header.toString()); return Html.TABLE_HEAD.parse(header.toString());
} }
} }

4
Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/AnalysisPluginsTabContentCreator.java
View File

@ -111,8 +111,8 @@ public class AnalysisPluginsTabContentCreator {
"<div class=\"header\">" + "<div class=\"header\">" +
"<h2>") "<h2>")
.append(pluginData.parsePluginIcon()).append(" ").append(pluginData.getSourcePlugin()) .append(pluginData.parsePluginIcon()).append(" ").append(pluginData.getSourcePlugin())
.append("</h2></div>").append("<div class=\"body\">") .append("</h2></div>")
.append(container.parseHtml()) .append(container.parseHtml())
.append("</div></div></div></div></div>"); .append("</div></div></div></div>");
} }
} }

3
PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java
View File

@ -9,7 +9,6 @@ import com.djrapitops.pluginbridge.plan.griefprevention.GriefPreventionHook;
import com.djrapitops.pluginbridge.plan.jobs.JobsHook; import com.djrapitops.pluginbridge.plan.jobs.JobsHook;
import com.djrapitops.pluginbridge.plan.litebans.LiteBansHook; import com.djrapitops.pluginbridge.plan.litebans.LiteBansHook;
import com.djrapitops.pluginbridge.plan.mcmmo.McmmoHook; import com.djrapitops.pluginbridge.plan.mcmmo.McmmoHook;
import com.djrapitops.pluginbridge.plan.ontime.OnTimeHook;
import com.djrapitops.pluginbridge.plan.superbvote.SuperbVoteHook; import com.djrapitops.pluginbridge.plan.superbvote.SuperbVoteHook;
import com.djrapitops.pluginbridge.plan.towny.TownyHook; import com.djrapitops.pluginbridge.plan.towny.TownyHook;
import com.djrapitops.pluginbridge.plan.vault.VaultHook; import com.djrapitops.pluginbridge.plan.vault.VaultHook;
@ -26,7 +25,6 @@ import main.java.com.djrapitops.plan.data.additional.HookHandler;
* @see JobsHook * @see JobsHook
* @see LiteBansHook * @see LiteBansHook
* @see McmmoHook * @see McmmoHook
* @see OnTimeHook
* @see SuperbVoteHook * @see SuperbVoteHook
* @see TownyHook * @see TownyHook
* @see VaultHook * @see VaultHook
@ -49,7 +47,6 @@ public class Bridge {
new JobsHook(h), new JobsHook(h),
new LiteBansHook(h), new LiteBansHook(h),
new McmmoHook(h), new McmmoHook(h),
new OnTimeHook(h),
new SuperbVoteHook(h), new SuperbVoteHook(h),
new TownyHook(h), new TownyHook(h),
new VaultHook(h), new VaultHook(h),