rename merge

cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java

@@ -25,8 +25,8 @@ import com.dianping.cat.report.page.PieChart;
 import com.dianping.cat.report.page.PieChart.Item;
 import com.dianping.cat.report.page.cache.CacheReport.CacheNameItem;
 import com.dianping.cat.report.page.model.spi.ModelService;
-import com.dianping.cat.report.page.transaction.MergeAllMachine;
-import com.dianping.cat.report.page.transaction.MergeAllName;
+import com.dianping.cat.report.page.transaction.AllMachineMerger;
+import com.dianping.cat.report.page.transaction.AllNameMerger;
 import com.dianping.cat.report.service.ReportServiceManager;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
@@ -112,13 +112,13 @@ public class Handler implements PageHandler<Context> {
 			eventReport = response.getModel();
 		}
 		if (Constants.ALL.equalsIgnoreCase(ipAddress)) {
-			com.dianping.cat.report.page.event.MergeAllMachine allEvent = new com.dianping.cat.report.page.event.MergeAllMachine();
+			com.dianping.cat.report.page.event.AllMachineMerger allEvent = new com.dianping.cat.report.page.event.AllMachineMerger();
 
 			allEvent.visitEventReport(eventReport);
 			eventReport = allEvent.getReport();
 		}
 		if (Constants.ALL.equalsIgnoreCase(type)) {
-			com.dianping.cat.report.page.event.MergeAllName allEvent = new com.dianping.cat.report.page.event.MergeAllName();
+			com.dianping.cat.report.page.event.AllNameMerger allEvent = new com.dianping.cat.report.page.event.AllNameMerger();
 
 			allEvent.visitEventReport(eventReport);
 			eventReport = allEvent.getReport();
@@ -144,13 +144,13 @@ public class Handler implements PageHandler<Context> {
 		transactionReport = response.getModel();
 
 		if (Constants.ALL.equalsIgnoreCase(ipAddress)) {
-			MergeAllMachine all = new MergeAllMachine();
+			AllMachineMerger all = new AllMachineMerger();
 
 			all.visitTransactionReport(transactionReport);
 			transactionReport = all.getReport();
 		}
 		if (Constants.ALL.equalsIgnoreCase(type)) {
-			MergeAllName all = new MergeAllName();
+			AllNameMerger all = new AllNameMerger();
 
 			all.visitTransactionReport(transactionReport);
 			transactionReport = all.getReport();

cat-home/src/main/java/com/dianping/cat/report/page/event/MergeAllMachine.java → cat-home/src/main/java/com/dianping/cat/report/page/event/AllMachineMerger.java

@@ -9,7 +9,7 @@ import com.dianping.cat.consumer.event.model.entity.Machine;
 import com.dianping.cat.consumer.event.model.entity.Range;
 import com.dianping.cat.consumer.event.model.transform.BaseVisitor;
 
-public class MergeAllMachine extends BaseVisitor {
+public class AllMachineMerger extends BaseVisitor {
 
 	public EventReport m_report;
 

cat-home/src/main/java/com/dianping/cat/report/page/event/MergeAllName.java → cat-home/src/main/java/com/dianping/cat/report/page/event/AllNameMerger.java

@@ -9,7 +9,7 @@ import com.dianping.cat.consumer.event.model.entity.Machine;
 import com.dianping.cat.consumer.event.model.entity.Range;
 import com.dianping.cat.consumer.event.model.transform.BaseVisitor;
 
-public class MergeAllName extends BaseVisitor {
+public class AllNameMerger extends BaseVisitor {
 
 	public EventReport m_report;
 

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

@@ -7,7 +7,7 @@ public class EventMergeHelper {
 
 	public EventReport mergerAllIp(EventReport report, String ipAddress) {
 		if (Constants.ALL.equalsIgnoreCase(ipAddress)) {
-			MergeAllMachine all = new MergeAllMachine();
+			AllMachineMerger all = new AllMachineMerger();
 
 			all.visitEventReport(report);
 			report = all.getReport();
@@ -17,7 +17,7 @@ public class EventMergeHelper {
 
 	private EventReport mergerAllName(EventReport report, String allName) {
 		if (Constants.ALL.equalsIgnoreCase(allName)) {
-			MergeAllName all = new MergeAllName();
+			AllNameMerger all = new AllNameMerger();
 
 			all.visitEventReport(report);
 			report = all.getReport();

cat-home/src/main/java/com/dianping/cat/report/page/transaction/MergeAllMachine.java → cat-home/src/main/java/com/dianping/cat/report/page/transaction/AllMachineMerger.java

@@ -10,7 +10,7 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.consumer.transaction.model.transform.BaseVisitor;
 
-public class MergeAllMachine extends BaseVisitor {
+public class AllMachineMerger extends BaseVisitor {
 
 	public TransactionReport m_report;
 

cat-home/src/main/java/com/dianping/cat/report/page/transaction/MergeAllName.java → cat-home/src/main/java/com/dianping/cat/report/page/transaction/AllNameMerger.java

@@ -10,7 +10,7 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.consumer.transaction.model.transform.BaseVisitor;
 
-public class MergeAllName extends BaseVisitor {
+public class AllNameMerger extends BaseVisitor {
 
 	public TransactionReport m_report;
 

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

@@ -7,7 +7,7 @@ public class TransactionMergeHelper {
 
 	public TransactionReport mergerAllIp(TransactionReport report, String ipAddress) {
 		if (Constants.ALL.equalsIgnoreCase(ipAddress)) {
-			MergeAllMachine all = new MergeAllMachine();
+			AllMachineMerger all = new AllMachineMerger();
 
 			all.visitTransactionReport(report);
 			report = all.getReport();
@@ -17,7 +17,7 @@ public class TransactionMergeHelper {
 
 	private TransactionReport mergerAllName(TransactionReport report, String allName) {
 		if (Constants.ALL.equalsIgnoreCase(allName)) {
-			MergeAllName all = new MergeAllName();
+			AllNameMerger all = new AllNameMerger();
 
 			all.visitTransactionReport(report);
 			report = all.getReport();