From a86230b75090c81605902ced8f4b3d6ad9698959 Mon Sep 17 00:00:00 2001 From: Rsl1122 <djrapitops@hotmail.com> Date: Fri, 25 Aug 2017 09:45:19 +0300 Subject: [PATCH] Removed Deprecated Html Enums --- .../djrapitops/plan/utilities/html/Html.java | 9 +----- .../plan/utilities/html/HtmlUtils.java | 29 +++++++++---------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java index e537bae22..f27009985 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java @@ -30,7 +30,6 @@ public enum Html { COLOR_F("<span class=\"white\">"), // FONT_AWESOME_ICON("<i class=\"fa fa-${0}\" aria-hidden=\"true\"></i>"), - @Deprecated MINOTAR_SMALL_IMG("<img style=\"float: left; padding: 2px 2px 0px 2px\" alt=\"${0}\" src=\"https://minotar.net/avatar/${0}/19\">"), SPAN("${0}</span>"), BUTTON("<a class=\"button\" href=\"${0}\">${1}</a>"), BUTTON_CLASS("class=\"button\""), @@ -38,11 +37,6 @@ public enum Html { LINK_EXTERNAL("<a class=\"link\" target=\"_blank\" href=\"${0}\">${1}</a>"), LINK_CLASS("class=\"link\""), IMG("<img src=\"${0}\">"), - @Deprecated COLUMNS_DIV_WRAPPER("<div class=\"columns\">${0}</div>"), - @Deprecated COLUMN_DIV_WRAPPER("<div class=\"about box column\">${0}</div>"), - @Deprecated HEADER("<div class=\"headerbox\" style=\"width: 95%;\"><div class=\"header-icon\"><div class=\"header-label\"><i class=\"fa fa-cube\" aria-hidden=\"true\"></i><span class=\"header-text\"> ${0}</span></div></div></div>"), - @Deprecated PLUGIN_DATA_WRAPPER("<div class=\"plugin-data\">${0}</div>"), - @Deprecated PLUGIN_CONTAINER_START("<div class=\"plugin-container\">"), // TABLE_START_2("<table class=\"sortable table\"><thead><tr><th>${0}</th><th>${1}</th></tr></thead><tbody>"), TABLE_START_3("<table class=\"sortable table\"><thead><tr><th>${0}</th><th>${1}</th><th>${2}</th></tr></thead><tbody>"), @@ -57,8 +51,7 @@ public enum Html { TABLELINE_PLAYERS("<tr><td>${0}</td><td>${1}</td><td sorttable_customkey=\"${2}\">${3}</td><td>${4}</td><td sorttable_customkey=\"${5}\">${6}</td>" + "<td sorttable_customkey=\"${7}\">${8}</td><td>${9}</td></tr>"), TABLELINE_3_CUSTOMKEY("<tr><td sorttable_customkey=\"${0}\">${1}</td><td sorttable_customkey=\"${2}\">${3}</td><td sorttable_customkey=\"${4}\">${5}</td></tr>"), TABLELINE_3_CUSTOMKEY_1("<tr><td sorttable_customkey=\"${0}\">${1}</td><td>${2}</td><td>${3}</td></tr>"), - @Deprecated ERROR_TABLE_2(TABLELINE_2.parse("No data", "No data")), - TABLE_END("</tbody></table>"); // KILLDATA_NONE("No Kills"), + TABLE_END("</tbody></table>"); private final String html; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java index 8ca4328f8..575e186ba 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java @@ -2,8 +2,6 @@ package main.java.com.djrapitops.plan.utilities.html; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.Settings; -import main.java.com.djrapitops.plan.locale.Locale; -import main.java.com.djrapitops.plan.locale.Msg; import main.java.com.djrapitops.plan.systems.webserver.WebServer; import main.java.com.djrapitops.plan.utilities.file.FileUtil; import org.apache.commons.lang.text.StrSubstitutor; @@ -120,7 +118,7 @@ public class HtmlUtils { * @param placeholders * @return */ - // TODO REWRITE + @Deprecated // TODO Move to HtmlStructure public static String getPluginsTabLayout(List<String> pluginNames, Map<String, List<String>> placeholders) { boolean sizeIsEvenNumber = pluginNames.size() % 2 == 0; StringBuilder html = new StringBuilder(); @@ -129,33 +127,34 @@ public class HtmlUtils { for (int i = 0; i < evenSize; i++) { String name = pluginNames.get(i); if (i % 2 == 0) { - temp = Html.COLUMN_DIV_WRAPPER.parse(getContent(name, placeholders.get(name))); + // temp = Html.COLUMN_DIV_WRAPPER.parse(getContent(name, placeholders.get(name))); } else { - html.append(Html.COLUMNS_DIV_WRAPPER.parse(temp + Html.COLUMN_DIV_WRAPPER.parse(getContent(name, placeholders.get(name))))); + // html.append(Html.COLUMNS_DIV_WRAPPER.parse(temp + Html.COLUMN_DIV_WRAPPER.parse(getContent(name, placeholders.get(name))))); } } if (!sizeIsEvenNumber) { int lastIndex = pluginNames.size() - 1; String name = pluginNames.get(lastIndex); - html.append(Html.COLUMNS_DIV_WRAPPER.parse(Html.COLUMN_DIV_WRAPPER.parse(getContent(name, placeholders.get(name))) + Html.COLUMN_DIV_WRAPPER.parse(""))); + // html.append(Html.COLUMNS_DIV_WRAPPER.parse(Html.COLUMN_DIV_WRAPPER.parse(getContent(name, placeholders.get(name))) + Html.COLUMN_DIV_WRAPPER.parse(""))); } String returnValue = html.toString(); if (returnValue.isEmpty()) { - return Html.COLUMNS_DIV_WRAPPER.parse( - Html.COLUMN_DIV_WRAPPER.parse( - Html.PLUGIN_DATA_WRAPPER.parse( - Locale.get(Msg.HTML_NO_PLUGINS).toString() - ) - ) - ); +// return Html.COLUMNS_DIV_WRAPPER.parse( +// Html.COLUMN_DIV_WRAPPER.parse( +// Html.PLUGIN_DATA_WRAPPER.parse( +// Locale.get(Msg.HTML_NO_PLUGINS).toString() +// ) +// ) +// ); } return returnValue; } + @Deprecated // TODO Move to HtmlStructure private static String getContent(String name, List<String> placeholders) { StringBuilder html = new StringBuilder(); - html.append(Html.HEADER.parse(name)); - html.append(Html.PLUGIN_CONTAINER_START.parse()); +// html.append(Html.HEADER.parse(name)); +// html.append(Html.PLUGIN_CONTAINER_START.parse()); placeholders.forEach(html::append); html.append("</div>"); return html.toString();