Fixed extra plugin tabs not appearing if Overview was unavailable
Affects issues: - Fixed #1260
This commit is contained in:
parent
43c3596cde
commit
0db997c13f
|
@ -60,6 +60,7 @@ public class ServerPluginTabs {
|
|||
Formatters formatters
|
||||
) {
|
||||
this.serverData = serverData;
|
||||
Collections.sort(serverData);
|
||||
this.extraTabServerData = Lists.filter(serverData, ExtensionData::doesNeedWiderSpace);
|
||||
this.serverData.removeAll(extraTabServerData);
|
||||
|
||||
|
@ -92,17 +93,9 @@ public class ServerPluginTabs {
|
|||
);
|
||||
} else {
|
||||
nav = new StringBuilder(NavLink.main(Icon.called("cubes").build(), tabID, "Overview").toHtml());
|
||||
tab = generatePageTabs();
|
||||
tab = generateOverviewTab();
|
||||
}
|
||||
}
|
||||
|
||||
private String generatePageTabs() {
|
||||
Collections.sort(serverData);
|
||||
|
||||
String overviewTab = generateOverviewTab();
|
||||
String extraTabs = generateExtraTabs();
|
||||
|
||||
return overviewTab + extraTabs;
|
||||
tab += generateExtraTabs();
|
||||
}
|
||||
|
||||
private String generateExtraTabs() {
|
||||
|
|
|
@ -82,4 +82,14 @@ public class TabInformation {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "TabInformation{" +
|
||||
"tabName='" + tabName + '\'' +
|
||||
", icon=" + icon +
|
||||
", elementOrder=" + Arrays.toString(elementOrder) +
|
||||
", tabPriority=" + tabPriority +
|
||||
'}';
|
||||
}
|
||||
}
|
|
@ -84,6 +84,15 @@ public class ExtensionData implements Comparable<ExtensionData> {
|
|||
return Objects.hash(pluginID, extensionInformation, tabs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ExtensionData{" +
|
||||
"pluginID=" + pluginID +
|
||||
", extensionInformation=" + extensionInformation +
|
||||
", tabs=" + tabs +
|
||||
'}';
|
||||
}
|
||||
|
||||
public static class Builder {
|
||||
|
||||
private final ExtensionData data;
|
||||
|
|
|
@ -84,4 +84,15 @@ public class ExtensionDescriptive implements Comparable<ExtensionDescriptive> {
|
|||
public int hashCode() {
|
||||
return Objects.hash(name, text, description, icon, priority);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ExtensionDescriptive{" +
|
||||
"name='" + name + '\'' +
|
||||
", text='" + text + '\'' +
|
||||
", description='" + description + '\'' +
|
||||
", icon=" + icon +
|
||||
", priority=" + priority +
|
||||
'}';
|
||||
}
|
||||
}
|
|
@ -199,7 +199,9 @@ public class ExtensionTabData implements Comparable<ExtensionTabData> {
|
|||
@Override
|
||||
public String toString() {
|
||||
return "ExtensionTabData{" +
|
||||
"available=" + order +
|
||||
"tabInformation=" + tabInformation +
|
||||
", tableData=" + tableData +
|
||||
", descriptives=" + descriptives +
|
||||
'}';
|
||||
}
|
||||
}
|
|
@ -95,6 +95,13 @@ public class ExtensionTableData implements Comparable<ExtensionTableData> {
|
|||
return Objects.hash(providerName, tableColor);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ExtensionTableData{" +
|
||||
"providerName='" + providerName + '\'' +
|
||||
'}';
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(ExtensionTableData other) {
|
||||
return String.CASE_INSENSITIVE_ORDER.compare(providerName, other.providerName);
|
||||
|
|
Loading…
Reference in New Issue