From: heeyoung Date: Tue, 30 Sep 2014 05:24:26 +0000 (+0900) Subject: Merge remote-tracking branch 'origin/tizen' into da-setting X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7760f5a65967dbdb6742ee50924ab71e02d79e91;p=sdk%2Ftools%2Fdynamic-analyzer.git Merge remote-tracking branch 'origin/tizen' into da-setting Conflicts: org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.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/toolbar/setting/WelcomeDialog.java Change-Id: I11e5919ded8bab8523ab21f5fc12db0432e42963 Signed-off-by: heeyoung --- 7760f5a65967dbdb6742ee50924ab71e02d79e91 diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java index b105134,5e41cf4..f9b2edd --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java @@@ -181,22 -129,47 +181,23 @@@ public class ConfigureLabels extends NL public static String YOU_HAVE_TO_SET_CHARACTER; public static String VALUE_SHOULD_BE_IN_RANGE_FROM_1_TO_100; public static String VALUE_SHOULD_BE_IN_RANGE_FROM_1_TO_1000; + public static String VALUE_SHOULD_BE_IN_RANGE_FROM_100_TO_1000; public static String YOU_HAVE_TO_SET_MULTIPLE_OF_10MS; - // setting - public static String TARGET_TITLE; - public static String TARGETS; - public static String TEMPLATE; - public static String OVERHEAD_FIRST; - public static String OVERHEAD_LAST; - public static String FEATURES; + public static String CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST; + public static String CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST; - public static String TARGET_NAME_MOBILE_2_3; - public static String TARGET_NAME_TV_0_1; - public static String TARGET_WEARABLE_2_3; + public static String SHOW_INITIAL; + public static String AUTO_STOP; - public static String TEMPLATE_NAME_BOTTLENECK; - public static String TEMPLATE_NAME_MEMORY_LEAKS; - public static String TEMPLATE_NAME_PROCESS_ACTIVITY; - public static String TEMPLATE_NAME_FILE; - public static String TEMPLATE_NAME_THREAD_ACTIVITY; - public static String TEMPLATE_NAME_WAIT_STATUS; - public static String TEMPLATE_NAME_NETWORK; - public static String TEMPLATE_NAME_OPEN_GL; - public static String TEMPLATE_NAME_ENERGY; - public static String TEMPLATE_NAME_CUSTOM; - - public static String INSIDE_THE_PLATFORM; - public static String INSIDE_THE_PLATFORM_MEMORY; - public static String INSIDE_THE_PLATFORM_FILE; - public static String INSIDE_THE_PLATFORM_THREAD; - public static String INSIDE_THE_PLATFORM_NETWORK; - public static String INSIDE_THE_PLATFORM_OPENGL; - public static String PAGE_NAME_TIME_LINE; - public static String PAGE_NAME_SUMMARY; - public static String PAGE_NAME_FILE; - public static String PAGE_NAME_THREAD; - public static String PAGE_NAME_NETWORK; - public static String PAGE_NAME_OPENGL; - public static String PAGE_NAME_KERNEL; - + // TODO : Pre-existing config key. (Check required) + public static String INTERNALCALL; + public static String PLATFORM; + public static String PLATFORM_ETC; + public static String SINGLETON_FOCUS_DA_PID; + public static String INTERNAL_LOG_LEVEL; + public static String THEME; static { NLS.initializeMessages(BUNDLE_NAME, ConfigureLabels.class); diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties index 23151ed,4b2ac95..7f91038 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties @@@ -80,21 -99,21 +80,22 @@@ SAMPLING=sampling rate PERIODIC=periodically VALUE_IS_EMPTY=value is empty YOU_HAVE_TO_SET_CHARACTER=you have to set character + VALUE_SHOULD_BE_IN_RANGE_FROM_1_TO_100=value should be in range from 1 to 100 VALUE_SHOULD_BE_IN_RANGE_FROM_1_TO_1000=value should be in range from 1 to 1000 + VALUE_SHOULD_BE_IN_RANGE_FROM_100_TO_1000=value should be in range from 100 to 1000 YOU_HAVE_TO_SET_MULTIPLE_OF_10MS=you have to set multiple of 10ms -TARGET_TITLE=Choose a target and template -TARGETS=Targets -TEMPLATE=Template -OVERHEAD_FIRST=We expect X -OVERHEAD_LAST=overhead -FEATURES=Features +SETTING_DIALOG_DESCRIPTION=Choose a target and template +SETTING_DIALOG_TARGET_TITLE=Targets +SETTING_DIALOG_TEMPLATE_TITLE=Template +SETTING_DIALOG_OVERHEAD_FIRST=We expect X +SETTING_DIALOG_OVERHEAD_LAST=overhead +FEATURE_DIALOG_FEATURE_TABLE_COLUMN_NAME=Features TARGET_NAME_MOBILE_2_3=mobile-2.3 -TARGET_NAME_TV_1_0=tv-0.1 -TARGET_WEARABLE_2_3=wearable-2.3 +TARGET_NAME_TV_0_1=tv-0.1 +TARGET_NAME_WEARABLE_2_3=wearable-2.3 TEMPLATE_NAME_BOTTLENECK=Bottleneck TEMPLATE_NAME_MEMORY_LEAKS=Memory Leaks @@@ -113,52 -132,4 +114,52 @@@ PAGE_NAME_FILE=Fil PAGE_NAME_THREAD=Thread PAGE_NAME_NETWORK=Network PAGE_NAME_OPENGL=OpenGL -PAGE_NAME_KERNEL=Kernel +PAGE_NAME_KERNEL=Kernel + +FEATURE_NAME_SYSTEM=System +FEATURE_NAME_SYSTEM_CPU=System CPU +FEATURE_NAME_SYSTEM_MEMORY=System memory +FEATURE_NAME_SYSTEM_PROCESSES=System processes +FEATURE_NAME_SYSTEM_DISK=System disk +FEATURE_NAME_SYSTEM_NETWORK=System network +FEATURE_NAME_SYSTEM_DEVICE=System device +FEATURE_NAME_SYSTEM_ENERGY=System energy + +FEATURE_NAME_FUNCTION_PROFILING=Function profiling +FEATURE_NAME_FUNCTION_SAMPLING=Function sampling +FEATURE_NAME_MEMORY_ALLOCATION=Memory allocation +FEATURE_NAME_FILE=File analysis +FEATURE_NAME_THREAD=Thread analysis +FEATURE_NAME_NETWORK=Network analysis +FEATURE_NAME_OPENGL=OpenGL ES analysis +FEATURE_NAME_SCREENSHOT=Screenshot +FEATURE_NAME_USER_EVENT=UI event +FEATURE_NAME_RECORDING=Recording +FEATURE_NAME_CONTEXT_SWITCH=Context switch + +FEATURE_NAME_SYSTEM_CALL = System call +FEATURE_NAME_SYSTEM_CALL_FILE=System call file +FEATURE_NAME_SYSTEM_CALL_IPC=System call ipc +FEATURE_NAME_SYSTEM_CALL_PROCESS=System call process +FEATURE_NAME_SYSTEM_CALL_SIGNAL=System call signal +FEATURE_NAME_SYSTEM_CALL_NETWORK=System call network +FEATURE_NAME_SYSTEM_CALL_DESC=System call desc + +FEATURE_NAME_INSIDE_THE_PLATFORM=Inside the platform +FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY=Inside the platform memory +FEATURE_NAME_INSIDE_THE_PLATFORM_FILE=Inside the platform file +FEATURE_NAME_INSIDE_THE_PLATFORM_THREAD=Inside the platform thread +FEATURE_NAME_INSIDE_THE_PLATFORM_NETWORK=Inside the platform network +FEATURE_NAME_INSIDE_THE_PLATFORM_OPENGL=Inside the platform openGL + +FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE=System information sampling periodic +FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE=Function profiling sampling periodic +FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION=On scene transition +FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY=periodically + +FEATURE_DETAIL_VALUE_WARNING_FOR_EMPTY=value is empty +FEATURE_DETAIL_VALUE_WARNING_FOR_CHARACTER=you have to set character +FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE=value should be in range from minValue to maxValue +FEATURE_DETAIL_VALUE_WARNING_FOR_HAVE_TO_SET_MULTIPLE_OF_10MS_IN_SYSTEM_SAMPLING_RATE=you have to set multiple of 10ms +SETTING_OPTION_SHOW_INITIAL=Use this as the default and do not ask again. - SETTING_OPTION_AUTO_STOP=Auto-stop while replaying ++SETTING_OPTION_AUTO_STOP=Auto-stop while replaying diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java index ce2e3d6,87a0904..8d9940b --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java @@@ -93,18 -95,18 +95,18 @@@ public class NewLeakDetector int id = logData.getId(); switch (id) { case DataChannelConstants.MSG_PROBE_FILE: - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_FILE)) { - return true; + return false; } break; case DataChannelConstants.MSG_PROBE_MEMORY: - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY)) { - return true; + return false; } break; case DataChannelConstants.MSG_PROBE_THREAD: - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_THREAD)) { - return true; + return false; } break; default: diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java index 871e144,7eb0a23..9744691 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java @@@ -94,47 -99,18 +97,48 @@@ public class SettingDialog extends DAMe shell.close(); // close dialog } }; - + +// HIDDEN SETTING WIDGET (CHECKBOX, BUTTON) +// private DACustomButtonClickEventListener applyButtonListener = new DACustomButtonClickEventListener() { +// +// @Override +// public void handleClickEvent(DACustomButton button) { +// doApply(); +// applicableButteon(); +// } +// }; +// private DACustomButtonClickEventListener revertButtonListener = new DACustomButtonClickEventListener() { +// +// @Override +// public void handleClickEvent(DACustomButton button) { +// doRevert(); +// applicableButteon(); +// } +// }; +// +// private DACustomButtonClickEventListener closeButtonListener = new DACustomButtonClickEventListener() { +// +// @Override +// public void handleClickEvent(DACustomButton button) { ++// isApply = true; +// doRun(); - // shell.dispose(); // close dialog ++// shell.close(); // close dialog +// } +// }; + private void doApply() { Composite selectedComposite = tabView.getTopComposite(); - if (!(selectedComposite instanceof SettingDialogBinarySettingsPage)) { - // add & remove tab view page - SettingDialogManager.getInstance().updateTabViewPage(); - - // add & remove (timeline) chart - SettingDialogManager.getInstance().updateChartList(); - - // write setting data - SettingDataManager.getInstance().applySettingData(); + if (!(selectedComposite instanceof SettingDialogBinarySettingsPage)) { + if (DACommunicator.isRunning() == false) { + // add & remove tab view page + SettingDialogManager.getInstance().updateTabViewPage(); + + // add & remove (timeline) chart + SettingDialogManager.getInstance().updateChartList(); + + // write setting data + SettingDataManager.getInstance().applySettingData(); + } } else { // binary setting page SettingDialogBinarySettingsPage page = (SettingDialogBinarySettingsPage) selectedComposite; @@@ -268,39 -241,39 +272,40 @@@ } }); - binarySettings.addListener(SWT.Show, new Listener() { - - @Override - public void handleEvent(Event event) { - FormData data = (FormData) applyButton.getLayoutData(); - data.width = 0; - ++// HIDDEN SETTING WIDGET (CHECKBOX, BUTTON) +// binarySettings.addListener(SWT.Show, new Listener() { +// +// @Override +// public void handleEvent(Event event) { ++// +// FormData data = (FormData) applyButton.getLayoutData(); +// data.width = 0; +// // data = (FormData) revertButton.getLayoutData(); // data.width = 0; - - buttonContentsComp.layout(); - } - }); - - binarySettings.addListener(SWT.Hide, new Listener() { - - @Override - public void handleEvent(Event event) { - FormData data = (FormData) applyButton.getLayoutData(); - data.width = 100; - +// +// buttonContentsComp.layout(); +// } +// }); +// +// binarySettings.addListener(SWT.Hide, new Listener() { +// +// @Override +// public void handleEvent(Event event) { +// FormData data = (FormData) applyButton.getLayoutData(); +// data.width = 100; +// // data = (FormData) revertButton.getLayoutData(); // data.width = 100; - - buttonContentsComp.layout(); - } - }); - - - closeButton = new DAButton(buttonContentsComp, SWT.NONE); - closeButton.addClickListener(closeButtonListener); - closeButton.setText(WidgetLabels.CLOSE); - closeButton.setButtonFont(FontResources.DIALOG_BUTTON_FONT); +// +// buttonContentsComp.layout(); +// } +// }); + - + 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); @@@ -402,10 -347,10 +407,16 @@@ @Override public void shellClosed(ShellEvent e) { // TODO Auto-generated method stub - if (!isApply && !DACommunicator.isRunning()) { - // rollback setting data - SettingDataManager.getInstance().revertSettingData(); + if (!isApply) { + doRevert(); + doRun(); } ++ ++// HIDDEN SETTING WIDGET (CHECKBOX, BUTTON) ++// if (!isApply && !DACommunicator.isRunning()) { ++// // rollback setting data ++// SettingDataManager.getInstance().revertSettingData(); ++// } } @Override diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java index 182b304,f924acd..bb17897 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java @@@ -93,45 -95,16 +93,46 @@@ public class WelcomeDialog extends DAMe shell.close(); // close dialog } }; + +// HIDDEN SETTING WIDGET (CHECKBOX, BUTTON) +// private DACustomButtonClickEventListener applyButtonListener = new DACustomButtonClickEventListener() { +// +// @Override +// public void handleClickEvent(DACustomButton button) { +// doApply(); +// applicableButteon(); +// } +// }; +// private DACustomButtonClickEventListener revertButtonListener = new DACustomButtonClickEventListener() { +// +// @Override +// public void handleClickEvent(DACustomButton button) { +// doRevert(); +// applicableButteon(); +// } +// }; +// +// private DACustomButtonClickEventListener runButtonListener = new DACustomButtonClickEventListener() { +// +// @Override +// public void handleClickEvent(DACustomButton button) { ++// isApply = true; +// doRun(); +// shell.close(); // close dialog +// } +// }; private void doApply() { - // add & remove tab view page - SettingDialogManager.getInstance().updateTabViewPage(); - - // add & remove (timeline) chart - SettingDialogManager.getInstance().updateChartList(); - - // write setting data - SettingDataManager.getInstance().applySettingData(); + if (DACommunicator.isRunning() == false) { + // add & remove tab view page + SettingDialogManager.getInstance().updateTabViewPage(); + + // add & remove (timeline) chart + SettingDialogManager.getInstance().updateChartList(); + + // write setting data + SettingDataManager.getInstance().applySettingData(); + } } private void doRevert() { @@@ -367,10 -310,10 +368,16 @@@ @Override public void shellClosed(ShellEvent e) { // TODO Auto-generated method stub - if (!isApply && !DACommunicator.isRunning()) { - // rollback setting data - SettingDataManager.getInstance().revertSettingData(); + if (!isApply) { + doRevert(); + doRun(); } ++ ++// HIDDEN SETTING WIDGET (CHECKBOX, BUTTON) ++// if (!isApply && !DACommunicator.isRunning()) { ++// // rollback setting data ++// SettingDataManager.getInstance().revertSettingData(); ++// } notifyAutoRun(); }