Repository: incubator-slider Updated Branches: refs/heads/develop 585fc4c0a -> f61dc2be5
fix IDE warnings in ContainerStatsBlock Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/3d61bed5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/3d61bed5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/3d61bed5 Branch: refs/heads/develop Commit: 3d61bed5b26099f2815f43352602792212966eb0 Parents: 585fc4c Author: Steve Loughran <[email protected]> Authored: Sun May 3 13:13:27 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Sun May 3 13:14:47 2015 +0100 ---------------------------------------------------------------------- .../appmaster/web/view/ContainerStatsBlock.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3d61bed5/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/ContainerStatsBlock.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/ContainerStatsBlock.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/ContainerStatsBlock.java index da5ff05..0896e2b 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/ContainerStatsBlock.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/view/ContainerStatsBlock.java @@ -33,9 +33,8 @@ import org.apache.slider.api.types.ComponentInformation; import org.apache.slider.server.appmaster.state.RoleInstance; import org.apache.slider.server.appmaster.state.StateAccessForProviders; import org.apache.slider.server.appmaster.web.WebAppApi; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -47,7 +46,6 @@ import java.util.Map.Entry; * */ public class ContainerStatsBlock extends HtmlBlock { - private static final Logger log = LoggerFactory.getLogger(ContainerStatsBlock.class); private static final String EVEN = "even", ODD = "odd", BOLD = "bold", SCHEME = "http://";, PATH = "/node/container/"; @@ -65,7 +63,8 @@ public class ContainerStatsBlock extends HtmlBlock { /** * Sort a collection of ClusterNodes by name */ - protected static class ClusterNodeNameComparator implements Comparator<ClusterNode> { + protected static class ClusterNodeNameComparator implements Comparator<ClusterNode>, + Serializable { @Override public int compare(ClusterNode node1, ClusterNode node2) { @@ -73,7 +72,7 @@ public class ContainerStatsBlock extends HtmlBlock { return -1; } else if (null != node1 && null == node2) { return 1; - } else if (null == node1 && null == node2) { + } else if (null == node1) { return 0; } @@ -82,7 +81,7 @@ public class ContainerStatsBlock extends HtmlBlock { return -1; } else if (null != name1 && null == name2) { return 1; - } else if (null == name1 && null == name2) { + } else if (null == name1) { return 0; } @@ -154,7 +153,7 @@ public class ContainerStatsBlock extends HtmlBlock { tableContent = Iterables.transform(options.entrySet(), stringStringPairFunc); } else { // Or catch that we have no options and provide "empty" - tableContent = Collections.<Entry<TableContent,String>> emptySet(); + tableContent = Collections.emptySet(); } // Generate the options used by this role @@ -186,10 +185,7 @@ public class ContainerStatsBlock extends HtmlBlock { /** * Given a div, a name for this data, and some pairs of data, generate a nice HTML table. If contents is empty (of size zero), then a mesage will be printed * that there were no items instead of an empty table. - * - * @param div - * @param detailsName - * @param contents + * */ protected <T1 extends TableContent,T2> void generateRoleDetails(DIV<Hamlet> parent, String divSelector, String detailsName, Iterable<Entry<T1,T2>> contents) { final DIV<DIV<Hamlet>> div = parent.div(divSelector).h3(BOLD, detailsName);
