Index: src/webapps/job/machines.jsp =================================================================== --- src/webapps/job/machines.jsp (revision 758920) +++ src/webapps/job/machines.jsp (working copy) @@ -34,16 +34,31 @@ String type = request.getParameter("type"); %> <%! + Comparator trackerStatusComparator = + new Comparator() + { + public int compare(TaskTrackerStatus lhs, TaskTrackerStatus rhs) + { + int result = lhs.getTrackerName().compareTo(rhs.getTrackerName()); + + if (result == 0) { + result = lhs.getHost().compareTo(rhs.getHost()); + } + + return result; + } + }; + public void generateTaskTrackerTable(JspWriter out, String type, JobTracker tracker) throws IOException { - Collection c; + Collection c = new TreeSet(trackerStatusComparator); if (("blacklisted").equals(type)) { - c = tracker.blacklistedTaskTrackers(); + c.addAll(tracker.blacklistedTaskTrackers()); } else if (("active").equals(type)) { - c = tracker.activeTaskTrackers(); + c.addAll(tracker.activeTaskTrackers()); } else { - c = tracker.taskTrackers(); + c.addAll(tracker.taskTrackers()); } if (c.size() == 0) { out.print("There are currently no known " + type + " Task Trackers.");