From: yeongtaik.byeon Date: Wed, 11 Jul 2012 08:16:20 +0000 (+0900) Subject: [Title]thread page data item update X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cc098d185022ae8eb4fbe1bd77e03e77b614641;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title]thread page data item update [Type]feature [Module]thread page [Priority]normal [CQ#] [Redmine#]5322 [Problem] [Cause] [Solution] [TestCase] --- diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/CommonPageLables.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/CommonPageLables.java new file mode 100644 index 0000000..21c459e --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/CommonPageLables.java @@ -0,0 +1,22 @@ +package org.tizen.dynamicanalyzer.nl; + +import org.eclipse.osgi.util.NLS; + +public class CommonPageLables extends NLS { + private static final String BUNDLE_NAME = "org.tizen.dynamicanalyzer.nl.CommonPageLables"; //$NON-NLS-1$ + public static String COMMON_DATA_COLUMN_NUMBER; + public static String COMMON_DATA_COLUMN_TIME; + public static String COMMON_DATA_COLUMN_NAME; + public static String COMMON_DATA_COLUMN_PARAMETER; + public static String COMMON_DATA_COLUMN_THREADID; + public static String COMMON_DATA_COLUMN_RETURN; + public static String COMMON_DATA_COLUMN_ERRNO; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, CommonPageLables.class); + } + + private CommonPageLables(){ + } +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/CommonPageLables.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/CommonPageLables.properties new file mode 100644 index 0000000..76e50d5 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/CommonPageLables.properties @@ -0,0 +1,7 @@ +COMMON_DATA_COLUMN_NUMBER=# +COMMON_DATA_COLUMN_TIME=Time +COMMON_DATA_COLUMN_NAME=Name +COMMON_DATA_COLUMN_PARAMETER=Parameter +COMMON_DATA_COLUMN_THREADID=Thread ID +COMMON_DATA_COLUMN_RETURN=Return +COMMON_DATA_COLUMN_ERRNO=errno \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataColumn.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataColumn.java index 2006439..b72919a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataColumn.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataColumn.java @@ -7,7 +7,9 @@ public class PageDataColumn { public final static int COLUMN_ATTRIBUTE_NONE = 0; public final static int COLUMN_ATTRIBUTE_STRING = 1; public final static int COLUMN_ATTRIBUTE_INT = 2; - public final static int COLUMN_ATTRIBUTE_DOUBLE = 3; + public final static int COLUMN_ATTRIBUTE_LONG = 3; + public final static int COLUMN_ATTRIBUTE_DOUBLE = 4; + public final static int COLUMN_ATTRIBUTE_TIME = 5; private List Column = null; private List ColumnAttribute = null; private int ColumnCount = 0; @@ -20,7 +22,7 @@ public class PageDataColumn { this.ColumnAttribute = new ArrayList(); this.ColumnCount = ColumnCount; - for(int i=0; i < ColumnCount; i++){ + for(int i=0; i < this.ColumnCount; i++){ if(Column.length > i) SetColumnText(i,Column[i]); else @@ -45,20 +47,22 @@ public class PageDataColumn { else return COLUMN_ATTRIBUTE_NONE; } + + public int GetColumnCount(){ + return ColumnCount; + } public void SetColumnText(int Index, String Text){ if (Text == null) return; - if (GetColumnText(Index).equals(Text)) - return; + Column.add(Index,Text); } public void SetColumnAttribute(int Index, int Attribute){ - if (Attribute < COLUMN_ATTRIBUTE_NONE || Attribute > COLUMN_ATTRIBUTE_DOUBLE) - return; - if (GetColumnAttribute(Index) == Attribute) + if (Attribute < COLUMN_ATTRIBUTE_NONE || Attribute > COLUMN_ATTRIBUTE_TIME) return; + ColumnAttribute.add(Index,Attribute); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataItem.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataItem.java index af82ceb..ccf6611 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataItem.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataItem.java @@ -5,16 +5,22 @@ import java.util.List; public class PageDataItem { private List Item = null; - private int ColumnCount = 0; + private PageDataColumn column = null; - public PageDataItem(int ColumnCount, String Item[]){ + public PageDataItem(){ if(null == this.Item) this.Item = new ArrayList(); - - this.ColumnCount = ColumnCount; - for(int i=0; i < ColumnCount; i++){ - if(Item.length <= i) - return; + } + + public PageDataItem(PageDataColumn column){ + this(); + this.column = column; + } + + public PageDataItem(PageDataColumn column, String Item[]){ + this(column); + + for(int i=0; i < Item.length; i++){ SetText(i,Item[i]); } } @@ -25,11 +31,11 @@ public class PageDataItem { else return null; } + public void SetText(int Index, String Text){ if (Text == null) return; - if (GetText(Index).equals(Text)) - return; + Item.add(Index,Text); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataManager.java index b6e1f1f..190584c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataManager.java @@ -11,11 +11,18 @@ import org.tizen.dynamicanalyzer.model.WarningData; import org.tizen.dynamicanalyzer.ui.views.filePage.fileChart.FileChartManager; public abstract class PageDataManager { - private List rows = null; - private PageDataColumn column = SetPageDataColumn(); + protected List rows = null; + protected PageDataColumn column = RegistePageDataColumn(); // private List warning = null; - private List failed = null; - private int ColumnCount = 0; + protected List failed = null; + protected static int PAGE_COLUMN_NUMBER = 0; + protected static int PAGE_COLUMN_TIME = 1; + protected static int PAGE_COLUMN_NAME = 2; + protected static int PAGE_COLUMN_PARAMETER = 3; + protected static int PAGE_COLUMN_THREADID = 4; + protected static int PAGE_COLUMN_RETURN = 5; + protected static int PAGE_COLUMN_ERRNO = 6; + private void AddErrorData(FailedData data){ if(null == failed) @@ -29,13 +36,13 @@ public abstract class PageDataManager { // warning.add(data); // } - private void AddPageDataItem(PageDataItem data){ + protected void AddPageDataItem(PageDataItem data){ if(null == rows) rows = new ArrayList(); rows.add(data); } - protected int FindInsertIndex(PageDataItem data, int Index){ + private int FindInsertIndex(PageDataItem data, int Index){ int ret = rows.size()-1; switch(column.GetColumnAttribute(Index)){ case PageDataColumn.COLUMN_ATTRIBUTE_INT: @@ -101,15 +108,11 @@ public abstract class PageDataManager { } //add page data - PageDataItem data = MakePageData(input); - if(null != data) - AddPageDataItem(data); + PageDataItem item = MakePageData(input); + AddPageDataItem(item); + } } - - public void SetColumnCount(int ColumnCount){ - this.ColumnCount = ColumnCount; - } public void clear(){ if(null != rows){ @@ -130,9 +133,10 @@ public abstract class PageDataManager { } } - public abstract PageDataColumn SetPageDataColumn(); + public abstract PageDataColumn RegistePageDataColumn(); public abstract List> GetLogsFromLogPackage(LogPackage logPack); public abstract PageDataItem MakePageData(List input); +// public abstract PageChartDataItem MakePageChartData(PageDataItem); //FIXME public abstract boolean ErrorCheck(List input); // public abstract boolean WarningCheck(List input); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadPageDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadPageDataManager.java index 8e16291..adfd280 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadPageDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadPageDataManager.java @@ -6,6 +6,8 @@ import java.util.List; import org.tizen.dynamicanalyzer.constants.LogCenterConstants; import org.tizen.dynamicanalyzer.model.LogPackage; import org.tizen.dynamicanalyzer.model.Logs; +import org.tizen.dynamicanalyzer.nl.CommonPageLables; +import org.tizen.dynamicanalyzer.nl.ThreadPageLables; import org.tizen.dynamicanalyzer.ui.views.pageInfo.PageDataColumn; import org.tizen.dynamicanalyzer.ui.views.pageInfo.PageDataItem; import org.tizen.dynamicanalyzer.ui.views.pageInfo.PageDataManager; @@ -13,6 +15,22 @@ import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class ThreadPageDataManager extends PageDataManager { private static ThreadPageDataManager instance = null; + private static int THREAD_PAGE_COLUMN_COUNT = 7; + + private static String[] columnNames = { CommonPageLables.COMMON_DATA_COLUMN_NUMBER, + CommonPageLables.COMMON_DATA_COLUMN_TIME, + CommonPageLables.COMMON_DATA_COLUMN_NAME, + CommonPageLables.COMMON_DATA_COLUMN_PARAMETER, + CommonPageLables.COMMON_DATA_COLUMN_THREADID, + CommonPageLables.COMMON_DATA_COLUMN_RETURN, + CommonPageLables.COMMON_DATA_COLUMN_ERRNO }; + private static Integer[] columnAttribute = { PageDataColumn.COLUMN_ATTRIBUTE_LONG, + PageDataColumn.COLUMN_ATTRIBUTE_TIME, + PageDataColumn.COLUMN_ATTRIBUTE_STRING, + PageDataColumn.COLUMN_ATTRIBUTE_STRING, + PageDataColumn.COLUMN_ATTRIBUTE_INT, + PageDataColumn.COLUMN_ATTRIBUTE_STRING, + PageDataColumn.COLUMN_ATTRIBUTE_INT }; public static ThreadPageDataManager getInstance() { if (null == instance) { @@ -22,13 +40,12 @@ public class ThreadPageDataManager extends PageDataManager { } private ThreadPageDataManager(){ - } @Override - public PageDataColumn SetPageDataColumn() { + public PageDataColumn RegistePageDataColumn() { // TODO Auto-generated method stub - PageDataColumn pageColumn = new PageDataColumn(0, null, null); + PageDataColumn pageColumn = new PageDataColumn(THREAD_PAGE_COLUMN_COUNT, columnNames, columnAttribute); return pageColumn; } @@ -62,10 +79,26 @@ public class ThreadPageDataManager extends PageDataManager { @Override public PageDataItem MakePageData(List input) { // TODO Auto-generated method stub - - return null; + PageDataItem data = new PageDataItem(column); + //number + data.SetText(PAGE_COLUMN_NUMBER, input.get(LogCenterConstants.SEQUENCE_NUMBER_INDEX)); + //time + data.SetText(PAGE_COLUMN_TIME, input.get(LogCenterConstants.TIME_INDEX)); + //name + data.SetText(PAGE_COLUMN_NAME, input.get(LogCenterConstants.APINAME_INDEX)); + //parameter + data.SetText(PAGE_COLUMN_PARAMETER, input.get(LogCenterConstants.INPUTPARM_INDEX)); + //thread id + data.SetText(PAGE_COLUMN_THREADID, input.get(LogCenterConstants.THREAD_ID_INDEX)); + //return + data.SetText(PAGE_COLUMN_RETURN, input.get(LogCenterConstants.RETURN_INDEX)); + //errno + data.SetText(PAGE_COLUMN_ERRNO, input.get(LogCenterConstants.ERROR_INDEX)); + return data; } - +// @Override +// public abstract PageChartDataItem MakePageChartData(PageDataItem){ //FIXME +//} @Override public boolean ErrorCheck(List input) { // TODO Auto-generated method stub