[SRADA-811] Implement View - Report function

Change-Id: Id0aa6d267f604889edcaa4cd5d331121fe1c6a77

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
index e5b9792..88618ed 100644 (file)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
@@ -482,6 +482,9 @@ public class DATabComposite extends DABaseComposite {
                        contentsStackLayout.topControl = lasttab;
                        contentsComposite.layout();
                }
+               
+               contentsComposite.layout();
+               tabComposite.layout();
        }
        
        /**

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
index 5048e4c..f75bdbc 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
@@ -114,7 +114,9 @@ public class UIAction {
                                // change profiling table in summary page
                                FunctionUsageProfilingView userFunctionProfilingView = (FunctionUsageProfilingView) AnalyzerUtil
                                                .getView(TimelinePage.pageID, FunctionUsageProfilingView.class.getName());
-                               userFunctionProfilingView.changeTable(isWeb);
+                               if(userFunctionProfilingView != null) {
+                                       userFunctionProfilingView.changeTable(isWeb);
+                               }
                        }
                });
        }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MenuBarLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MenuBarLabels.java
index fa84f31..f585a1c 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MenuBarLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MenuBarLabels.java
@@ -49,8 +49,8 @@ public class MenuBarLabels extends NLS {
        public static String VIEW;
        public static String VIEW_DETAIL;
        public static String VIEW_REPORT;
-       public static String VIEW_STATISTICS;
-       public static String VIEW_TRACE;
+       public static String VIEW_FAILED_API;
+       public static String VIEW_WARNING;
        public static String VIEW_FUNCTION_PROFILING;
        public static String VIEW_NAVIGATE;
        public static String VIEW_ZOOM_IN;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MenuBarLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MenuBarLabels.properties
index 7fdf25b..d444912 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MenuBarLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MenuBarLabels.properties
@@ -19,8 +19,8 @@ ANALYZE_SET_AS_DEFAULT=Set as default features
 VIEW=View
 VIEW_DETAIL=Detail
 VIEW_REPORT=Report
-VIEW_STATISTICS=Statistics
-VIEW_TRACE=Trace
+VIEW_FAILED_API=Failed API
+VIEW_WARNING=Warning
 VIEW_FUNCTION_PROFILING=Function Profiling
 VIEW_NAVIGATE=Navigate
 VIEW_ZOOM_IN=Zoom In

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java
index 8ca855e..517c9a3 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java
@@ -75,6 +75,8 @@ public class SummaryLabels extends NLS {
 
        public static String WARNING_CASE_PRE_FIX;
 
+       public static String WARNING_DATA_VIEW_TITLE;
+       
        public static String WARNING_LIST_VIEW_TITLE;
        public static String WARNING_LIST_VIEW_CATEGORY;
        public static String WARNING_LIST_VIEW_PID;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties
index 5d2eddd..952ea1e 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties
@@ -41,6 +41,8 @@ WARNING_CASE_POST_CONCURRENT_ACCESS=> It is recommended to lock the file before
 
 WARNING_CASE_PRE_FIX=<
 
+WARNING_DATA_VIEW_TITLE=Warning
+
 WARNING_LIST_VIEW_TITLE=Warnings
 WARNING_LIST_VIEW_CATEGORY=Category
 WARNING_LIST_VIEW_PID=PID

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java
index d76fb01..082923e 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java
@@ -52,10 +52,14 @@ import org.tizen.dynamicanalyzer.ui.network.NetworkPage;
 import org.tizen.dynamicanalyzer.ui.opengl.GLPage;
 import org.tizen.dynamicanalyzer.ui.opengl.chart.GLChartView;
 import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
+import org.tizen.dynamicanalyzer.ui.summary.failed.FailedApiListView;
+import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView;
+import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataView;
 import org.tizen.dynamicanalyzer.ui.thread.ThreadPage;
 import org.tizen.dynamicanalyzer.ui.thread.chart.ThreadChartView;
 import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartView;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.toolbar.AboutDialog;
 import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;
 import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceProgressManager;
@@ -162,20 +166,20 @@ public class MenuBar {
                Menu viewReportMenu = new Menu(currentShell, SWT.DROP_DOWN);
                viewReport.setMenu(viewReportMenu);
 
-               MenuItem viewReportStatistics = new MenuItem(viewReportMenu, SWT.CHECK);
-               viewReportStatistics.setText(MenuBarLabels.VIEW_STATISTICS);
-               viewReportStatistics.addSelectionListener(viewReportMenuListener);
-               viewReportStatistics.setEnabled(false);
-
-               MenuItem viewReportTrace = new MenuItem(viewReportMenu, SWT.CHECK);
-               viewReportTrace.setText(MenuBarLabels.VIEW_TRACE);
-               viewReportTrace.addSelectionListener(viewReportMenuListener);
-               viewReportTrace.setEnabled(false);
-
                MenuItem viewReportFunctionprofiling = new MenuItem(viewReportMenu, SWT.CHECK);
                viewReportFunctionprofiling.setText(MenuBarLabels.VIEW_FUNCTION_PROFILING);
                viewReportFunctionprofiling.addSelectionListener(viewReportMenuListener);
-               viewReportFunctionprofiling.setEnabled(false);
+//             viewReportFunctionprofiling.setEnabled(false);
+               
+               MenuItem viewReportFailedAPI = new MenuItem(viewReportMenu, SWT.CHECK);
+               viewReportFailedAPI.setText(MenuBarLabels.VIEW_FAILED_API);
+               viewReportFailedAPI.addSelectionListener(viewReportMenuListener);
+//             viewReportStatistics.setEnabled(false);
+
+               MenuItem viewReportWarning = new MenuItem(viewReportMenu, SWT.CHECK);
+               viewReportWarning.setText(MenuBarLabels.VIEW_WARNING);
+               viewReportWarning.addSelectionListener(viewReportMenuListener);
+//             viewReportTrace.setEnabled(false);
 
                MenuItem viewNavigate = new MenuItem(viewMenu, SWT.CASCADE);
                viewNavigate.setText(MenuBarLabels.VIEW_NAVIGATE);
@@ -379,13 +383,37 @@ public class MenuBar {
                        } else {
                                return;
                        }
-
-                       if (menuName.equals(MenuBarLabels.VIEW_STATISTICS)) {
-
-                       } else if (menuName.equals(MenuBarLabels.VIEW_FUNCTION_PROFILING)) {
-
-                       } else if (menuName.equals(MenuBarLabels.VIEW_TRACE)) {
-
+                       
+                       TimelineTableView tableView = (TimelineTableView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineTableView.class.getName());
+                       MenuItem source = (MenuItem) arg0.getSource();
+                       if (menuName.equals(MenuBarLabels.VIEW_FUNCTION_PROFILING)) {
+                               if(source.getSelection()) {
+                                       FunctionUsageProfilingView userFunctionProfilingView = new FunctionUsageProfilingView(tableView.getContentComposite(), 
+                                                       SWT.NONE);
+                                       if(Global.getProject() != null) {
+                                               boolean isWeb = Global.getProject().isWebApplication();
+                                               userFunctionProfilingView.changeTable(isWeb);
+                                       }
+                                       tableView.addView(userFunctionProfilingView);
+                               } else {
+                                       tableView.removeView(FunctionUsageProfilingView.class.getName(), false);
+                               }
+                       } else if (menuName.equals(MenuBarLabels.VIEW_FAILED_API)) {
+                               if(source.getSelection()) {
+                                       FailedApiListView failedApiListView = new FailedApiListView(tableView.getContentComposite(),
+                                                       SWT.NONE);
+                                       tableView.addView(failedApiListView);
+                               } else {
+                                       tableView.removeView(FailedApiListView.class.getName(), false);
+                               }
+                       } else if (menuName.equals(MenuBarLabels.VIEW_WARNING)) {
+                               if(source.getSelection()) {
+                                       WarningDataView warningView = new WarningDataView(tableView.getContentComposite(),
+                                                       SWT.NONE);
+                                       tableView.addView(warningView);
+                               } else {
+                                       tableView.removeView(WarningDataView.class.getName(), false);
+                               }
                        }
                }
        };

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataView.java
index 04805b8..e9f0198 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataView.java
@@ -19,7 +19,7 @@ public class WarningDataView extends DAViewComposite {
                super(parent, style, false);\r
                this.setLayout(new FillLayout());\r
                \r
-               setTitle(SummaryLabels.WARNING_LIST_VIEW_TITLE);\r
+               setTitle(SummaryLabels.WARNING_DATA_VIEW_TITLE);\r
                \r
                Composite contents = getContentArea();\r
                contents.setBackground(ColorResources.WHITE);\r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java
index a7fc814..455cf66 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java
@@ -124,6 +124,10 @@ public class TimelinePage extends DAPageComposite {
                return timelineChartView;
        }
        
+       public TimelineTableView getTimelineTableView() {
+               return timelineTableView;
+       }
+       
        @Override
        protected void onResized(int width, int height) {
                int hrate = (int) (TimelineTableView.DEFAULT_TABLE_VIEW_HEIGHT * 100 / height);
@@ -145,5 +149,7 @@ public class TimelinePage extends DAPageComposite {
                CallTraceDataManager.getInstance().clear();
                InteractiveDataManager.getInstance().clear();
                ScreenshotDataManager.getInstance().clear();
+               FunctionUsageProfiler.getInstance().clear();
+               SummaryDataManager.getInstance().clear();
        }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineTableView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineTableView.java
index e3baf8b..5562c19 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineTableView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineTableView.java
@@ -72,17 +72,5 @@ public class TimelineTableView extends DATabComposite {
                AppStartupView appStartup = new AppStartupView(getContentComposite(),
                                SWT.NONE);
                addView(appStartup, false);
-               
-               FunctionUsageProfilingView userFunctionProfilingView = new FunctionUsageProfilingView(getContentComposite(), 
-                               SWT.NONE);
-               addView(userFunctionProfilingView);
-               
-               FailedApiListView failedApiListView = new FailedApiListView(getContentComposite(),
-                               SWT.NONE);
-               addView(failedApiListView);
-               
-               WarningDataView warningView = new WarningDataView(getContentComposite(),
-                               SWT.NONE);
-               addView(warningView);
        }
 }