From 1a53cdb45baf5238f87abaf41877e8b14cdfd29d Mon Sep 17 00:00:00 2001 From: heeyoung Date: Fri, 27 Jun 2014 11:10:57 +0900 Subject: [PATCH] setting : configure dynamic tab pages Change-Id: Ib4f4e47b3f2da87bdb8f6da638ca09c0af80b42b Signed-off-by: heeyoung --- .../tizen/dynamicanalyzer/ui/page/BaseView.java | 77 ++++++++++++---------- .../ui/toolbar/ConfigureManager.java | 35 +++++----- .../toolbar/configuration/ConfigurationDialog.java | 6 ++ .../ui/toolbar/configuration/WelcomeDialog.java | 6 ++ 4 files changed, 72 insertions(+), 52 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java index cac36ea..dea0f69 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java @@ -33,7 +33,9 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.part.ViewPart; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.constant.CommonConstants; +import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.ui.file.FilePage; import org.tizen.dynamicanalyzer.ui.kernel.KernelPage; import org.tizen.dynamicanalyzer.ui.network.NetworkPage; @@ -41,6 +43,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.GLPage; import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.thread.ThreadPage; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; +import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.util.DALogger; @@ -66,39 +69,7 @@ public class BaseView extends ViewPart { tabView = new DATabComposite(parent, SWT.DOUBLE_BUFFERED); tabView.setTabWidth(114); tabView.isImageTab(true); - { - DABaseComposite timelinePage = new TimelinePage( - tabView.getContentComposite(), SWT.NONE); - tabView.addView(timelinePage, false); - - DABaseComposite threadPage = new ThreadPage( - tabView.getContentComposite(), SWT.NONE); - tabView.addView(threadPage, false); - - DABaseComposite networkPage = new NetworkPage( - tabView.getContentComposite(), SWT.NONE); - tabView.addView(networkPage, false); - - DABaseComposite filePage = new FilePage( - tabView.getContentComposite(), SWT.NONE); - tabView.addView(filePage, false); - - DABaseComposite graphicsPage = new GLPage( - tabView.getContentComposite(), SWT.NONE); - tabView.addView(graphicsPage, false); - - DABaseComposite uiPage = new UIPage(tabView.getContentComposite(), - SWT.NONE); - tabView.addView(uiPage, false); - - DABaseComposite kernelPage = new KernelPage( - tabView.getContentComposite(), SWT.NONE); - tabView.addView(kernelPage, false); - - DABaseComposite summaryPage = new SummaryPage( - tabView.getContentComposite(), SWT.NONE); - tabView.addView(summaryPage, false); - } + createTabViewPage(); DA_LOG.performance("TEST", "DA Start", "Create Toolbar and Add Tab view"); } @@ -112,13 +83,51 @@ public class BaseView extends ViewPart { } /** + * create tab pages + */ + public void createTabViewPage() { + ConfigureManager configureManager = ConfigureManager.getInstance(); + List tabViewList = new ArrayList(); + tabViewList.add(CommonConstants.PAGE_TIME_LINE); // default : timeline tab + + // thread tab + if (AnalyzerConstants.FEATURE_OFF != + configureManager.getValueLong(ConfigureLabels.FEATURE_THREAD)) { + tabViewList.add(CommonConstants.PAGE_THREAD); + } // else nothing + + // network tab + if ((AnalyzerConstants.FEATURE_OFF != + configureManager.getValueLong(ConfigureLabels.FEATURE_NETWORK)) || + (AnalyzerConstants.FEATURE_OFF != + configureManager.getValueLong(ConfigureLabels.FEATURE_MEMORY_ALLOCATION))) { + tabViewList.add(CommonConstants.PAGE_NETWORK); + } // else nothing + + // openGL tab + if (AnalyzerConstants.FEATURE_OFF != + configureManager.getValueLong(ConfigureLabels.FEATURE_OPENGL)) { + tabViewList.add(CommonConstants.PAGE_GRAPHICS); + } // else nothing + + // kernel tab + if (AnalyzerConstants.FEATURE_OFF != + configureManager.getValueLong(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) { + tabViewList.add(CommonConstants.PAGE_KERNEL); + } // else nothing + + tabViewList.add(CommonConstants.PAGE_SUMMARY); // default : summary tab + addTabViewPage(tabViewList); + } + + /** * add tab pages dynamically * @param tabViewList : selected tab pages for adding */ public void addTabViewPage(List tabViewList) { DABaseComposite newPage = null; - tabView.removeAll(); // remove existing pages if(tabViewList != null && tabViewList.size() > 0) { + tabView.removeAll(); // remove existing pages for(int id : tabViewList) { switch(id){ case CommonConstants.PAGE_FILE: diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java index 5555d3d..4e4316f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java @@ -134,11 +134,11 @@ public class ConfigureManager { if (null == data.get(ConfigureLabels.FEATURE_MEMORY_ALLOCATION)) { data.put(ConfigureLabels.FEATURE_MEMORY_ALLOCATION, - Long.toString(AnalyzerConstants.FEATURE_ALLOCATION)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.FEATURE_FILE)) { data.put(ConfigureLabels.FEATURE_FILE, - Long.toString(AnalyzerConstants.FEATURE_FILE_API)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); // data.put(ConfigureLabels.FEATURE_SYSTEM_FD, // Long.toString(AnalyzerConstants.SYSTEM_FD)); } @@ -146,7 +146,7 @@ public class ConfigureManager { data.put(ConfigureLabels.FEATURE_THREAD, Long.toString(AnalyzerConstants.FEATURE_OFF)); data.put(ConfigureLabels.FEATURE_SYSTEM_THREAD, - Long.toString(AnalyzerConstants.SYSTEM_THREAD_LOAD)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.FEATURE_USERINTERFACE)) { data.put(ConfigureLabels.FEATURE_USERINTERFACE, @@ -171,27 +171,27 @@ public class ConfigureManager { // } if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_FILE)) { data.put(ConfigureLabels.FEATURE_SYSCALL_FILE, - Long.toString(AnalyzerConstants.FEATURE_SYSCALL_FILE)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_IPC)) { data.put(ConfigureLabels.FEATURE_SYSCALL_IPC, - Long.toString(AnalyzerConstants.FEATURE_SYSCALL_IPC)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) { data.put(ConfigureLabels.FEATURE_SYSCALL_PROCESS, - Long.toString(AnalyzerConstants.FEATURE_SYSCALL_PROCESS)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) { data.put(ConfigureLabels.FEATURE_SYSCALL_SIGNAL, - Long.toString(AnalyzerConstants.FEATURE_SYSCALL_SIGNAL)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) { data.put(ConfigureLabels.FEATURE_SYSCALL_NETWORK, - Long.toString(AnalyzerConstants.FEATURE_SYSCALL_NETWORK)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_DESC)) { data.put(ConfigureLabels.FEATURE_SYSCALL_DESC, - Long.toString(AnalyzerConstants.FEATURE_SYSCALL_DESC)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.FEATURE_SYSCALL)) { @@ -269,27 +269,27 @@ public class ConfigureManager { } if (null == data.get(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)) { data.put(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY, Long - .toString(AnalyzerConstants.MEMORY_API_PROBING_NO_FILTER)); + .toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) { data.put(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE, - Long.toString(AnalyzerConstants.FILE_API_PROBING_NO_FILTER)); + Long.toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) { data.put(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD, Long - .toString(AnalyzerConstants.THREAD_API_PROBING_NO_FILTER)); + .toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)) { data.put(ConfigureLabels.INCLUDE_INSIDE_CALL_UI, Long - .toString(AnalyzerConstants.OSP_UI_API_PROBING_NO_FILTER)); + .toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK)) { data.put(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK, Long - .toString(AnalyzerConstants.NETWORK_API_PROBING_NO_FILTER)); + .toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.INCLUDE_INSIDE_OPENGL)) { data.put(ConfigureLabels.INCLUDE_INSIDE_OPENGL, Long - .toString(AnalyzerConstants.OPENGL_API_PROBING_NO_FILTER)); + .toString(AnalyzerConstants.FEATURE_OFF)); } if (null == data.get(ConfigureLabels.SNAPSHOT_PERIODIC)) { data.put(ConfigureLabels.SNAPSHOT_PERIODIC, @@ -314,7 +314,7 @@ public class ConfigureManager { if (null == data.get(ConfigureLabels.INTERNAL_LOG_LEVEL)) { data.put(ConfigureLabels.INTERNAL_LOG_LEVEL, Long.toString(DALogger.DEBUG)); - } + } } private void initConfigDataFromFile() { @@ -497,7 +497,7 @@ public class ConfigureManager { } return state; } - + public long getPreConfiguration(DeviceInfo devInfo) { long state = 0; if (DACommunicator.isSWAPVersion(devInfo)) { @@ -534,5 +534,4 @@ public class ConfigureManager { return platform; } } - } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java index efa5045..7e11273 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java @@ -46,8 +46,10 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; +import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -107,6 +109,10 @@ public class ConfigurationDialog extends DAMessageBox { BinarySettingsPage page = (BinarySettingsPage) selectedComposite; page.doApply(); } + + // add & remove tab view page + BaseView bv = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); + bv.createTabViewPage(); } private void doBack() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/WelcomeDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/WelcomeDialog.java index 6528b30..ef524fb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/WelcomeDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/WelcomeDialog.java @@ -44,7 +44,9 @@ import org.tizen.dynamicanalyzer.nl.WidgetLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; +import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.button.checkbox.DACheckBox; @@ -94,6 +96,10 @@ public class WelcomeDialog extends DAMessageBox { ConfigurationDialogDataManager.getInstance().applySwapValue( featuresTable); notifyAutoRun(); + + // add & remove tab view page + BaseView bv = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); + bv.createTabViewPage(); } private void doBack() { -- 2.7.4