From 7f7c1bdd190e46d1a7009d49a851e74dc4640d83 Mon Sep 17 00:00:00 2001 From: heeyoung Date: Tue, 3 Jun 2014 14:45:12 +0900 Subject: [PATCH] ui page : enable Ui analysis (osp features) Change-Id: I7c8716d726c6f3ad7a55d9967b56d14aa32de2fe Signed-off-by: heeyoung --- .../listeners/SummaryMouseDoubleClickListener.java | 4 ++-- .../tizen/dynamicanalyzer/nl/ConfigureLabels.java | 4 ++-- .../shortcut/ShortCutKeyBindingHandler.java | 12 +++++------ .../ui/info/callstack/CallstackTable.java | 2 +- .../tizen/dynamicanalyzer/ui/page/BaseView.java | 6 +++--- .../ui/toolbar/ConfigureManager.java | 20 +++++++++--------- .../dynamicanalyzer/ui/toolbar/ToolbarArea.java | 2 +- .../ConfigurationDialogDataManager.java | 20 ++++++++---------- .../ConfigurationDialogFeaturesTable.java | 24 +++++++++++----------- 9 files changed, 46 insertions(+), 48 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java index ec0edcc..32a63e6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java @@ -104,8 +104,8 @@ public class SummaryMouseDoubleClickListener implements MouseListener { // // } // } else if (data instanceof ThreadData) { // pageId = ThreadPage.pageID; -//// } else if (data instanceof UIEventData) { -//// pageId = UIPage.pageID; +// } else if (data instanceof UIEventData) { +// pageId = UIPage.pageID; // } else if (data instanceof NetworkData) { // pageId = NetworkPage.pageID; // } else if (data instanceof GLES20LogData) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java index 5d5fc6c..320699d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java @@ -59,7 +59,7 @@ public class ConfigureLabels extends NLS { public static String FEATURE_MEMORY_ALLOCATION; public static String FEATURE_FILE; public static String FEATURE_THREAD; -// public static String FEATURE_USERINTERFACE; + public static String FEATURE_USERINTERFACE; public static String FEATURE_SCREENSHOT; public static String FEATURE_USER_EVENT; public static String FEATURE_RECORDING; @@ -99,7 +99,7 @@ public class ConfigureLabels extends NLS { public static String INCLUDE_INSIDE_CALL_THREAD; public static String INCLUDE_INSIDE_CALL_FILE; public static String INCLUDE_INSIDE_CALL_NETWORK; -// public static String INCLUDE_INSIDE_CALL_UI; + public static String INCLUDE_INSIDE_CALL_UI; public static String INCLUDE_INSIDE_OPENGL; public static String SNAPSHOT_PERIODIC; public static String SNAPSHOT_PERIODIC_AUTO; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java index b8681d0..2bdcda7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java @@ -114,19 +114,19 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_2) { DA_LOG.debug("thread page"); AnalyzerUtil.changePage(ThreadPage.pageID); -// } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_6) { -// DA_LOG.debug("ui page"); -// AnalyzerUtil.changePage(UIPage.pageID); + } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_6) { + DA_LOG.debug("ui page"); + AnalyzerUtil.changePage(UIPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_5) { DA_LOG.debug("Graphics page"); AnalyzerUtil.changePage(GLPage.pageID); - } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_6) { + } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_7) { DA_LOG.debug("Kernel page"); AnalyzerUtil.changePage(KernelPage.pageID); - } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_7) { + } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_8) { DA_LOG.debug("summary page"); AnalyzerUtil.changePage(SummaryPage.pageID); - } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_8) { + } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_9) { DA_LOG.debug("range page"); AnalyzerUtil.changePage(RangePage.pageID); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java index 52682ad..35a0eb2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java @@ -92,7 +92,7 @@ public class CallstackTable extends DATableComposite { String viewId = selData.getViewID(); if (null == viewId || viewId.isEmpty() || viewId.equals(FilePage.chartViewID) -// || viewId.equals(UIPage.profilingViewID) + || viewId.equals(UIPage.profilingViewID) || viewId.equals(GLPage.chartViewID) || viewId.equals(GLPage.contextViewID) || viewId.equals(GLPage.contextHistoryID) 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 06648da..cbcc21c 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 @@ -87,9 +87,9 @@ public class BaseView extends ViewPart { tabView.getContentComposite(), SWT.NONE); tabView.addView(graphicsPage, false); -// DABaseComposite uiPage = new UIPage(tabView.getContentComposite(), -// SWT.NONE); -// tabView.addView(uiPage, false); + DABaseComposite uiPage = new UIPage(tabView.getContentComposite(), + SWT.NONE); + tabView.addView(uiPage, false); DABaseComposite kernelPage = new KernelPage( tabView.getContentComposite(), SWT.NONE); 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 fec8f84..afb6406 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 @@ -148,10 +148,10 @@ public class ConfigureManager { data.put(ConfigureLabels.FEATURE_SYSTEM_THREAD, Long.toString(AnalyzerConstants.SYSTEM_THREAD_LOAD)); } -// if (null == data.get(ConfigureLabels.FEATURE_USERINTERFACE)) { -// data.put(ConfigureLabels.FEATURE_USERINTERFACE, -// Long.toString(AnalyzerConstants.FEATURE_OSP_UI_API)); -// } + if (null == data.get(ConfigureLabels.FEATURE_USERINTERFACE)) { + data.put(ConfigureLabels.FEATURE_USERINTERFACE, + Long.toString(AnalyzerConstants.FEATURE_OSP_UI_API)); + } if (null == data.get(ConfigureLabels.FEATURE_SCREENSHOT)) { data.put(ConfigureLabels.FEATURE_SCREENSHOT, Long.toString(AnalyzerConstants.FEATURE_SCREENSHOT)); @@ -279,10 +279,10 @@ public class ConfigureManager { data.put(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD, Long .toString(AnalyzerConstants.THREAD_API_PROBING_NO_FILTER)); } -// 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)); -// } + 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)); + } if (null == data.get(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK)) { data.put(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK, Long .toString(AnalyzerConstants.NETWORK_API_PROBING_NO_FILTER)); @@ -474,7 +474,7 @@ public class ConfigureManager { state |= getValueLong(ConfigureLabels.FEATURE_MEMORY_ALLOCATION); state |= getValueLong(ConfigureLabels.FEATURE_FILE); state |= getValueLong(ConfigureLabels.FEATURE_THREAD); -// state |= getValueLong(ConfigureLabels.FEATURE_USERINTERFACE); + state |= getValueLong(ConfigureLabels.FEATURE_USERINTERFACE); state |= getValueLong(ConfigureLabels.FEATURE_SCREENSHOT); state |= getValueLong(ConfigureLabels.FEATURE_USER_EVENT); @@ -493,7 +493,7 @@ public class ConfigureManager { state |= getValueLong(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY); state |= getValueLong(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD); state |= getValueLong(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); -// state |= getValueLong(ConfigureLabels.INCLUDE_INSIDE_CALL_UI); + state |= getValueLong(ConfigureLabels.INCLUDE_INSIDE_CALL_UI); } return state; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java index c98babd..abdebed 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java @@ -122,7 +122,7 @@ public class ToolbarArea { private static int COMBO_FIRST_INDEX = 0; public static boolean bThreadPageWork = false; // FIXME -// public static boolean bUIPageWork = false; // FIXME + public static boolean bUIPageWork = false; // FIXME public static final int TOOLBAR_STATE_RECORDING = 0; public static final int TOOLBAR_STATE_READY = 1; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java index 6af8b99..c558301 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java @@ -78,7 +78,7 @@ public class ConfigurationDialogDataManager { ConfigureLabels.FEATURE_NETWORK, ConfigureLabels.FEATURE_FILE, ConfigureLabels.FEATURE_OPENGL, - // ConfigureLabels.FEATURE_USERINTERFACE, + ConfigureLabels.FEATURE_USERINTERFACE, ConfigureLabels.FEATURE_SCREENSHOT, ConfigureLabels.FEATURE_USER_EVENT, ConfigureLabels.FEATURE_RECORDING, @@ -95,7 +95,7 @@ public class ConfigurationDialogDataManager { ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD, ConfigureLabels.INCLUDE_INSIDE_CALL_FILE, ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK, - // ConfigureLabels.INCLUDE_INSIDE_CALL_UI, + ConfigureLabels.INCLUDE_INSIDE_CALL_UI, ConfigureLabels.INCLUDE_INSIDE_OPENGL, }; optionalSettingName = new String[] { ConfigureLabels.SHOW_INITIAL, @@ -191,9 +191,8 @@ public class ConfigurationDialogDataManager { } else if (featuresName .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK)) { return ConfigureLabels.FEATURE_NETWORK; - // } else if - // (featuresName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)) { - // return ConfigureLabels.FEATURE_USERINTERFACE; + } else if(featuresName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)) { + return ConfigureLabels.FEATURE_USERINTERFACE; } else if (featuresName.equals(ConfigureLabels.INCLUDE_INSIDE_OPENGL)) { return ConfigureLabels.FEATURE_OPENGL; } else { @@ -243,9 +242,8 @@ public class ConfigurationDialogDataManager { ConfigureLabels.FEATURE_SYSTEM_THREAD, AnalyzerConstants.SYSTEM_THREAD_LOAD)); - // } else if (featureName - // .equals(ConfigureLabels.FEATURE_USERINTERFACE)) { - // value = AnalyzerConstants.FEATURE_OSP_UI_API; + } else if (featureName.equals(ConfigureLabels.FEATURE_USERINTERFACE)) { + value = AnalyzerConstants.FEATURE_OSP_UI_API; } else if (featureName.equals(ConfigureLabels.FEATURE_SCREENSHOT)) { value = AnalyzerConstants.FEATURE_SCREENSHOT; } else if (featureName.equals(ConfigureLabels.FEATURE_USER_EVENT)) { @@ -312,9 +310,9 @@ public class ConfigurationDialogDataManager { } else if (featureName .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) { value = AnalyzerConstants.THREAD_API_PROBING_NO_FILTER; - // } else if (featureName - // .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)) { - // value = AnalyzerConstants.OSP_UI_API_PROBING_NO_FILTER; + } else if (featureName + .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)) { + value = AnalyzerConstants.OSP_UI_API_PROBING_NO_FILTER; } else if (featureName .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK)) { value = AnalyzerConstants.NETWORK_API_PROBING_NO_FILTER; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesTable.java index a0899ca..8003e0b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesTable.java @@ -222,9 +222,9 @@ public class ConfigurationDialogFeaturesTable extends DATreeComposite { continue; } else if (featureName.equals(ConfigureLabels.FEATURE_NETWORK)) { continue; -// } else if (featureName -// .equals(ConfigureLabels.FEATURE_USERINTERFACE)) { -// continue; + } else if (featureName + .equals(ConfigureLabels.FEATURE_USERINTERFACE)) { + continue; } else if (featureName.equals(ConfigureLabels.FEATURE_OPENGL)) { continue; } @@ -326,9 +326,9 @@ public class ConfigurationDialogFeaturesTable extends DATreeComposite { } else if (featureName .equals(ConfigureLabels.FEATURE_NETWORK)) { return; -// } else if (featureName -// .equals(ConfigureLabels.FEATURE_USERINTERFACE)) { -// return; + } else if (featureName + .equals(ConfigureLabels.FEATURE_USERINTERFACE)) { + return; } else if (featureName .equals(ConfigureLabels.FEATURE_OPENGL)) { return; @@ -373,12 +373,12 @@ public class ConfigurationDialogFeaturesTable extends DATreeComposite { .contains(ConfigurationDialogFeaturesPage.ITEM_ALL_CHECKED)) { return; } -// } else if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)) { -// if (table.getItem(table.getSelectionIndex() - 1) -// .getText(tableTextOptionColumnIndex) -// .contains(ConfigurationDialogFeaturesPage.ITEM_ALL_CHECKED)) { -// return; -// } + } else if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)) { + if (table.getItem(table.getSelectionIndex() - 1) + .getText(tableTextOptionColumnIndex) + .contains(ConfigurationDialogFeaturesPage.ITEM_ALL_CHECKED)) { + return; + } } else if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_OPENGL)) { if (table.getItem(table.getSelectionIndex() - 1) .getText(tableTextOptionColumnIndex) -- 2.7.4