[SRADA-416] Relocate the table view at timeline page
authorjaeyong lee <jae-yong.lee@samsung.com>
Tue, 26 Apr 2016 06:18:50 +0000 (15:18 +0900)
committerdongkyu6 lee <dongkyu6.lee@samsung.com>
Fri, 29 Apr 2016 01:24:32 +0000 (10:24 +0900)
Change-Id: I50ef42caab7fb54b2a47daa3b9adaf744d581b34

31 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/InformationViewLabels.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/InformationViewLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/appStartup/AppStartupTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/appStartup/WebAppStartupTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/interactive/InteractivePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/searchbar/SearchBarView.java [new file with mode: 0644]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartView.java [moved from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java with 98% similarity]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineTableView.java [moved from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java with 67% similarity]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogView.java [new file with mode: 0644]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/uievent/UIEventListDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java

index 001b395..e6b0d68 100644 (file)
@@ -53,7 +53,6 @@ import org.tizen.dynamicanalyzer.ui.memory.MemoryPage;
 import org.tizen.dynamicanalyzer.ui.network.NetworkPage;
 import org.tizen.dynamicanalyzer.ui.opengl.GLPage;
 import org.tizen.dynamicanalyzer.ui.page.BaseView;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.summary.SummaryPage;
 import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView;
 import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView;
@@ -61,6 +60,7 @@ import org.tizen.dynamicanalyzer.ui.thread.ThreadPage;
 import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.CallTraceView;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.userinterface.UIPage;
 import org.tizen.dynamicanalyzer.util.Logger;
 import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
@@ -107,9 +107,9 @@ public class UIAction {
                        public void run() {
                                // change startup table in timeline page
                                DATabComposite timelineTabComp = (DATabComposite) AnalyzerUtil.getView(
-                                               TimelinePage.pageID, ScreenshotTabComposite.tabID);
+                                               TimelinePage.pageID, TimelineTableView.tabID);
                                AppStartupView appStartup = (AppStartupView) timelineTabComp
-                                               .getView(ScreenshotTabComposite.appStartupViewID);
+                                               .getView(TimelineTableView.appStartupViewID);
                                appStartup.changeTable(isWeb);
 
                                // change call trace table in timeline page
index 0758d1d..16ec934 100644 (file)
@@ -41,7 +41,7 @@ ABOUT_TITLE=About Dynamic Analyzer
 LICENSE=License
 CONFIGURATION=Configuration
 WELCOME=Welcome
-SETTING_TITLE=Select features to analyze
+SETTING_TITLE=Settings
 # SingletonInfoDlg.
 REPLAYEDIT=Replay Editor
 
index 51cd3ab..be4910f 100644 (file)
@@ -48,8 +48,7 @@ public class ConfigureLabels extends NLS {
 
        public static String SETTING_DIALOG_DESCRIPTION;
        public static String SETTING_DIALOG_TARGET_TITLE;
-       public static String SETTING_DIALOG_FEATURELIST_TITLE;
-       public static String SETTING_DIALOG_SELECTED_TITLE;
+       public static String SETTING_DIALOG_TEMPLATE_TITLE;
        public static String SETTING_DIALOG_OVERHEAD;
        public static String SETTING_DIALOG_OVERHEAD_DESCRIPTION;
        
index c8ed93a..f563713 100644 (file)
@@ -22,9 +22,8 @@ AUTO=auto :
 SAMPLING=sampling rate :
 
 SETTING_DIALOG_DESCRIPTION=Choose a target and template
-SETTING_DIALOG_TARGET_TITLE=Target
-SETTING_DIALOG_FEATURELIST_TITLE=Feature List
-SETTING_DIALOG_SELECTED_TITLE=Selected Features
+SETTING_DIALOG_TARGET_TITLE=Targets
+SETTING_DIALOG_TEMPLATE_TITLE=Template
 SETTING_DIALOG_OVERHEAD=Overhead : 
 SETTING_DIALOG_OVERHEAD_DESCRIPTION=The overhead is the estimation of runtime overhead.
 FEATURE_DIALOG_FEATURE_TABLE_COLUMN_NAME=Features
@@ -113,4 +112,4 @@ SETTING_OPTION_AUTO_STOP=Auto-stop while replaying
 FEATURE_OVERHEAD_RANKING_NORMAL=This feature can cause normal overhead
 FEATURE_OVERHEAD_RANKING_MIDDLE=This feature can cause middle overhead
 FEATURE_OVERHEAD_RANKING_HIGH=This feature can cause high overhead
-FEATURE_OVERHEAD_RANKING_INPUT_VALUE=The feature overhead may occur depending on the input value
+FEATURE_OVERHEAD_RANKING_INPUT_VALUE=The feature overhead may occur depending on the input value
\ No newline at end of file
index f1fcc2d..7d7221a 100644 (file)
@@ -102,6 +102,8 @@ public class InformationViewLabels extends NLS {
        public static String APP_STARTUP_VIEW_END_TIME;
        public static String APP_STARTUP_VIEW_ELAPSED_TIME;
        
+       public static String DLOG_VIEW_TITLE;
+       
        static {
                // initialize resource bundle
                NLS.initializeMessages(BUNDLE_NAME, InformationViewLabels.class);
index 6970b0e..2b3bace 100644 (file)
@@ -35,7 +35,7 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 
@@ -82,12 +82,12 @@ public class FilePage extends DAPageComposite {
                                SWT.NONE);
                addView(detailInfo);
 
-               ScreenshotTabComposite tabview = new ScreenshotTabComposite(rightForm,
+               TimelineTableView tabview = new TimelineTableView(rightForm,
                                SWT.NONE, FilePage.pageID);
-               tabview.setObservingViews(ScreenshotTabComposite.screenshotViewID,
-                               new String[] { FilePage.apilistViewID });
-               tabview.setObservingViews(ScreenshotTabComposite.callstackViewID,
-                               new String[] { FilePage.apilistViewID });
+//             tabview.setObservingViews(TimelineTableView.screenshotViewID,
+//                             new String[] { FilePage.apilistViewID });
+//             tabview.setObservingViews(TimelineTableView.callstackViewID,
+//                             new String[] { FilePage.apilistViewID });
                addView(tabview);
 
                rightForm.setWeights(new int[] { 50, 50 });
@@ -102,8 +102,8 @@ public class FilePage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
index 93138b2..731488e 100644 (file)
@@ -38,8 +38,8 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.model.TableInput;
 import org.tizen.dynamicanalyzer.nl.InformationViewLabels;
 import org.tizen.dynamicanalyzer.swap.model.data.AppStartupData;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
@@ -82,7 +82,7 @@ public class AppStartupTable extends DATableComposite {
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                AnalyzerManager.getCurrentPage().updateView(
-                                               new DAViewData(ScreenshotTabComposite.tabID, null));
+                                               new DAViewData(TimelineTableView.tabID, null));
                                GridItem[] sels = table.getSelection();
                                if (sels.length > 0) {
                                        table.setFocusItem(sels[0]);
index acf3e34..66ca3f9 100644 (file)
@@ -47,8 +47,8 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants;
 import org.tizen.dynamicanalyzer.model.TableInput;
 import org.tizen.dynamicanalyzer.nl.InformationViewLabels;
 import org.tizen.dynamicanalyzer.swap.model.data.WebAppStartupData;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
@@ -106,7 +106,7 @@ public class WebAppStartupTable extends DATableComposite {
                         @Override
                         public void widgetSelected(SelectionEvent e) {
                                AnalyzerManager.getCurrentPage().updateView(
-                                               new DAViewData(ScreenshotTabComposite.tabID, null));
+                                               new DAViewData(TimelineTableView.tabID, null));
                                 GridItem[] sels = table.getSelection();
                                 if (sels.length > 0) {
                                         table.setFocusItem(sels[0]);
index 080c07d..04a9726 100644 (file)
@@ -46,10 +46,10 @@ import org.tizen.dynamicanalyzer.project.callstack.RuntimeCallstackManager;
 import org.tizen.dynamicanalyzer.swap.model.data.LogData;
 import org.tizen.dynamicanalyzer.ui.file.FilePage;
 import org.tizen.dynamicanalyzer.ui.opengl.GLPage;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.range.RangePage;
 import org.tizen.dynamicanalyzer.ui.summary.SummaryPage;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.FunctionEntryDBTable;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.userinterface.UIPage;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
@@ -66,7 +66,7 @@ public class CallstackTable extends DATableComposite {
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                AnalyzerManager.getCurrentPage().updateView(
-                                               new DAViewData(ScreenshotTabComposite.tabID, null));
+                                               new DAViewData(TimelineTableView.tabID, null));
                                GridItem[] sels = table.getSelection();
                                if (sels.length <= 0) {
                                        return;
index 6483dc1..788964f 100644 (file)
@@ -56,7 +56,7 @@ import org.tizen.dynamicanalyzer.common.ScreenshotConstants;
 import org.tizen.dynamicanalyzer.project.ImageInfo;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.util.Logger;
 
 public class ImageViewer extends Composite {
@@ -378,7 +378,7 @@ public class ImageViewer extends Composite {
 
        private void widgetSelected(long time) {
                AnalyzerManager.getCurrentPage().updateView(
-                               new DASelectionData(ScreenshotTabComposite.imageViewerID, time, time, null, null));
+                               new DASelectionData(TimelineTableView.imageViewerID, time, time, null, null));
        }
 
        private void leftArrowAction() {
index cd76963..f30f8eb 100644 (file)
@@ -59,8 +59,8 @@ import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.swap.model.data.LogData;
 import org.tizen.dynamicanalyzer.ui.opengl.GLPage;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
@@ -237,7 +237,7 @@ public class ScreenshotView extends DAViewComposite {
 
                                // TODO : erase this. i think this is unnecessary. useless.
                                DASelectionData selData = new DASelectionData(
-                                               ScreenshotTabComposite.screenshotViewID, selStartTime, Toolbar.INSTANCE
+                                               TimelineTableView.screenshotViewID, selStartTime, Toolbar.INSTANCE
                                                                .getTime(), null, latestButton);
                                AnalyzerManager.getCurrentPage().updateView(selData);
 
@@ -313,7 +313,7 @@ public class ScreenshotView extends DAViewComposite {
 
                        setLatestMode(false);
                        long selStartTime = selData.getStartTime();
-                       if (selData.getViewID().equals(ScreenshotTabComposite.imageViewerID)) {
+                       if (selData.getViewID().equals(TimelineTableView.imageViewerID)) {
                                if (selStartTime < 0) {
                                        selStartTime = 0;
                                }
index 39beeb8..b4b07cf 100644 (file)
@@ -36,8 +36,8 @@ import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.interactive.chart.InteractiveChartView;
 import org.tizen.dynamicanalyzer.ui.interactive.data.InteractiveDataManager;
 import org.tizen.dynamicanalyzer.ui.interactive.table.InteractiveTableView;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.CallTraceView;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 
@@ -75,12 +75,12 @@ public class InteractivePage extends DAPageComposite {
                CallTraceView apiListView = new CallTraceView(rightForm, SWT.NONE);
                addView(apiListView);
 
-               ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm,
+               TimelineTableView tabView = new TimelineTableView(rightForm,
                                SWT.NONE, InteractivePage.pageID);
-               tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
-                               new String[] { InteractivePage.chartViewID });
-               tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
-                               new String[] { InteractivePage.listViewID });
+//             tabView.setObservingViews(TimelineTableView.screenshotViewID,
+//                             new String[] { InteractivePage.chartViewID });
+//             tabView.setObservingViews(TimelineTableView.screenshotViewID,
+//                             new String[] { InteractivePage.listViewID });
                addView(tabView);
 
                rightForm.setWeights(new int[] { 50, 50 });
@@ -95,8 +95,8 @@ public class InteractivePage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
index 96755bd..927bc67 100644 (file)
@@ -34,7 +34,7 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataManager;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
@@ -88,12 +88,12 @@ public class KernelPage extends DAPageComposite {
                KernelStatisticInfoView statInfo = new KernelStatisticInfoView(rightForm, SWT.NONE);
                addView(statInfo);
 
-               ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, SWT.NONE,
+               TimelineTableView tabView = new TimelineTableView(rightForm, SWT.NONE,
                                KernelPage.pageID);
-               tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
-                               new String[] { KernelPage.listViewID });
-               tabView.setObservingViews(ScreenshotTabComposite.callstackViewID,
-                               new String[] { KernelPage.listViewID });
+//             tabView.setObservingViews(TimelineTableView.screenshotViewID,
+//                             new String[] { KernelPage.listViewID });
+//             tabView.setObservingViews(TimelineTableView.callstackViewID,
+//                             new String[] { KernelPage.listViewID });
                addView(tabView);
 
                rightForm.setWeights(new int[] { 50, 50 });
@@ -104,8 +104,8 @@ public class KernelPage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
index a66c93b..487a45b 100644 (file)
@@ -34,7 +34,7 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.memory.data.MemoryDataManager;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
 
@@ -115,8 +115,8 @@ public class MemoryPage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
index d5b44e1..9624b78 100644 (file)
@@ -35,7 +35,7 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.network.data.NetworkDataManager;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 
@@ -80,12 +80,12 @@ public class NetworkPage extends DAPageComposite {
                                SWT.NONE);
                addView(detailInfo);
 
-               ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm,
+               TimelineTableView tabView = new TimelineTableView(rightForm,
                                SWT.NONE, NetworkPage.pageID);
-               tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
-                               new String[] { NetworkPage.listViewID });
-               tabView.setObservingViews(ScreenshotTabComposite.callstackViewID,
-                               new String[] { NetworkPage.listViewID });
+//             tabView.setObservingViews(TimelineTableView.screenshotViewID,
+//                             new String[] { NetworkPage.listViewID });
+//             tabView.setObservingViews(TimelineTableView.callstackViewID,
+//                             new String[] { NetworkPage.listViewID });
                addView(tabView);
 
                rightForm.setWeights(new int[] { 50, 50 });
@@ -101,8 +101,8 @@ public class NetworkPage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
index b652d69..7c091b0 100644 (file)
@@ -43,7 +43,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.table.state.GLProgramTableView;
 import org.tizen.dynamicanalyzer.ui.opengl.table.state.GLRedundantTableView;
 import org.tizen.dynamicanalyzer.ui.opengl.table.state.GLStatisticsTableView;
 import org.tizen.dynamicanalyzer.ui.opengl.table.state.GLTextureTableView;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.widgets.DAAdvancedTabComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
@@ -143,12 +143,12 @@ public class GLPage extends DAPageComposite {
                GLDetailsView detailsView = new GLDetailsView(rightForm, SWT.NONE);
                addView(detailsView);
 
-               ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, SWT.NONE,
+               TimelineTableView tabView = new TimelineTableView(rightForm, SWT.NONE,
                                GLPage.pageID);
-               tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
-                               new String[] { GLPage.apiListViewID });
-               tabView.setObservingViews(ScreenshotTabComposite.callstackViewID,
-                               new String[] { GLPage.apiListViewID });
+//             tabView.setObservingViews(TimelineTableView.screenshotViewID,
+//                             new String[] { GLPage.apiListViewID });
+//             tabView.setObservingViews(TimelineTableView.callstackViewID,
+//                             new String[] { GLPage.apiListViewID });
                addView(tabView);
 
                rightForm.setWeights(new int[] { 50, 50 });
@@ -164,8 +164,8 @@ public class GLPage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
index 103082e..fadd137 100644 (file)
@@ -33,7 +33,7 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
@@ -83,11 +83,11 @@ public class RangePage extends DAPageComposite {
                addView(leakView);
 
                // INFO_VIEW_INDEX = 2;
-               ScreenshotTabComposite tabView = new ScreenshotTabComposite(upperForm,
+               TimelineTableView tabView = new TimelineTableView(upperForm,
                                SWT.NONE, RangePage.pageID);
-               tabView.setObservingViews(ScreenshotTabComposite.callstackViewID,
-                               new String[] { RangePage.failedListViewID,
-                                               RangePage.leakViewID, RangePage.warningListViewID });
+//             tabView.setObservingViews(TimelineTableView.callstackViewID,
+//                             new String[] { RangePage.failedListViewID,
+//                                             RangePage.leakViewID, RangePage.warningListViewID });
                addView(tabView);
 
                upperForm.setWeights(new int[] { 37, 40, 23 });
@@ -115,8 +115,8 @@ public class RangePage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/searchbar/SearchBarView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/searchbar/SearchBarView.java
new file mode 100644 (file)
index 0000000..196833d
--- /dev/null
@@ -0,0 +1,14 @@
+package org.tizen.dynamicanalyzer.ui.searchbar;\r
+\r
+import org.eclipse.swt.layout.FillLayout;\r
+import org.eclipse.swt.widgets.Composite;\r
+import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite;\r
+\r
+public class SearchBarView  extends DAViewComposite {\r
+\r
+       public SearchBarView(Composite parent, int style) {\r
+               super(parent, style, false);\r
+               this.setLayout(new FillLayout());\r
+       }\r
+\r
+}\r
index a69a0a7..a6a11f6 100644 (file)
@@ -35,13 +35,13 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.summary.failed.FailedApiListView;
 import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView;
 import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler;
 import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView;
 import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDetailView;
 import org.tizen.dynamicanalyzer.ui.summary.warning.WarningListView;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 
index 9f6de2a..9ef74fb 100644 (file)
@@ -36,9 +36,9 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.thread.chart.ThreadChartView;
 import org.tizen.dynamicanalyzer.ui.thread.data.ThreadDataManager;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 
@@ -79,12 +79,12 @@ public class ThreadPage extends DAPageComposite {
                ThreadDetailInfoView detailInfo = new ThreadDetailInfoView(rightForm, SWT.NONE);
                addView(detailInfo);
 
-               ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, SWT.NONE,
+               TimelineTableView tabView = new TimelineTableView(rightForm, SWT.NONE,
                                ThreadPage.pageID);
-               tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
-                               new String[] { ThreadPage.listViewID });
-               tabView.setObservingViews(ScreenshotTabComposite.callstackViewID,
-                               new String[] { ThreadPage.listViewID });
+//             tabView.setObservingViews(TimelineTableView.screenshotViewID,
+//                             new String[] { ThreadPage.listViewID });
+//             tabView.setObservingViews(TimelineTableView.callstackViewID,
+//                             new String[] { ThreadPage.listViewID });
                addView(tabView);
 
                rightForm.setWeights(new int[] { 50, 50 });
@@ -99,8 +99,8 @@ public class ThreadPage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
index 7c4c5ce..5491d82 100644 (file)
@@ -36,18 +36,19 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.interactive.data.InteractiveDataManager;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.searchbar.SearchBarView;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.CallTraceDataManager;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.CallTraceView;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager;
-import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartView;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.toolbar.replay.data.ReplayDataManager;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class TimelinePage extends DAPageComposite {
        public static final String pageID = TimelinePage.class.getName();
-       public static final String timelineViewID = TimelineView.class.getName();
+       public static final String timelineViewID = TimelineChartView.class.getName();
        public static final String calltraceViewID = CallTraceView.class.getName();
 
        SashForm baseForm;
@@ -64,32 +65,31 @@ public class TimelinePage extends DAPageComposite {
                baseForm = new SashForm(this, SWT.VERTICAL);
                baseForm.setLayout(new FillLayout());
                baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
-               ((FillLayout) getLayout()).marginHeight = 15;
-               ((FillLayout) getLayout()).marginWidth = 5;
+               ((FillLayout) getLayout()).marginHeight = 0;
+               ((FillLayout) getLayout()).marginWidth = 0;
 
-               leftForm = new SashForm(baseForm, SWT.HORIZONTAL);
+               leftForm = new SashForm(baseForm, SWT.VERTICAL);
 
                // index 0 : TIMELINE_INDEX
-               TimelineView timelineComp = new TimelineView(leftForm, SWT.NONE);
-               addView(timelineComp);
+               TimelineChartView timelineChartView = new TimelineChartView(leftForm, SWT.NONE);
+               addView(timelineChartView);
 
-               rightForm = new SashForm(leftForm, SWT.VERTICAL);
+               rightForm = new SashForm(leftForm, SWT.HORIZONTAL);
 
-               // index 2 : APILIST_INDEX
-               CallTraceView apiListView = new CallTraceView(rightForm, SWT.NONE);
-               addView(apiListView);
 
                // index 1 : INFO_INDEX
-               ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, SWT.NONE,
+               TimelineTableView timelineTableView = new TimelineTableView(rightForm, SWT.NONE,
                                TimelinePage.pageID);
-               tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
-                               new String[] { TimelinePage.timelineViewID });
-               tabView.setObservingViews(ScreenshotTabComposite.callstackViewID,
-                               new String[] { TimelinePage.calltraceViewID });
-               addView(tabView);
+//             tabView.setObservingViews(TimelineTableView.screenshotViewID,
+//                             new String[] { TimelinePage.timelineViewID });
+//             tabView.setObservingViews(TimelineTableView.callstackViewID,
+//                             new String[] { TimelinePage.calltraceViewID });
+               addView(timelineTableView);
+               
+               SearchBarView searchBarView = new SearchBarView(leftForm, SWT.NONE);
+               addView(searchBarView);
 
-               leftForm.setWeights(new int[] { 75, 25 });
-               rightForm.setWeights(new int[] { 50, 50 });
+               leftForm.setWeights(new int[] { 60, 30, 10 });
 
                leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
                rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
@@ -101,18 +101,18 @@ public class TimelinePage extends DAPageComposite {
        }
 
        @Override
-       protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
-               wrate = (wrate > 100) ? 100 : wrate;
-               hrate = (hrate > 100) ? 100 : hrate;
-
-               if ((wrate > (100 - 37)) || hrate > 100) {
-                       return;
-               }
-
-               leftForm.setWeights(new int[] { 100 - wrate, wrate });
-               rightForm.setWeights(new int[] { 100 - hrate, hrate });
+       protected void onResized(int width, int height) { //TODO: need to modify
+//             int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+//             int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
+//             wrate = (wrate > 100) ? 100 : wrate;
+//             hrate = (hrate > 100) ? 100 : hrate;
+//
+//             if ((wrate > (100 - 37)) || hrate > 100) {
+//                     return;
+//             }
+//
+//             leftForm.setWeights(new int[] { 100 - wrate, wrate });
+//             rightForm.setWeights(new int[] { 100 - hrate, hrate });
        }
 
        @Override
index ba3c646..dfe28b9 100644 (file)
@@ -45,8 +45,8 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView;
 import org.tizen.dynamicanalyzer.ui.interactive.InteractivePage;
 import org.tizen.dynamicanalyzer.ui.interactive.data.InteractiveUIData;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DAWindowingTableComposite;
 import org.tizen.dynamicanalyzer.util.Logger;
@@ -64,7 +64,7 @@ public class CallTraceView extends DAViewComposite {
        private WebCallTraceTable webTable = null;
        
        public CallTraceView(Composite parent, int style) {
-               super(parent, style, true);
+               super(parent, style, false);
                this.setLayout(new FillLayout());
 
                setTitle(TimelinePageLabels.CALL_TRACE_VIEW_TITLE);
@@ -114,7 +114,7 @@ public class CallTraceView extends DAViewComposite {
                        if (stackLayout.topControl == nativeTable) {
                                if (selData.getViewID().equals(TimelinePage.timelineViewID)) {
                                        DATabComposite tabView = (DATabComposite) AnalyzerUtil.getView(
-                                                       TimelinePage.pageID, ScreenshotTabComposite.tabID);
+                                                       TimelinePage.pageID, TimelineTableView.tabID);
                                        if (tabView == null) {
                                                Logger.warning("Tabview does not exist.");
                                        } else {
@@ -60,7 +60,7 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData;
 import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline;
 
-public class TimelineView extends DAViewComposite {
+public class TimelineChartView extends DAViewComposite {
        private final DAChartBoard chartBoard;
 
        private final TimelineChartManager timelineChartManager = TimelineChartManager
@@ -71,7 +71,7 @@ public class TimelineView extends DAViewComposite {
        private final LifecycleLogParser lifecycleLogParser = LifecycleLogParser
                        .getInstance();
 
-       public TimelineView(Composite parent, int style) {
+       public TimelineChartView(Composite parent, int style) {
                super(parent, style, false);
                setLayout(new FillLayout());
 
@@ -24,7 +24,7 @@
  * 
  */
 
-package org.tizen.dynamicanalyzer.ui.page;
+package org.tizen.dynamicanalyzer.ui.timeline.common;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -34,11 +34,13 @@ import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView;
 import org.tizen.dynamicanalyzer.ui.info.screenshot.ImageViewer;
 import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotView;
 import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage;
+import org.tizen.dynamicanalyzer.ui.timeline.calltrace.CallTraceView;
+import org.tizen.dynamicanalyzer.ui.timeline.dlog.DlogView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
 
-public class ScreenshotTabComposite extends DATabComposite {
-       public static final String tabID = ScreenshotTabComposite.class.getName();
+public class TimelineTableView extends DATabComposite {
+       public static final String tabID = TimelineTableView.class.getName();
        public static final String screenshotViewID = ScreenshotView.class.getName();
        public static final String callstackViewID = CallstackView.class.getName();
        public static final String imageViewerID = ImageViewer.class.getName();
@@ -52,12 +54,16 @@ public class ScreenshotTabComposite extends DATabComposite {
                ID = tabID;
        }
 
-       public ScreenshotTabComposite(Composite parent, int style, String pageID) {
+       public TimelineTableView(Composite parent, int style, String pageID) {
                super(parent, style, false);
 
-               ScreenshotView screenshotView = new ScreenshotView(getContentComposite(),
-                               SWT.NONE, false, pageID);
-               addView(screenshotView, false);
+//             DlogView dlogView = new DlogView(getContentComposite(),
+//                             SWT.NONE);
+//             addView(dlogView);
+               
+               CallTraceView callTraceView = new CallTraceView(getContentComposite(),
+                               SWT.NONE);
+               addView(callTraceView, false);
 
                CallstackView callstack = new CallstackView(getContentComposite(),
                                SWT.NONE);
@@ -70,17 +76,17 @@ public class ScreenshotTabComposite extends DATabComposite {
                }
        }
 
-       public void setObservingViews(String viewid, String[] observingIDs) {
-               DABaseComposite view = getView(viewid);
-               if (view instanceof ScreenshotView) {
-                       ((ScreenshotView) view).setObservingViews(observingIDs);
-               } else if (view instanceof CallstackView) {
-                       ((CallstackView) view).setObservingViews(observingIDs);
-               } else if (view instanceof AppStartupView) {
-                       ((AppStartupView) view).setObservingViews(observingIDs);
-               } else {
-                       // do nothing
-               }
-       }
+//     public void setObservingViews(String viewid, String[] observingIDs) {
+//             DABaseComposite view = getView(viewid);
+//             if (view instanceof ScreenshotView) {
+//                     ((ScreenshotView) view).setObservingViews(observingIDs);
+//             } else if (view instanceof CallstackView) {
+//                     ((CallstackView) view).setObservingViews(observingIDs);
+//             } else if (view instanceof AppStartupView) {
+//                     ((AppStartupView) view).setObservingViews(observingIDs);
+//             } else {
+//                     // do nothing
+//             }
+//     }
 
 }
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogView.java
new file mode 100644 (file)
index 0000000..809c869
--- /dev/null
@@ -0,0 +1,17 @@
+package org.tizen.dynamicanalyzer.ui.timeline.dlog;\r
+\r
+import org.eclipse.swt.layout.FillLayout;\r
+import org.eclipse.swt.widgets.Composite;\r
+import org.tizen.dynamicanalyzer.nl.InformationViewLabels;\r
+import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite;\r
+\r
+public class DlogView  extends DAViewComposite {\r
+\r
+       public DlogView(Composite parent, int style) {\r
+               super(parent, style, false);\r
+               this.setLayout(new FillLayout());\r
+               \r
+               setTitle(InformationViewLabels.DLOG_VIEW_TITLE);\r
+       }\r
+\r
+}\r
index 634cc18..53dbf4d 100644 (file)
@@ -53,7 +53,7 @@ import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
 import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
-import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartView;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer;
@@ -194,7 +194,7 @@ public class UIEventListDialog extends Dialog {
                @Override
                public void handleClickEvent(DACustomButton button) {
                        RangeDataManager rangeDataManager = RangeDataManager.getInstance();
-                       TimelineView tview = (TimelineView) AnalyzerManager
+                       TimelineChartView tview = (TimelineChartView) AnalyzerManager
                                        .getCurrentPage().getView(TimelinePage.timelineViewID);
 
                        Double startTime = (Double) uiEventListTable.getTable().getData(
index 9c3ba8b..b8d4016 100644 (file)
@@ -59,46 +59,58 @@ import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener
 import org.tizen.dynamicanalyzer.widgets.da.base.DAButton;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox;
 import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite;
-import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
 
 public class SettingDialog extends DAMessageBox {
        private static boolean opened = false;
-       private DACustomButton cancelButton = null;
        private DACustomButton okButton = null;
+       private DACustomButton cancelButton = null;
        private boolean isApply = false;
 
        private SettingDialogTemplatePage templatesPage = null;
+       private SettingDialogOptionPage optionPage = null;
 
+       private DATabComposite tabView = null;
        private Composite buttonContentsComp = null;
 
        public SettingDialog(Shell parentShell) {
                super(parentShell);
        }
 
-       private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener() {
+       private DACustomButtonClickEventListener okButtonListener = new DACustomButtonClickEventListener() {
 
                @Override
                public void handleClickEvent(DACustomButton button) {
+                       if (optionPage.isValidInputValue()) {
                                isApply = true;
                                doApply();
                                doRun();
                                shell.close(); // close dialog
+                       } else {
+                               doWarningMessage();
+                       }
                }
        };
 
-       private DACustomButtonClickEventListener okButtonListener = new DACustomButtonClickEventListener() {
+       private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener() {
 
                @Override
                public void handleClickEvent(DACustomButton button) {
+//                     if (optionPage.isValidInputValue()) {
                                isApply = true;
                                doRevert();
                                doRun();
                                shell.close(); // close dialog
+//                     } else {
+//                             doWarningMessage();
+//                     }
+
                }
        };
 
        private void doApply() {
+               Composite selectedComposite = tabView.getTopComposite();
+               if (!(selectedComposite instanceof SettingDialogBinarySettingsPage)) {
                        if (DAState.isStartable()) {
                                // add & remove tab view page
                                UIAction.setPageBySetting();
@@ -109,6 +121,12 @@ public class SettingDialog extends DAMessageBox {
                                // write setting data
                                SettingDataManager.INSTANCE.applySettingData();
                        }
+               } else {
+                       // binary setting page
+                       SettingDialogBinarySettingsPage page = (SettingDialogBinarySettingsPage) selectedComposite;
+                       page.doApply();
+               }
+
        }
 
        private void doRevert() {
@@ -117,9 +135,12 @@ public class SettingDialog extends DAMessageBox {
        }
 
        private void doRun() {
+               Composite selectedComposite = tabView.getTopComposite();
+               if (!(selectedComposite instanceof SettingDialogBinarySettingsPage)) {
                        if (DAState.isStartable()) {
                                CommonAction.configure();
                        }
+               }
        }
 
        private void doWarningMessage() {
@@ -132,12 +153,11 @@ public class SettingDialog extends DAMessageBox {
                        return false;
                }
                IDECommunicator.setOpenWelcomeDlg(true);
-               shell.setSize(610, 520);
+               shell.setSize(631, 550);
                shell.setLayout(new FormLayout());
                shell.setText(AnalyzerLabels.SETTING_TITLE);
                shell.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
 
-               
                // content composite
                Composite contentsComp = new Composite(shell, SWT.NONE);
                FormLayout compLayout = new FormLayout();
@@ -150,8 +170,51 @@ public class SettingDialog extends DAMessageBox {
                compData.right = new FormAttachment(100, 0);
                compData.bottom = new FormAttachment(100, -49);
                contentsComp.setLayoutData(compData);
-               
-               templatesPage = new SettingDialogTemplatePage(contentsComp, SWT.NONE);
+
+               // check exist setting file
+               if (SettingDataManager.INSTANCE.isParsingSuccess() == false) {
+                       Label label = new Label(contentsComp, SWT.NONE);
+                       label.setForeground(ColorResources.DEFAULT_FONT_COLOR);
+                       label.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
+                       label.setFont(FontResources.SETTING_TITLE_FONT);
+                       label.setText(ConfigureLabels.SETTING_WARNING_MESSAGE_FILE_NOT_FOUND);
+
+                       shell.addDisposeListener(new DisposeListener() {
+
+                               @Override
+                               public void widgetDisposed(DisposeEvent e) {
+                                       opened = false;
+                                       ShortCutManager.getInstance().setEnabled(!opened);
+                               }
+                       });
+                       opened = true;
+                       ShortCutManager.getInstance().setEnabled(!opened);
+
+                       shell.open();
+                       return true;
+               }
+
+               // tab view
+               tabView = new DATabComposite(contentsComp, SWT.DOUBLE_BUFFERED);
+               tabView.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
+               tabView.setTabWidth(120);
+               compData = new FormData();
+               compData.top = new FormAttachment(0, 0);
+               compData.left = new FormAttachment(0, 0);
+               compData.right = new FormAttachment(100, 0);
+               compData.bottom = new FormAttachment(100, 0);
+               tabView.setLayoutData(compData);
+
+               templatesPage = new SettingDialogTemplatePage(tabView.getContentComposite(), SWT.NONE);
+               tabView.addView(templatesPage, false);
+
+               optionPage = new SettingDialogOptionPage(tabView.getContentComposite(), SWT.NONE);
+               tabView.addView(optionPage, false);
+
+               // check platform SDK (show binary setting page)
+               if (AnalyzerManager.isPlatformSDK()) {
+                       createBinarySettingPage();
+               }
 
                // button composite
                buttonContentsComp = new Composite(shell, SWT.NONE);
@@ -178,27 +241,41 @@ public class SettingDialog extends DAMessageBox {
                        }
                });
 
-               okButton = new DAButton(buttonContentsComp, SWT.NONE);
-               okButton.addClickListener(okButtonListener);
-               okButton.setText(WidgetLabels.OK);
-               okButton.setButtonFont(FontResources.DIALOG_BUTTON_FONT);
+               optionPage.addListener(SWT.Hide, new Listener() {
+
+                       @Override
+                       public void handleEvent(Event event) {
+                               Logger.debug("options page hide");
+                               if (!optionPage.isValidInputValue()) {
+                                       doWarningMessage();
+                                       optionPage.revertInputValue();
+                               }
+                               // update total overhead range
+                               templatesPage.updateTotalOverheadRange();
+                       }
+               });
+
+               cancelButton = new DAButton(buttonContentsComp, SWT.NONE);
+               cancelButton.addClickListener(cancelButtonListener);
+               cancelButton.setText(WidgetLabels.CANCEL);
+               cancelButton.setButtonFont(FontResources.DIALOG_BUTTON_FONT);
                FormData buttonData = new FormData();
                buttonData.right = new FormAttachment(100, -9);
                buttonData.top = new FormAttachment(0, 11);
                buttonData.width = 100;
                buttonData.height = 28;
-               okButton.setLayoutData(buttonData);
+               cancelButton.setLayoutData(buttonData);
 
-               cancelButton = new DAButton(buttonContentsComp, SWT.NONE);
-               cancelButton.addClickListener(cancelButtonListener);
-               cancelButton.setText(WidgetLabels.CANCEL);
-               cancelButton.setButtonFont(FontResources.DIALOG_BUTTON_FONT);
+               okButton = new DAButton(buttonContentsComp, SWT.NONE);
+               okButton.addClickListener(okButtonListener);
+               okButton.setText(WidgetLabels.OK);
+               okButton.setButtonFont(FontResources.DIALOG_BUTTON_FONT);
                buttonData = new FormData();
-               buttonData.right = new FormAttachment(okButton, -8);
+               buttonData.right = new FormAttachment(cancelButton, -8);
                buttonData.top = new FormAttachment(0, 11);
                buttonData.width = 100;
                buttonData.height = 28;
-               cancelButton.setLayoutData(buttonData);
+               okButton.setLayoutData(buttonData);
 
                shell.addDisposeListener(new DisposeListener() {
 
@@ -218,6 +295,40 @@ public class SettingDialog extends DAMessageBox {
                return true;
        }
 
+       private void createBinarySettingPage() {
+               DABaseComposite binarySettings = new SettingDialogBinarySettingsPage(
+                               tabView.getContentComposite(), SWT.NONE);
+               tabView.addView(binarySettings, false);
+
+               // binarySettings tab is selected, the close button will be shown.
+               // ok and cancel button is hidden
+               binarySettings.addListener(SWT.Show, new Listener() {
+
+                       @Override
+                       public void handleEvent(Event event) {
+                               Logger.debug("binary settings show");
+                               cancelButton.setText(WidgetLabels.CLOSE);
+                               FormData data = (FormData) okButton.getLayoutData();
+                               data.width = 0;
+
+                               buttonContentsComp.layout();
+                       }
+               });
+
+               binarySettings.addListener(SWT.Hide, new Listener() {
+
+                       @Override
+                       public void handleEvent(Event event) {
+                               Logger.debug("binary settings hide");
+                               cancelButton.setText(WidgetLabels.CANCEL);
+                               FormData data = (FormData) okButton.getLayoutData();
+                               data.width = 100;
+
+                               buttonContentsComp.layout();
+                       }
+               });
+       }
+
        private void notifyAutoRun() {
                synchronized (IDECommunicator.getWaitingWelcomeDlg()) {
                        IDECommunicator.setOpenWelcomeDlg(false);
index 8789646..f0b5608 100644 (file)
@@ -151,11 +151,15 @@ public class SettingDialogTemplatePage extends DAPageComposite {
 
        // template description widget
        private Composite descriptionComp = null;
-       private Label selectedLabel = null;
        private Label templateIcon = null;
        private Label templateNameLabel = null;
        private Label templateDescriptionLabel = null;
-
+       
+       // overhead widget
+       private Label overheadLabel = null;
+       private Label totalOverheadRange = null;
+       private Label overheadDescriptionLabel = null;
+       
        private DACustomButton detailButton = null;
 
        private DACustomButtonClickEventListener detailButtonListener = new DACustomButtonClickEventListener() {
@@ -176,9 +180,23 @@ public class SettingDialogTemplatePage extends DAPageComposite {
 
        public SettingDialogTemplatePage(Composite parent, int style) {
                super(parent, style);
+               setTitle(AnalyzerLabels.COOLBAR_AREA_CONFIGURATION_FEATURES);
                this.setLayout(new FormLayout());
                this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
 
+               // Title
+               Label title = new Label(this, SWT.TRANSPARENT);
+               title.setText(ConfigureLabels.SETTING_DIALOG_DESCRIPTION);
+               title.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
+               title.setForeground(ColorResources.DEFAULT_FONT_COLOR);
+               title.setFont(FontResources.SETTING_TITLE_FONT);
+
+               FormData data = new FormData();
+               data.top = new FormAttachment(0, 14);
+               data.left = new FormAttachment(0, 8);
+               data.height = 18;
+               title.setLayoutData(data);
+
                createTargetComposite();
                createTemplateDescriptionComposite();
                createTemplateTitleComposite();
@@ -219,11 +237,6 @@ public class SettingDialogTemplatePage extends DAPageComposite {
        }
 
        private void initTemplateDescriptionWidget() {
-               if (null != selectedLabel) {
-                       selectedLabel.dispose();
-                       selectedLabel = null;
-               }
-
                if (null != templateIcon) {
                        templateIcon.dispose();
                        templateIcon = null;
@@ -239,6 +252,21 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                        templateDescriptionLabel = null;
                }
 
+               if (null != overheadLabel) {
+                       overheadLabel.dispose();
+                       overheadLabel = null;
+               }
+
+               if (null != totalOverheadRange) {
+                       totalOverheadRange.dispose();
+                       totalOverheadRange = null;
+               }
+
+               if (null != overheadDescriptionLabel) {
+                       overheadDescriptionLabel.dispose();
+                       overheadDescriptionLabel = null;
+               }
+
                if (null != detailButton) {
                        detailButton.dispose();
                        detailButton = null;
@@ -287,10 +315,10 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                        targetComp = new Composite(this, SWT.NONE);
                        targetComp.setLayout(new FormLayout());
                        FormData compData = new FormData();
-                       compData.top = new FormAttachment(0, 0);
-                       compData.left = new FormAttachment(0, 0);
-                       compData.width = 100;
-                       compData.height = 450;
+                       compData.top = new FormAttachment(0, 41);
+                       compData.left = new FormAttachment(0, 6);
+                       compData.width = 86;
+                       compData.height = 403;
                        targetComp.setLayoutData(compData);
                        targetComp.setBackground(ColorResources.WHITE);
 
@@ -303,9 +331,9 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                                        Rectangle r = new Rectangle(0, 0, rect.width - 1, rect.height - 1);
                                        e.gc.setForeground(ColorResources.SETTING_STROKE);
                                        e.gc.drawRectangle(r);
-                                       e.gc.drawLine(0, 40, rect.width - 1, 40);
+                                       e.gc.drawLine(0, 22, rect.width - 1, 22);
                                        e.gc.setBackground(ColorResources.SETTING_TITLE_BACKGROUND);
-                                       e.gc.fillRectangle(1, 1, 100, 40);
+                                       e.gc.fillRectangle(1, 1, 84, 21);
                                }
                        });
                }
@@ -411,15 +439,14 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                initTemplateDescriptionWidget();
 
                if (null == descriptionComp) {
-
                        // Composite
                        descriptionComp = new Composite(this, SWT.NONE);
                        descriptionComp.setLayout(new FormLayout());
                        FormData compData = new FormData();
-                       compData.top = new FormAttachment(0, 41);
-                       compData.left = new FormAttachment(0, 428);
-                       compData.width = 324;
-                       compData.height = 403;
+                       compData.top = new FormAttachment(0, 265);
+                       compData.left = new FormAttachment(0, 98);
+                       compData.width = 524;
+                       compData.height = 179;
                        descriptionComp.setLayoutData(compData);
                        descriptionComp.setBackground(ColorResources.WHITE);
 
@@ -433,24 +460,14 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                                        e.gc.setForeground(ColorResources.SETTING_STROKE);
                                        e.gc.drawRectangle(r);
                                        e.gc.drawLine(0, 117, rect.width - 1, 117);
+
+                                       // overhead
+                                       e.gc.drawImage(ImageResources.OVERHEAD_BAR_BG, 90, 130);
+                                       e.gc.drawImage(ImageResources.OVERHEAD_BAR, 91, 133);
                                }
                        });
                }
 
-               // label
-               selectedLabel = new Label(descriptionComp, SWT.TRANSPARENT);
-               FormData selectedLabelData = new FormData();
-               selectedLabelData.top = new FormAttachment(0, 4);
-               selectedLabelData.left = new FormAttachment(0, 1);
-               selectedLabelData.height = 18;
-               selectedLabelData.width = 84;
-               selectedLabel.setLayoutData(selectedLabelData);
-               selectedLabel.setText(ConfigureLabels.SETTING_DIALOG_SELECTED_TITLE);
-               selectedLabel.setBackground(ColorResources.SETTING_TITLE_BACKGROUND);
-               selectedLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR);
-               selectedLabel.setFont(FontResources.SETTING_TITLE_FONT);
-               selectedLabel.setAlignment(SWT.CENTER);
-
                TargetData target = SettingDataManager.INSTANCE.getTarget(null);
                TemplateData template = target.getSelectedTemplate().getData();
 
@@ -491,6 +508,35 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                templateDescriptionLabel.setForeground(ColorResources.SETTING_COLOR);
                templateDescriptionLabel.setFont(FontResources.SETTING_DESCRIPTION_FONT);
 
+               // label : overhead
+               overheadLabel = new Label(descriptionComp, SWT.TRANSPARENT);
+               data = new FormData();
+               data.top = new FormAttachment(0, 130);
+               data.left = new FormAttachment(0, 9);
+               data.width = 80;
+               data.height = 20;
+               overheadLabel.setLayoutData(data);
+               overheadLabel.setText(ConfigureLabels.SETTING_DIALOG_OVERHEAD);
+               overheadLabel.setBackground(ColorResources.WHITE);
+               overheadLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR);
+               overheadLabel.setFont(FontResources.SETTING_TITLE_FONT);
+
+               // update total overhead range
+               updateTotalOverheadRange();
+
+               // label : overhead description
+               overheadDescriptionLabel = new Label(descriptionComp, SWT.WRAP | SWT.READ_ONLY);
+               data = new FormData();
+               data.top = new FormAttachment(0, 153);
+               data.left = new FormAttachment(0, 90);
+               data.width = 350;
+               data.height = 20;
+               overheadDescriptionLabel.setLayoutData(data);
+               overheadDescriptionLabel.setText(ConfigureLabels.SETTING_DIALOG_OVERHEAD_DESCRIPTION);
+               overheadDescriptionLabel.setBackground(ColorResources.WHITE);
+               overheadDescriptionLabel.setForeground(ColorResources.SETTING_COLOR);
+               overheadDescriptionLabel.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+
                detailButton = new DAButton(descriptionComp, SWT.NONE);
                detailButton.addClickListener(detailButtonListener);
                detailButton.setText(WidgetLabels.DETAIL);
@@ -505,6 +551,32 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                descriptionComp.layout(true);
        }
 
+       public void updateTotalOverheadRange() {
+               SettingDataManager setting = SettingDataManager.INSTANCE;
+               TargetData target = setting.getTarget(null);
+
+               if (null != totalOverheadRange) {
+                       totalOverheadRange.dispose();
+                       totalOverheadRange = null;
+               }
+
+               int totalOverheadRangeCount = setting.getTotalOverheadRangeCount();
+               int width = 200 / totalOverheadRangeCount;
+               int totalOverheadRangeValue = setting.getSelectedOverheadLevel(target.getTargetName());
+               int startPosition = 91 + (width * totalOverheadRangeValue);
+
+               totalOverheadRange = new Label(descriptionComp, SWT.TRANSPARENT);
+               FormData data = new FormData();
+               data.top = new FormAttachment(0, 133);
+               data.left = new FormAttachment(0, startPosition);
+               data.width = width * (totalOverheadRangeCount - totalOverheadRangeValue);
+               data.height = 10;
+               totalOverheadRange.setLayoutData(data);
+               totalOverheadRange.setBackground(ColorResources.SETTING_OVERHEAD_BACKGROUND);
+
+               descriptionComp.layout(true);
+       }
+
        public void createTemplateTitleComposite() {
                initTemplateTitleWidget();
 
@@ -515,8 +587,8 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                        FormData compData = new FormData();
                        compData.top = new FormAttachment(0, 41);
                        compData.left = new FormAttachment(0, 98);
-                       compData.width = 324;
-                       compData.height = 403;
+                       compData.width = 524;
+                       compData.height = 218;
                        templateComp.setLayoutData(compData);
                        templateComp.setBackground(ColorResources.WHITE);
 
@@ -546,7 +618,7 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                data.height = 18;
                data.width = 502;
                templateLabel.setLayoutData(data);
-               templateLabel.setText(ConfigureLabels.SETTING_DIALOG_FEATURELIST_TITLE);
+               templateLabel.setText(ConfigureLabels.SETTING_DIALOG_TEMPLATE_TITLE);
                templateLabel.setBackground(ColorResources.SETTING_TITLE_BACKGROUND);
                templateLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                templateLabel.setFont(FontResources.SETTING_TITLE_FONT);
index 6ae3b39..273c3dd 100644 (file)
@@ -35,7 +35,7 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListView;
 import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingView;
 import org.tizen.dynamicanalyzer.ui.userinterface.scene.UISceneListView;
@@ -78,12 +78,12 @@ public class UIPage extends DAPageComposite {
                UIFunctionProfilingView bottomLeftFirst = new UIFunctionProfilingView(bottomForm, SWT.NONE);
                addView(bottomLeftFirst);
 
-               ScreenshotTabComposite tabView = new ScreenshotTabComposite(upperForm, SWT.NONE,
+               TimelineTableView tabView = new TimelineTableView(upperForm, SWT.NONE,
                                UIPage.pageID);
-               tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, new String[] {
-                               UIPage.sceneListViewID, UIPage.controlListViewID });
-               tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, new String[] {
-                               UIPage.sceneListViewID, UIPage.controlListViewID });
+//             tabView.setObservingViews(TimelineTableView.screenshotViewID, new String[] {
+//                             UIPage.sceneListViewID, UIPage.controlListViewID });
+//             tabView.setObservingViews(TimelineTableView.callstackViewID, new String[] {
+//                             UIPage.sceneListViewID, UIPage.controlListViewID });
                addView(tabView);
                
                bottomForm.setWeights(new int[] { 77, 23 });
@@ -97,8 +97,8 @@ public class UIPage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
-               int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
-               int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
+               int wrate = (int) (TimelineTableView.DEFAULT_WIDTH * 100 / width);
+               int hrate = (int) (TimelineTableView.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
                hrate = (hrate > 100) ? 100 : hrate;
 
index 4f746f5..62d99de 100644 (file)
@@ -63,8 +63,8 @@ import org.tizen.dynamicanalyzer.project.ProcessMemoryMap;
 import org.tizen.dynamicanalyzer.project.Project;
 import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotView;
 import org.tizen.dynamicanalyzer.ui.page.BaseView;
-import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
-import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartView;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView;
 import org.tizen.dynamicanalyzer.util.CommonUtil;
 import org.tizen.dynamicanalyzer.util.Logger;
 import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
@@ -74,13 +74,13 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
 
 public class AnalyzerUtil {
        // FIXME start
-       private static TimelineView timelineComposite;
+       private static TimelineChartView timelineComposite;
 
-       public static TimelineView getTimelineComposite() {
+       public static TimelineChartView getTimelineComposite() {
                return timelineComposite;
        }
 
-       public static void setTimelineComposite(TimelineView timelineComposite) {
+       public static void setTimelineComposite(TimelineChartView timelineComposite) {
                AnalyzerUtil.timelineComposite = timelineComposite;
        }
 
@@ -492,12 +492,12 @@ public class AnalyzerUtil {
        }
        
        public static boolean isLatestTraceMode(String pageID) {
-               DATabComposite tabComp = (DATabComposite) AnalyzerUtil.getView(pageID, ScreenshotTabComposite.tabID);
+               DATabComposite tabComp = (DATabComposite) AnalyzerUtil.getView(pageID, TimelineTableView.tabID);
                if (tabComp == null) {
                        Logger.warning("page [" + pageID + "] does not exist.");
                        return false;
                }
-               ScreenshotView screenshotView = (ScreenshotView) tabComp.getView(ScreenshotTabComposite.screenshotViewID);
+               ScreenshotView screenshotView = (ScreenshotView) tabComp.getView(TimelineTableView.screenshotViewID);
                if (screenshotView == null) {
                        Logger.warning("screenshotView does not exist in page [" + pageID + "].");
                        return false;
@@ -506,12 +506,12 @@ public class AnalyzerUtil {
        }
        
        public static void setLatestTraceMode(String pageID, boolean isOn) {
-               DATabComposite tabComp = (DATabComposite) AnalyzerUtil.getView(pageID, ScreenshotTabComposite.tabID);
+               DATabComposite tabComp = (DATabComposite) AnalyzerUtil.getView(pageID, TimelineTableView.tabID);
                if (tabComp == null) {
                        Logger.warning("page [" + pageID + "] does not exist.");
                        return;
                }
-               ScreenshotView screenshotView = (ScreenshotView) tabComp.getView(ScreenshotTabComposite.screenshotViewID);
+               ScreenshotView screenshotView = (ScreenshotView) tabComp.getView(TimelineTableView.screenshotViewID);
                if (screenshotView == null) {
                        Logger.warning("screenshotView does not exist in page [" + pageID + "].");
                        return;