modify the cat page bug

cat-home/src/main/java/com/dianping/cat/report/page/event/Model.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.dianping.cat.consumer.event.model.entity.EventReport;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.view.DomainSortHelper;
+import com.dianping.cat.report.view.StringSortHelper;
 
 public class Model extends AbstractReportModel<Action, Context> {
 	private EventReport m_report;
@@ -44,7 +44,7 @@ public class Model extends AbstractReportModel<Action, Context> {
 		if (m_report == null) {
 			return new ArrayList<String>();
 		} else {
-			return DomainSortHelper.sortDomain(m_report.getDomains());
+			return StringSortHelper.sortDomain(m_report.getDomains());
 		}
 	}
 

cat-home/src/main/java/com/dianping/cat/report/page/ip/Model.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.dianping.cat.consumer.ip.model.entity.IpReport;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.view.DomainSortHelper;
+import com.dianping.cat.report.view.StringSortHelper;
 
 public class Model extends AbstractReportModel<Action, Context> {
 	private IpReport m_report;
@@ -40,7 +40,7 @@ public class Model extends AbstractReportModel<Action, Context> {
 		if (m_report == null) {
 			return new ArrayList<String>();
 		} else {
-			return DomainSortHelper.sortDomain(m_report.getAllDomains().getDomains());
+			return StringSortHelper.sortDomain(m_report.getAllDomains().getDomains());
 		}
 	}
 

cat-home/src/main/java/com/dianping/cat/report/page/problem/GroupLevelInfo.java

 package com.dianping.cat.report.page.problem;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.TreeSet;
 
 import com.dianping.cat.consumer.problem.model.entity.Entry;
 import com.dianping.cat.consumer.problem.model.entity.JavaThread;
@@ -13,6 +12,7 @@ import com.dianping.cat.consumer.problem.model.entity.Machine;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.consumer.problem.model.entity.Segment;
 import com.dianping.cat.report.view.ProblemReportHelper;
+import com.dianping.cat.report.view.StringSortHelper;
 
 public class GroupLevelInfo {
 	private int m_minutes;
@@ -28,8 +28,8 @@ public class GroupLevelInfo {
 		m_minutes = model.getLastMinute();
 	}
 
-	public Set<String> getGroups() {
-		return m_groupStatistics.keySet();
+	public List<String> getGroups() {
+		return StringSortHelper.sortString(m_groupStatistics.keySet());
 	}
 
 	private String getShowDetailByMinte(int minute) {
@@ -43,17 +43,17 @@ public class GroupLevelInfo {
 		StringBuilder sb = new StringBuilder().append("<td>");
 		String minuteStr = Integer.toString(minute);
 		if (minute < 10) {
-			minuteStr ="0" +minute;
+			minuteStr = "0" + minute;
 		}
 		sb.append(ProblemReportHelper.creatLinkString(baseUrl, "minute", params, minuteStr));
 		sb.append("</td>");
 
-		for (java.util.Map.Entry<String, GroupStatistics> statistics : m_groupStatistics.entrySet()) {
+		for (String group : getGroups()) {
 			sb.append("<td>");
-			params.put("group", statistics.getKey());
-			GroupStatistics value = statistics.getValue();
+			params.put("group", group);
+			GroupStatistics value = m_groupStatistics.get(group);
 			for (String temp : value.getStatistics().get(minute)) {
-				String url = ProblemReportHelper.creatLinkString(baseUrl, temp, params,"");
+				String url = ProblemReportHelper.creatLinkString(baseUrl, temp, params, "");
 				sb.append(url);
 			}
 			sb.append("</td>");
@@ -108,16 +108,16 @@ public class GroupLevelInfo {
 
 	public static class GroupStatistics {
 
-		private Map<Integer, HashSet<String>> m_statistics = new LinkedHashMap<Integer, HashSet<String>>();
+		private Map<Integer, TreeSet<String>> m_statistics = new LinkedHashMap<Integer, TreeSet<String>>();
 
-		public HashSet<String> getTag(int minutes) {
+		public TreeSet<String> getTag(int minutes) {
 			return m_statistics.get(minutes);
 		}
 
 		public GroupStatistics(int lastMinute) {
 			for (int i = 0; i <= lastMinute; i++) {
 
-				m_statistics.put(new Integer(i), new HashSet<String>());
+				m_statistics.put(new Integer(i), new TreeSet<String>());
 			}
 		}
 
@@ -131,7 +131,7 @@ public class GroupLevelInfo {
 			}
 		}
 
-		public Map<Integer, HashSet<String>> getStatistics() {
+		public Map<Integer, TreeSet<String>> getStatistics() {
 			return m_statistics;
 		}
 	}

cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.view.DomainSortHelper;
+import com.dianping.cat.report.view.StringSortHelper;
 
 public class Model extends AbstractReportModel<Action, Context> {
 	private ProblemReport m_report;
@@ -57,7 +57,7 @@ public class Model extends AbstractReportModel<Action, Context> {
 		if (m_report == null) {
 			return new ArrayList<String>();
 		} else {
-			return DomainSortHelper.sortDomain(m_report.getAllDomains().getDomains());
+			return StringSortHelper.sortDomain(m_report.getAllDomains().getDomains());
 		}
 	}
 

cat-home/src/main/java/com/dianping/cat/report/page/problem/ThreadLevelInfo.java

 package com.dianping.cat.report.page.problem;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -41,6 +43,12 @@ public class ThreadLevelInfo {
 		for (java.util.Map.Entry<String, TreeSet<String>> entry : m_threadsInfo.entrySet()) {
 			result.add(new GroupDisplayInfo().setName(entry.getKey()).setNumber(entry.getValue().size()));
 		}
+		Collections.sort(result, new Comparator<GroupDisplayInfo>() {
+			@Override
+			public int compare(GroupDisplayInfo o1, GroupDisplayInfo o2) {
+				return o1.getName().compareTo(o2.getName());
+			}
+		});
 		return result;
 	}
 
@@ -55,7 +63,7 @@ public class ThreadLevelInfo {
 		return result;
 	}
 
-	private Set<String> getThreadsByGroup(String groupName) {
+	private TreeSet<String> getThreadsByGroup(String groupName) {
 		return m_threadsInfo.get(groupName);
 	}
 
@@ -70,14 +78,14 @@ public class ThreadLevelInfo {
 		StringBuilder sb = new StringBuilder().append("<td>");
 		String minuteStr = Integer.toString(minute);
 		if (minute < 10) {
-			minuteStr ="0" +minute;
+			minuteStr = "0" + minute;
 		}
 		sb.append(ProblemReportHelper.creatLinkString(baseUrl, "minute", params, minuteStr));
 		sb.append("</td>");
 
-		for (java.util.Map.Entry<String, GroupStatistics> statistics : m_groupStatistics.entrySet()) {
-			GroupStatistics value = statistics.getValue();
-			String groupName = statistics.getKey();
+		for (GroupDisplayInfo group : getGroups()) {
+			GroupStatistics value = m_groupStatistics.get(group);
+			String groupName = group.getName();
 			Set<String> threads = getThreadsByGroup(groupName);
 			Map<String, TheadStatistics> temps = value.getStatistics();
 
@@ -86,11 +94,11 @@ public class ThreadLevelInfo {
 				HashSet<String> errors = theadStatistics.getStatistics().get(minute);
 				sb.append("<td>");
 				for (String error : errors) {
-					params.put("group", statistics.getKey());
+					params.put("group", groupName);
 					if (groupName.equals(m_groupName)) {
 						params.put("thread", thread);
 					}
-					String url = ProblemReportHelper.creatLinkString(baseUrl, error, params,"");
+					String url = ProblemReportHelper.creatLinkString(baseUrl, error, params, "");
 					sb.append(url);
 				}
 				sb.append("</td>");

cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.view.DomainSortHelper;
+import com.dianping.cat.report.view.StringSortHelper;
 
 public class Model extends AbstractReportModel<Action, Context>  {
 	private SqlReport m_report;
@@ -50,7 +50,7 @@ public class Model extends AbstractReportModel<Action, Context>  {
 		if (m_report == null) {
 			return new ArrayList<String>();
 		} else {
-			return DomainSortHelper.sortDomain(m_report.getDomains());
+			return StringSortHelper.sortDomain(m_report.getDomains());
 		}
    }
 

cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.view.DomainSortHelper;
+import com.dianping.cat.report.view.StringSortHelper;
 
 public class Model extends AbstractReportModel<Action, Context> {
 	private TransactionReport m_report;
@@ -44,7 +44,7 @@ public class Model extends AbstractReportModel<Action, Context> {
 		if (m_report == null) {
 			return new ArrayList<String>();
 		} else {
-			return DomainSortHelper.sortDomain(m_report.getDomains());
+			return StringSortHelper.sortDomain(m_report.getDomains());
 		}
 	}
 

cat-home/src/main/java/com/dianping/cat/report/view/DomainSortHelper.java → cat-home/src/main/java/com/dianping/cat/report/view/StringSortHelper.java

@@ -6,25 +6,38 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 
-public class DomainSortHelper {
-	public static List<String> sortDomain(List<String> domains){
-		Collections.sort(domains,new DomainComparator());
-		return domains;
+public class StringSortHelper {
+	public static List<String> sortDomain(List<String> lists) {
+		Collections.sort(lists, new DomainComparator());
+		return lists;
 	}
 
-	public static List<String> sortDomain(Set<String> domains){
-		if(domains==null){
+	public static List<String> sortDomain(Set<String> lists) {
+		if (lists == null) {
 			return null;
-		}else{
+		} else {
 			List<String> domainsList = new ArrayList<String>();
-			for(String domain:domains){
+			for (String domain : lists) {
 				domainsList.add(domain);
 			}
 			return sortDomain(domainsList);
 		}
 	}
 
-	public static class DomainComparator implements Comparator<String>{
+	public static List<String> sortString(Set<String> lists) {
+		if (lists == null) {
+			return null;
+		} else {
+			List<String> result = new ArrayList<String>();
+			for (String domain : lists) {
+				result.add(domain);
+			}
+			Collections.sort(result);
+			return result;
+		}
+	}
+
+	public static class DomainComparator implements Comparator<String> {
 		@Override
 		public int compare(String d1, String d2) {
 			if (d1.equals("Cat")) {