From 25ddf2398bbdf891bd13b001d155ee57bd86e6e0 Mon Sep 17 00:00:00 2001 From: "yong.you" Date: Fri, 18 Oct 2013 18:21:25 +0800 Subject: [PATCH] sort the code --- .../cat/report/page/metric/Action.java | 12 ++--- .../cat/report/page/metric/Model.java | 44 +++++++-------- .../cat/report/page/metric/Payload.java | 54 +++++++++---------- .../cat/report/page/metric/Range.java | 24 ++++----- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Action.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Action.java index 65cd85363..fc0b20504 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Action.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Action.java @@ -5,6 +5,12 @@ public enum Action implements org.unidal.web.mvc.Action { DASHBOARD("dashboard"); + private String m_name; + + private Action(String name) { + m_name = name; + } + public static Action getByName(String name, Action defaultAction) { for (Action action : Action.values()) { if (action.getName().equals(name)) { @@ -15,12 +21,6 @@ public enum Action implements org.unidal.web.mvc.Action { return defaultAction; } - private String m_name; - - private Action(String name) { - m_name = name; - } - @Override public String getName() { return m_name; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java index 5630664e0..6682cd685 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java @@ -29,14 +29,18 @@ public class Model extends AbstractReportModel { private Map m_abtests; - public Range[] getAllRange() { - return Range.values(); - } - public Model(Context ctx) { super(ctx); } + public Map getAbtests() { + return m_abtests; + } + + public Range[] getAllRange() { + return Range.values(); + } + @Override public Action getDefaultAction() { return Action.METRIC; @@ -52,44 +56,40 @@ public class Model extends AbstractReportModel { return new HashSet(); } - public Collection getProductLines() { - return m_productLines; - } - - public void setProductLines(Collection productLines) { - m_productLines = productLines; + public Date getEndTime() { + return m_endTime; } public List getLineCharts() { return m_lineCharts; } - public void setLineCharts(List lineCharts) { - m_lineCharts = lineCharts; + public Collection getProductLines() { + return m_productLines; } public Date getStartTime() { return m_startTime; } - public void setStartTime(Date startTime) { - m_startTime = startTime; - } - - public Date getEndTime() { - return m_endTime; + public void setAbtests(Map abtests) { + m_abtests = abtests; } public void setEndTime(Date endTime) { m_endTime = endTime; } - public void setAbtests(Map abtests) { - m_abtests = abtests; + public void setLineCharts(List lineCharts) { + m_lineCharts = lineCharts; } - public Map getAbtests() { - return m_abtests; + public void setProductLines(Collection productLines) { + m_productLines = productLines; + } + + public void setStartTime(Date startTime) { + m_startTime = startTime; } } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Payload.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Payload.java index 9a0fe8806..8b869d439 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Payload.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Payload.java @@ -39,64 +39,64 @@ public class Payload extends AbstractReportPayload { return m_action; } - @Override - public ReportPage getPage() { - return m_page; - } - - public void setAction(String action) { - m_action = Action.getByName(action, Action.METRIC); + public int getFrequency() { + return m_frequency; } @Override - public void setPage(String page) { - m_page = ReportPage.getByName(page, ReportPage.METRIC); + public ReportPage getPage() { + return m_page; } public String getProduct() { return m_product; } - public void setProduct(String product) { - m_product = product; - } - public String getTest() { return m_test; } - public void setTest(String test) { - m_test = test; - } - public int getTimeRange() { return m_timeRange; } - public int getFrequency() { - return m_frequency; - } - - public void setFrequency(int frequency) { - m_frequency = frequency; + public boolean isFullScreen() { + return m_fullScreen; } public boolean isRefresh() { return m_refresh; } - public void setRefresh(boolean refresh) { - m_refresh = refresh; + public void setAction(String action) { + m_action = Action.getByName(action, Action.METRIC); } - public boolean isFullScreen() { - return m_fullScreen; + public void setFrequency(int frequency) { + m_frequency = frequency; } public void setFullScreen(boolean fullScreen) { m_fullScreen = fullScreen; } + @Override + public void setPage(String page) { + m_page = ReportPage.getByName(page, ReportPage.METRIC); + } + + public void setProduct(String product) { + m_product = product; + } + + public void setRefresh(boolean refresh) { + m_refresh = refresh; + } + + public void setTest(String test) { + m_test = test; + } + @Override public void validate(ActionContext ctx) { if (m_action == null) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Range.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Range.java index dfb087c50..dc9579da4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Range.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Range.java @@ -13,23 +13,15 @@ public enum Range { ONE_DAY("24小时", 24), ; + private String m_title; + + private int m_duration; + private Range(String title, int duration) { m_title = title; m_duration = duration; } - public String getTitle() { - return m_title; - } - - public int getDuration() { - return m_duration; - } - - private String m_title; - - private int m_duration; - public static Range getByTitle(String title, Range defaultRange) { for (Range range : Range.values()) { if (range.getTitle().equals(title)) { @@ -38,4 +30,12 @@ public enum Range { } return defaultRange; } + + public int getDuration() { + return m_duration; + } + + public String getTitle() { + return m_title; + } } -- GitLab