From 09695f8d815dbbeb544aaac65becd85692a21d98 Mon Sep 17 00:00:00 2001 From: "Hyunjong,Pakr" Date: Fri, 30 Nov 2012 17:24:05 +0900 Subject: [PATCH] [Title] fix. colume name at uiprofiling table [Desc.] userinterface page [Issue] redmine #7377 --- .../nl/UserInterfacePageLabels.properties | 16 +++++++-------- .../profiling/UIFunctionProfilingDataChecker.java | 23 ++++++---------------- .../profiling/UIFunctionProfilingView.java | 12 ++++++----- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties index 1cbb4fe..ec1c9b7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties @@ -17,11 +17,11 @@ USERINTERFACE_SNAPSHOT_VIEW_NAME = Snapshot USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_NAME = UI Function Profiling USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_0 = Library or function name -USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_1 = Elapsed sum time -USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_2 = Elapsed average time -USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_3 = Elapsed sum time -USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_4 = Elapsed average time -USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_5 = CPU sum time -USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_6 = CPU average time -USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_7 = CPU sum time -USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_8 = CPU average time \ No newline at end of file +USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_1 = Sum +USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_2 = Average +USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_3 = Sum +USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_4 = Average +USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_5 = Sum +USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_6 = Average +USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_7 = Sum +USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_8 = Average \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java index 48e3b1a..7849944 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java @@ -59,7 +59,11 @@ public class UIFunctionProfilingDataChecker { int nChangedIndex = 0; boolean bUpdateData = false; - boolean bExistParentData = false; + + if ( getDataList().size() == 0){ + makeRootParentData(input); + } + int nListSize = getDataList().size(); for (int i = 0; i < nListSize; i++) { @@ -71,21 +75,6 @@ public class UIFunctionProfilingDataChecker { break; } } - - nListSize = getDataList().size(); - for (int i = 0; i < nListSize; i++) { - if (getDataList().get(i).getAPIName().equals(input.getParent())) { // Check, - // Exist - // Parent - // Node - bExistParentData = true; - break; - } - } - if (bExistParentData == false) { - makeParentData(input); - } - UIFunctionProfilingData pd = new UIFunctionProfilingData(); ProfileDataMaker profiler = FunctionUsageProfiler.getInstance() .getProfileDataMaker(); @@ -174,7 +163,7 @@ public class UIFunctionProfilingDataChecker { return strRetrun; } - private void makeParentData(ProfilingData input) { + private void makeRootParentData(ProfilingData input) { UIFunctionProfilingData pd = new UIFunctionProfilingData(); String exTime = "-", inTime = "-", exeTime = "-", inExeTime = "-", exAvgTime = "-", inAvgTime = "-", exeAvgTime = "-", inExeAvgTime = "-"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java index 9f5da10..9efcf77 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java @@ -58,7 +58,7 @@ public class UIFunctionProfilingView extends DAView { UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_6, UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_7, UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_8 }; - private int[] columnSizes = { 280, 0, 0, 0, 0, 0, 0, 0, 0 }; + private int[] columnSizes = { 355, 80, 80, 80, 80, 80, 80, 80, 80 }; UIFunctionProfilingTable treeComp = null; private boolean[] columnVisibility = { true, true, true, true, true, true, true, true, true }; @@ -110,29 +110,31 @@ public class UIFunctionProfilingView extends DAView { columnData = new ArrayList(); ColumnData data0 = new ColumnData(columnNames[columnIndex++]); columnData.add(data0); + + - ColumnData dataInc1 = new ColumnData("Inclusive"); + ColumnData dataInc1 = new ColumnData("Inclusive Elapsed Time");//$NON-NLS-1$ ColumnData dataInc1Child1 = new ColumnData(columnNames[columnIndex++]); ColumnData dataInc1Child2 = new ColumnData(columnNames[columnIndex++]); dataInc1.getChildren().add(dataInc1Child1); dataInc1.getChildren().add(dataInc1Child2); columnData.add(dataInc1); - ColumnData dataExc1 = new ColumnData("Exclusive"); + ColumnData dataExc1 = new ColumnData("Exclusive Elapsed Time");//$NON-NLS-1$ ColumnData dataExc1Child1 = new ColumnData(columnNames[columnIndex++]); ColumnData dataExc1Child2 = new ColumnData(columnNames[columnIndex++]); dataExc1.getChildren().add(dataExc1Child1); dataExc1.getChildren().add(dataExc1Child2); columnData.add(dataExc1); - ColumnData dataInc2 = new ColumnData("Inclusive"); + ColumnData dataInc2 = new ColumnData("Inclusive CPU Time");//$NON-NLS-1$ ColumnData dataInc2Child1 = new ColumnData(columnNames[columnIndex++]); ColumnData dataInc2Child2 = new ColumnData(columnNames[columnIndex++]); dataInc2.getChildren().add(dataInc2Child1); dataInc2.getChildren().add(dataInc2Child2); columnData.add(dataInc2); - ColumnData dataExc2 = new ColumnData("Exclusive"); + ColumnData dataExc2 = new ColumnData("Exclusive CPU Time");//$NON-NLS-1$ ColumnData dataExc2Child1 = new ColumnData(columnNames[columnIndex++]); ColumnData dataExc2Child2 = new ColumnData(columnNames[columnIndex++]); dataExc2.getChildren().add(dataExc2Child1); -- 2.7.4