From: heeyoung Date: Tue, 23 Sep 2014 09:21:02 +0000 (+0900) Subject: Setting : redefine Setting string X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=952f447d262c6e3c4373311fa71357cb9d0cb78f;p=sdk%2Ftools%2Fdynamic-analyzer.git Setting : redefine Setting string Change-Id: I5a21f330dcb2673a8c5633bebd5b15ad5f010cd6 Signed-off-by: heeyoung --- diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java index dbd17bc..fa91c07 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java @@ -432,7 +432,7 @@ public class ImageResources { /* setting */ public static final Image TARGET_MOBILE_2_3 = getPngImage("feature_target_mobile"); //$NON-NLS-1$ - public static final Image TARGET_NAME_TV_0_1 = getPngImage("feature_target_tv"); //$NON-NLS-1$ + public static final Image TARGET_TV_0_1 = getPngImage("feature_target_tv"); //$NON-NLS-1$ public static final Image TARGET_WEARABLE_2_3 = getPngImage("feature_target_wearable"); //$NON-NLS-1$ public static final Image TEMPLATE_BOTTLENECK_ANALYSIS = getPngImage("feature_template_bottleneck"); //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java index b0c17da..bb9b286 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java @@ -384,36 +384,15 @@ public class AnalyzerManager { public static synchronized void startScreenshotTimer() { stopScreenshotTimer(); TargetData target = SettingDataManager.getInstance().getConnectedTarget(); - if (target.isSelectedFeature(ConfigureLabels.FEATURE_SCREENSHOT)) { - if (target.isSelectedFeature(ConfigureLabels.PERIODIC)) { - int value = target.getSelectedFeatureValue(ConfigureLabels.PERIODIC); + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_SCREENSHOT)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY)) { + int value = target.getSelectedFeatureValue(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY); if (value > 0) { screenshotTimer = new Timer(); screenshotTimer.scheduleAtFixedRate(new ScreenshotTimerTask(), 1000, value*1000); } } } -// TODO : check and remove -// String state = configureManager.getValue(ConfigureLabels.FEATURE_SCREENSHOT); -// long screenshot = AnalyzerUtil.addrToLong(state); -// if (screenshot != 0) { -// String screenshotAuto = configureManager -// .getValue(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO); -// long period = 10000; -// long auto = AnalyzerUtil.addrToLong(screenshotAuto); -// if (auto == 0) { -// String screenshotPeriod = configureManager -// .getValue(ConfigureLabels.SNAPSHOT_PERIODIC); -// try { -// period = Long.parseLong(screenshotPeriod) * 1000; -// } catch (NumberFormatException e) { -// e.printStackTrace(); -// } -// screenshotTimer = new Timer(); -// screenshotTimer.scheduleAtFixedRate(new ScreenshotTimerTask(), 1000, period); -// } -// } - } public static synchronized void stopScreenshotTimer() { 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 199249d..183dede 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java @@ -31,31 +31,111 @@ import org.eclipse.osgi.util.NLS; public class ConfigureLabels extends NLS { private static final String BUNDLE_NAME = "org.tizen.dynamicanalyzer.nl.ConfigureLabels"; //$NON-NLS-1$ - // table - public static String FEATURE_TABLE_TITLE; - public static String FEATURE_TABLE_FEATURE_EMPTY; - public static String FEATURE_TABLE_FEATURE_NAME; - public static String FEATURE_DETAIL_TITLE; - public static String FEATURE_DETAIL_SETTING_TITLE; - - - public static String SETTING_TABLE_TITLE; - public static String SETTING_WHITE; - public static String SETTING_BLACK; - public static String SETTING_CONFIGURATION_TITLE; - - public static String WELCONE_ASK_USE_AGAIN; - public static String SETTING_DIALOG_NOT_FOUND; - public static String SETTING_DIALOG_FAIL_MESSAGE; - - public static String INCLUDE_INSIDE_CALL; public static String AUTO; + public static String SAMPLING; public static String SECOND; public static String MS; - public static String SAMPLING; - public static String PERIODIC; - // features name + public static String DETAIL_FUNCTIONPROFILING; + public static String DETAIL_ALLOCATION; + public static String DETAIL_FILE; + public static String DETAIL_THREAD; + public static String DETAIL_USERINTERFACE; + public static String DETAIL_SNAPSHOT; + public static String DETAIL_EVENT; + public static String DETAIL_RECORDING; + + public static String SETTING_DIALOG_DESCRIPTION; + public static String SETTING_DIALOG_TARGET_TITLE; + public static String SETTING_DIALOG_TEMPLATE_TITLE; + public static String SETTING_DIALOG_OVERHEAD_FIRST; + public static String SETTING_DIALOG_OVERHEAD_LAST; + + public static String FEATURE_DIALOG_HEADER_TITLE; + public static String FEATURE_DIALOG_DESCRIPTION; + public static String FEATURE_DIALOG_FEATURE_TABLE_COLUMN_NAME; + + public static String SETTING_WARNING_MESSAGE_FILE_NOT_FOUND; + public static String SETTING_WARNING_MESSAGE_SETTING_FAIL; + + public static String TARGET_NAME_MOBILE_2_3; + public static String TARGET_NAME_TV_0_1; + public static String TARGET_NAME_WEARABLE_2_3; + + 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 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; + + public static String FEATURE_NAME_SYSTEM; // 3.0 only + public static String FEATURE_NAME_SYSTEM_CPU; // 3.0 only + public static String FEATURE_NAME_SYSTEM_MEMORY; // 3.0 only + public static String FEATURE_NAME_SYSTEM_PROCESSES; // 3.0 only + public static String FEATURE_NAME_SYSTEM_DISK; // 3.0 only + public static String FEATURE_NAME_SYSTEM_NETWORK; // 3.0 only + public static String FEATURE_NAME_SYSTEM_DEVICE; // 3.0 only + public static String FEATURE_NAME_SYSTEM_ENERGY; // 3.0 only + + public static String FEATURE_NAME_FUNCTION_PROFILING; + public static String FEATURE_NAME_FUNCTION_SAMPLING; // 3.0 only + public static String FEATURE_NAME_MEMORY_ALLOCATION; + public static String FEATURE_NAME_FILE; + public static String FEATURE_NAME_THREAD; + public static String FEATURE_NAME_NETWORK; // 3.0 only + public static String FEATURE_NAME_OPENGL; // 3.0 only + public static String FEATURE_NAME_SCREENSHOT; + public static String FEATURE_NAME_USER_EVENT; + public static String FEATURE_NAME_RECORDING; + public static String FEATURE_NAME_CONTEXT_SWITCH; // 3.0 only + + public static String FEATURE_NAME_SYSTEM_CALL; // 3.0 only + public static String FEATURE_NAME_SYSTEM_CALL_FILE; // 3.0 only + public static String FEATURE_NAME_SYSTEM_CALL_IPC; // 3.0 only + public static String FEATURE_NAME_SYSTEM_CALL_PROCESS; // 3.0 only + public static String FEATURE_NAME_SYSTEM_CALL_SIGNAL; // 3.0 only + public static String FEATURE_NAME_SYSTEM_CALL_NETWORK; // 3.0 only + public static String FEATURE_NAME_SYSTEM_CALL_DESC; // 3.0 only + + public static String FEATURE_NAME_INSIDE_THE_PLATFORM; + public static String FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY; + public static String FEATURE_NAME_INSIDE_THE_PLATFORM_FILE; + public static String FEATURE_NAME_INSIDE_THE_PLATFORM_THREAD; + public static String FEATURE_NAME_INSIDE_THE_PLATFORM_NETWORK; + public static String FEATURE_NAME_INSIDE_THE_PLATFORM_OPENGL; + + public static String FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE; + public static String FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE; + public static String FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION; + public static String FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY; + + public static String FEATURE_DETAIL_VALUE_WARNING_FOR_EMPTY; + public static String FEATURE_DETAIL_VALUE_WARNING_FOR_CHARACTER; + public static String FEATURE_DETAIL_VALUE_WARNING_FOR_HAVE_TO_SET_MULTIPLE_OF_10MS_IN_SYSTEM_SAMPLING_RATE; + public static String FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE_IN_SYSTEM_SAMPLING_RATE; + public static String FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE_IN_FUNCTION_PROFILING_SAMPLING_RATE; + public static String FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE_IN_SCREENSHOT_PERIODIC; + + public static String SETTING_OPTION_TAB_DESCRIPTION; + + public static String SETTING_OPTION_SHOW_INITIAL; + public static String SETTING_OPTION_AUTO_STOP; + + // TODO : this part is also deleted when the "org.tizen.dynamicanalyzer.ui.toolbar.configuration" package is deleted. + public static String FEATURE_TABLE_FEATURE_NAME; public static String FEATURE_FUNCTION_PROFILING; public static String FEATURE_FUNCTION_SAMPLING; // 3.0 only public static String FEATURE_MEMORY_ALLOCATION; @@ -85,90 +165,40 @@ public class ConfigureLabels extends NLS { public static String FEATURE_SYSTEM_ENERGY; // 3.0 only public static String FEATURE_SYSTEM_THREAD; // 3.0 only - public static String DETAIL_FUNCTIONPROFILING; - public static String DETAIL_ALLOCATION; - public static String DETAIL_FILE; - public static String DETAIL_THREAD; - public static String DETAIL_USERINTERFACE; - public static String DETAIL_SNAPSHOT; - public static String DETAIL_EVENT; - public static String DETAIL_RECORDING; - - public static String SHOW_INITIAL; - public static String AUTO_STOP; - + public static String INCLUDE_INSIDE_CALL; public static String INCLUDE_INSIDE_CALL_MEMORY; 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_OPENGL; - public static String SNAPSHOT_PERIODIC; - public static String SNAPSHOT_PERIODIC_AUTO; + public static String FUNCTION_PROFILING_SAMPLING_PERIODIC; public static String SYSTEM_INFOMATION_SAMPLING_PERIODIC; + public static String SNAPSHOT_PERIODIC; + public static String SNAPSHOT_PERIODIC_AUTO; + public static String PERIODIC; - public static String OFF; - public static String ON; - public static String INTERNALCALL; - public static String RANGEAUTOSELECT; - public static String PLATFORM; - public static String PLATFORM_ETC; - public static String SHOWLOG; - public static String SAMPLINGPERIOD; - public static String PROCESSSIZE; - public static String SINGLETON_FOCUS_DA_PID; - public static String CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST; - public static String CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST; - - public static String INTERNAL_LOG_LEVEL; - - public static String THEME; - public static String VALUE_IS_EMPTY; 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 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 --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties index f1949f5..71b6706 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties @@ -1,17 +1,11 @@ -FEATURE_TABLE_TITLE=Choose the detailed features. -FEATURE_TABLE_FEATURE_EMPTY= +FEATURE_DIALOG_DESCRIPTION=Choose the detailed features. FEATURE_TABLE_FEATURE_NAME=Name -FEATURE_DETAIL_TITLE=Details -FEATURE_DETAIL_SETTING_TITLE=Feature details +FEATURE_DIALOG_HEADER_TITLE=Feature details -SETTING_TABLE_TITLE=Appearance settings -SETTING_WHITE=White -SETTING_BLACK=Black -SETTING_CONFIGURATION_TITLE=Configuration settings +SETTING_OPTION_TAB_DESCRIPTION=Configuration settings -WELCONE_ASK_USE_AGAIN=Use this as the default and do not ask again. -SETTING_DIALOG_NOT_FOUND=Setting file not found -SETTING_DIALOG_FAIL_MESSAGE=Start Trace Setting failed.. +SETTING_WARNING_MESSAGE_FILE_NOT_FOUND=Setting file not found +SETTING_WARNING_MESSAGE_SETTING_FAIL=Start Trace Setting failed.. FEATURE_FUNCTION_PROFILING=Function profiling FEATURE_FUNCTION_SAMPLING=Function sampling @@ -55,16 +49,10 @@ DETAIL_RECORDING= Record profiling information for playback. SHOW_INITIAL=Do not show the configuration at start-up. AUTO_STOP=Auto-stop while replaying -OFF=off -ON=on INTERNALCALL=Internal call -RANGEAUTOSELECT=Range auto select FEATURE_SCREENSHOT=Snapshot PLATFORM=Platform PLATFORM_ETC=etc -SHOWLOG=Show log -SAMPLINGPERIOD=Sampling period -PROCESSSIZE=Process size SINGLETON_FOCUS_DA_PID=Singleton focus DA PID CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST=Available chart list CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST=Selected chart list @@ -81,13 +69,6 @@ INCLUDE_INSIDE_CALL_NETWORK=Include inside call network INCLUDE_INSIDE_CALL_UI=Include inside call ui INCLUDE_INSIDE_OPENGL=Include inside call openGL -INSIDE_THE_PLATFORM=Inside the platform -INSIDE_THE_PLATFORM_MEMORY=Inside the platform memory -INSIDE_THE_PLATFORM_FILE=Inside the platform file -INSIDE_THE_PLATFORM_THREAD=Inside the platform thread -INSIDE_THE_PLATFORM_NETWORK=Inside the platform network -INSIDE_THE_PLATFORM_OPENGL=Inside the platform openGL - SNAPSHOT_PERIODIC=Snapshot periodic FUNCTION_PROFILING_SAMPLING_PERIODIC=Function profiling sampling periodic SYSTEM_INFOMATION_SAMPLING_PERIODIC=System information sampling periodic @@ -95,24 +76,25 @@ SNAPSHOT_PERIODIC_AUTO=On scene transition MS=ms SECOND=s AUTO=auto : -SAMPLING=sampling period : +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 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 @@ -131,4 +113,55 @@ PAGE_NAME_FILE=File PAGE_NAME_THREAD=Thread PAGE_NAME_NETWORK=Network PAGE_NAME_OPENGL=OpenGL -PAGE_NAME_KERNEL=Kernel \ No newline at end of file +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_HAVE_TO_SET_MULTIPLE_OF_10MS_IN_SYSTEM_SAMPLING_RATE=you have to set multiple of 10ms +FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE_IN_SYSTEM_SAMPLING_RATE=value should be in range from 1 to 1000 +FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE_IN_FUNCTION_PROFILING_SAMPLING_RATE=value should be in range from 1 to 1000 +FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE_IN_SCREENSHOT_PERIODIC=value should be in range from 1 to 100 + +SETTING_OPTION_SHOW_INITIAL=Use this as the default and do not ask again. +SETTING_OPTION_AUTO_STOP=Auto-stop while replaying \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java index eebbb02..b1bb8d1 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java @@ -505,22 +505,19 @@ public class Communicator30 extends BaseCommunicator { RunTimeConfiguration rt = new RunTimeConfiguration(); rt.setFeatures(SettingDataManager.getInstance().getConfiguration(devInfo), SettingDataManager.getInstance().getPreConfiguration(devInfo)); - // TODO : check and remove - // rt.setSystemTracePeriod(ConfigureManager.getInstance().getSystemPeriod()); - // rt.setSamplingPeriod(ConfigureManager.getInstance().getSamplingPeriod()); TargetData target = SettingDataManager.getInstance().getConnectedTarget(); int systemPeriod = target - .getSelectedFeatureValue(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC); + .getSelectedFeatureValue(ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE); if (systemPeriod < 0) { systemPeriod = target.getAvailableFeature( - ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC).getDefaultValue(); + ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE).getDefaultValue(); } int samplingPeriod = target - .getSelectedFeatureValue(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC); + .getSelectedFeatureValue(ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE); if (samplingPeriod < 0) { samplingPeriod = target.getAvailableFeature( - ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC).getDefaultValue(); + ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE).getDefaultValue(); } rt.setSystemTracePeriod(systemPeriod); rt.setSamplingPeriod(samplingPeriod); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java index ba85700..8f2bd7f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java @@ -128,7 +128,7 @@ public class FileDataMaker { // check if the inside call is set or not boolean isInculdeInsideCall = false; TargetData target = SettingDataManager.getInstance().getConnectedTarget(); - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE) == true) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_FILE) == true) { isInculdeInsideCall = true; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java index e41d43e..58661ce 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java @@ -91,27 +91,19 @@ public class LeakDetector { private boolean isDropLog(LogData logData) { TargetData target = SettingDataManager.getInstance().getConnectedTarget(); int id = logData.getId(); -// TODO : check and remove -// String statStr = null; switch (id) { case DataChannelConstants.MSG_PROBE_FILE: -// statStr = configureManager -// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_FILE)) { return true; } break; case DataChannelConstants.MSG_PROBE_MEMORY: -// statStr = configureManager -// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY); - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY)) { return true; } break; case DataChannelConstants.MSG_PROBE_THREAD: -// statStr = configureManager -// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD); - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_THREAD)) { return true; } break; @@ -120,14 +112,6 @@ public class LeakDetector { } return false; -// long state = AnalyzerUtil.addrToLong(statStr); -// if (state != AnalyzerConstants.FEATURE_OFF) { -// // feature on -// return false; -// } -// return true; -// // feature on : false -// // feature off : true } public void runLeakDectect(LogData logData) { diff --git 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 index 5469ce8..ce2e3d6 100644 --- 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 @@ -91,27 +91,19 @@ public class NewLeakDetector { private boolean isDropLog(LogData logData) { TargetData target = SettingDataManager.getInstance().getConnectedTarget(); int id = logData.getId(); - // TODO : check and remove -// String statStr = null; switch (id) { case DataChannelConstants.MSG_PROBE_FILE: -// statStr = configureManager -// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_FILE)) { return true; } break; case DataChannelConstants.MSG_PROBE_MEMORY: -// statStr = configureManager -// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY); - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY)) { return true; } break; case DataChannelConstants.MSG_PROBE_THREAD: -// statStr = configureManager -// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD); - if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_THREAD)) { return true; } break; @@ -120,14 +112,6 @@ public class NewLeakDetector { } return false; -// long state = AnalyzerUtil.addrToLong(statStr); -// if (state != AnalyzerConstants.FEATURE_OFF) { -// // feature on -// return false; -// } -// return true; -// // feature on : false -// // feature off : true } // public int runLeakDetect(LogData logData) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java index 7a67f3c..1e965ca 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java @@ -230,24 +230,14 @@ public class FunctionUsageProfiler extends PageDataManager { // TODO: will get sample_time from Project.java if (!isSetSamplePeriod) { - // TODO : check and remove -// SAMPLE_TIME = ConfigurationDialogDataManager -// .getInstance() -// .getfeatureValue( -// ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC); -// isSetSamplePeriod = true; - SAMPLE_TIME = target.getSelectedFeatureValue(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC); + SAMPLE_TIME = target.getSelectedFeatureValue(ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE); if (SAMPLE_TIME < 0) { SAMPLE_TIME = target.getAvailableFeature( - ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC).getDefaultValue(); + ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE).getDefaultValue(); } } -// TODO : check and remove -// if (ConfigurationDialogDataManager.getInstance() // sampling is on -// .getfeatureValue( -// ConfigureLabels.FEATURE_FUNCTION_PROFILING) != 0) { - if (target.isSelectedFeature(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_FUNCTION_SAMPLING)) { Logs logs = pack.getLogs(DataChannelConstants.MSG_DATA_SAMPLE); if (null != logs && logs.getRawLogs().size() != 0) { 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 cf7389d..05af8b1 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 @@ -521,7 +521,7 @@ public class ToolbarArea { Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); DADialog dialog = new DADialog(shell, SWT.NONE, 550, 153); dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); - dialog.setMessage(ConfigureLabels.SETTING_DIALOG_FAIL_MESSAGE); + dialog.setMessage(ConfigureLabels.SETTING_WARNING_MESSAGE_SETTING_FAIL); dialog.open(); setToolbarStartStopState(true); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java index 58388ec..72e5cf5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java @@ -86,7 +86,7 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { // Title Label tableTitle = new Label(this, SWT.TRANSPARENT); - tableTitle.setText(ConfigureLabels.FEATURE_TABLE_TITLE); + tableTitle.setText(ConfigureLabels.FEATURE_DIALOG_DESCRIPTION); tableTitle .setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); tableTitle.setForeground(ColorResources.DEFAULT_FONT_COLOR); @@ -111,7 +111,7 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { featuresTable = new ConfigurationDialogFeaturesTable(tableComp, SWT.BORDER | SWT.V_SCROLL | SWT.SINGLE); featuresTable.setTree(true); - featuresTable.setTableName(ConfigureLabels.FEATURE_TABLE_TITLE); + featuresTable.setTableName(ConfigureLabels.FEATURE_DIALOG_DESCRIPTION); // featuresTable.setComparator(new ConfigurationTableComparator()); featuresTable.setSortTypes(sortTypes); featuresTable.setColumns(columnNames); @@ -163,7 +163,7 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { // Detail Title Label detailLabel = new Label(this, SWT.TRANSPARENT); - detailLabel.setText(ConfigureLabels.FEATURE_DETAIL_SETTING_TITLE); + detailLabel.setText(ConfigureLabels.FEATURE_DIALOG_HEADER_TITLE); detailLabel .setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); detailLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogSettingPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogSettingPage.java index d5d2746..7c4ba0c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogSettingPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogSettingPage.java @@ -56,7 +56,7 @@ public class ConfigurationDialogSettingPage extends DAPageComposite { // Configuration Setting Label settingLabel = new Label(this, SWT.TRANSPARENT); - settingLabel.setText(ConfigureLabels.SETTING_CONFIGURATION_TITLE); + settingLabel.setText(ConfigureLabels.SETTING_OPTION_TAB_DESCRIPTION); settingLabel .setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); settingLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR); 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 2d7432a..efb25b3 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 @@ -195,7 +195,7 @@ public class WelcomeDialog extends DAMessageBox { useAgainCheckButton.setForeground(ColorResources.BLACK); useAgainCheckButton .setBackground(ColorResources.CONFIGURATION_BUTTON_COVER_BACKGROUND_COLOR); - useAgainCheckButton.setText(ConfigureLabels.WELCONE_ASK_USE_AGAIN); + useAgainCheckButton.setText(ConfigureLabels.SHOW_INITIAL); useAgainCheckButton.addSelectionListener(useAgainCheckbuttonListener); if (ConfigurationDialogDataManager.getInstance().getfeatureValue( ConfigureLabels.SHOW_INITIAL) > 0) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java index d61bcb2..e04437c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java @@ -66,7 +66,7 @@ public class FeatureDialog extends DAMessageBox { private SettingDialogTemplatePage templatePage = null; int[] sortTypes = { AnalyzerConstants.SORT_TYPE_GRID }; - private String[] columnNames = { ConfigureLabels.FEATURES }; + private String[] columnNames = { ConfigureLabels.FEATURE_DIALOG_FEATURE_TABLE_COLUMN_NAME }; private int[] columnSizes = { 571 }; private boolean[] columnVisibility = { true }; @@ -166,7 +166,7 @@ public class FeatureDialog extends DAMessageBox { // shell.setSize(446, 424); shell.setSize(580, 500); shell.setLayout(new FormLayout()); - shell.setText(ConfigureLabels.FEATURE_DETAIL_SETTING_TITLE); + shell.setText(ConfigureLabels.FEATURE_DIALOG_HEADER_TITLE); shell.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); Composite tableComp = new Composite(shell, SWT.NONE); @@ -193,7 +193,7 @@ public class FeatureDialog extends DAMessageBox { // Title Label tableTitle = new Label(tableComp, SWT.TRANSPARENT); - tableTitle.setText(ConfigureLabels.FEATURE_TABLE_TITLE); + tableTitle.setText(ConfigureLabels.FEATURE_DIALOG_DESCRIPTION); tableTitle .setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); tableTitle.setForeground(ColorResources.DEFAULT_FONT_COLOR); @@ -211,7 +211,7 @@ public class FeatureDialog extends DAMessageBox { SWT.BORDER | SWT.V_SCROLL | SWT.SINGLE | SWT.NO_FOCUS); featuresTable.setTree(true); featuresTable.setItemHeightSize(22); - featuresTable.setTableName(ConfigureLabels.FEATURE_TABLE_TITLE); + featuresTable.setTableName(ConfigureLabels.FEATURE_DIALOG_DESCRIPTION); featuresTable.setSortTypes(sortTypes); featuresTable.setColumns(columnNames); featuresTable.setColumnSize(columnSizes); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTable.java index da6ab8c..294dcbc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTable.java @@ -102,8 +102,8 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { // check selected feature : , item_all_checked if (target.isSelectedFeature(featureName) == true) { optionColumn.append(FeatureDialog.ITEM_ALL_CHECKED); - } else if (ConfigureLabels.SNAPSHOT_PERIODIC_AUTO.equals(featureName)) { - if (target.isSelectedFeature(ConfigureLabels.FEATURE_SCREENSHOT)) { + } else if (ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION.equals(featureName)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_SCREENSHOT)) { optionColumn.append(FeatureDialog.ITEM_ALL_CHECKED); } } else { @@ -142,7 +142,7 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { for (Map.Entry entry : map.entrySet()) { FeatureData feature = entry.getValue(); - if (feature.getFeatureName().equals(ConfigureLabels.PERIODIC)) { + if (feature.getFeatureName().equals(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY)) { continue; } @@ -165,7 +165,9 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { } else { TreeInput parentTreeInput = getTreeInput(output, feature.getParentName()); - parentTreeInput.getChildren().add(currentNode); + if (parentTreeInput != null) { + parentTreeInput.getChildren().add(currentNode); + } } } } @@ -196,10 +198,10 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { } private String getDetailFeatureOptionText(String featureName) { - if (featureName.equals(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO)) { + if (featureName.equals(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION)) { return getScreenShotOptionText(featureName); - } else if (featureName.equals(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC) - || featureName.equals(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC)) { + } else if (featureName.equals(ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE) + || featureName.equals(ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE)) { return getSystemOptionText(featureName); } else { Logger.debug("the feature is not an option. " + featureName); @@ -227,20 +229,20 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { private String getScreenShotOptionText(String featureName) { StringBuffer optionValue = new StringBuffer(); TargetData target = SettingDataManager.getInstance().getTarget(null); - boolean auto = target.isSelectedFeature(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO); - boolean period = target.isSelectedFeature(ConfigureLabels.PERIODIC); + boolean auto = target.isSelectedFeature(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION); + boolean period = target.isSelectedFeature(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY); if (auto) { // select : auto radio button - FeatureData periodFeature = target.getAvailableFeature(ConfigureLabels.PERIODIC); + FeatureData periodFeature = target.getAvailableFeature(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY); optionValue.append(ConfigureLabels.AUTO + "1,"); optionValue.append(ConfigureLabels.SAMPLING + periodFeature.getDefaultValue()); } else if (auto == false) { // select : periodic radio button if (period) { optionValue.append(ConfigureLabels.AUTO + "0,"); - optionValue.append(ConfigureLabels.SAMPLING + target.getSelectedFeatureValue(ConfigureLabels.PERIODIC)); + optionValue.append(ConfigureLabels.SAMPLING + target.getSelectedFeatureValue(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY)); } else { - FeatureData autoFeature = target.getAvailableFeature(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO); - FeatureData periodFeature = target.getAvailableFeature(ConfigureLabels.PERIODIC); + FeatureData autoFeature = target.getAvailableFeature(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION); + FeatureData periodFeature = target.getAvailableFeature(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY); optionValue.append(ConfigureLabels.AUTO + autoFeature.getDefaultValue() + ","); optionValue.append(ConfigureLabels.SAMPLING + periodFeature.getDefaultValue()); } @@ -280,6 +282,10 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { updateCheckBox(item, event); updateChildCheckBoxByParent(item, event); updateParentCheckBoxByChild(item, event); + + if (item.hasChildren() && isCheckStatus(item)) { + item.setExpanded(true); + } } } break; @@ -302,23 +308,6 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { private void updateParentFeatureCheckStatus(List output) { for (int i = 0; i < output.size(); i++) { TreeInput treeData = output.get(i); - - String featureName = treeData.getText().get(0); - if (featureName.equals(ConfigureLabels.FEATURE_MEMORY_ALLOCATION)) { - continue; - } else if (featureName.equals(ConfigureLabels.FEATURE_THREAD)) { - continue; - } else if (featureName.equals(ConfigureLabels.FEATURE_FILE)) { - continue; - } else if (featureName.equals(ConfigureLabels.FEATURE_NETWORK)) { - continue; - } else if (featureName - .equals(ConfigureLabels.FEATURE_USERINTERFACE)) { - continue; - } else if (featureName.equals(ConfigureLabels.FEATURE_OPENGL)) { - continue; - } - if (treeData.getChildren().size() > 0) { int childCheckedCount = 0; int childUnCheckedCount = 0; @@ -401,27 +390,7 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { TargetData target = SettingDataManager.getInstance().getTarget(null); String parentFeatureName = target.getParentFeatureName(table.getItem(i).getText(0)); if (featureName.equals(parentFeatureName)) { - if (optionText - .contains(FeatureDialog.ITEM_ALL_CHECKED)) { - if (featureName - .equals(ConfigureLabels.FEATURE_MEMORY_ALLOCATION)) { - return; - } else if (featureName - .equals(ConfigureLabels.FEATURE_THREAD)) { - return; - } else if (featureName - .equals(ConfigureLabels.FEATURE_FILE)) { - return; - } else if (featureName - .equals(ConfigureLabels.FEATURE_NETWORK)) { - return; - } else if (featureName - .equals(ConfigureLabels.FEATURE_USERINTERFACE)) { - return; - } else if (featureName - .equals(ConfigureLabels.FEATURE_OPENGL)) { - return; - } + if (optionText.contains(FeatureDialog.ITEM_ALL_CHECKED)) { setCheckStatus( table.getItem(i), FeatureDialog.ITEM_ALL_CHECKED); @@ -434,48 +403,7 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { } // TODO:refactoring about the legacy code. private void updateParentCheckBoxByChild(GridItem item, Event event) { - String featureName = item.getText(0); - if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)) { - if (table.getItem(table.getSelectionIndex() - 1) - .getText(tableTextOptionColumnIndex) - .contains(FeatureDialog.ITEM_ALL_CHECKED)) { - return; - } - } else if (featureName - .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) { - if (table.getItem(table.getSelectionIndex() - 1) - .getText(tableTextOptionColumnIndex) - .contains(FeatureDialog.ITEM_ALL_CHECKED)) { - return; - } - } else if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) { - if (table.getItem(table.getSelectionIndex() - 1) - .getText(tableTextOptionColumnIndex) - .contains(FeatureDialog.ITEM_ALL_CHECKED)) { - return; - } - } else if (featureName - .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK)) { - if (table.getItem(table.getSelectionIndex() - 1) - .getText(tableTextOptionColumnIndex) - .contains(FeatureDialog.ITEM_ALL_CHECKED)) { - return; - } - } else if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)) { - if (table.getItem(table.getSelectionIndex() - 1) - .getText(tableTextOptionColumnIndex) - .contains(FeatureDialog.ITEM_ALL_CHECKED)) { - return; - } - } else if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_OPENGL)) { - if (table.getItem(table.getSelectionIndex() - 1) - .getText(tableTextOptionColumnIndex) - .contains(FeatureDialog.ITEM_ALL_CHECKED)) { - return; - } - } - TargetData target = SettingDataManager.getInstance().getTarget(null); String parentFeatureName = target.getParentFeatureName(item.getText(0)); @@ -565,4 +493,13 @@ public class FeatureDialogFeaturesTable extends DATreeComposite { item.setText(tableTextOptionColumnIndex, optionText); } + private boolean isCheckStatus(GridItem item) { + String optionText = item.getText(tableTextOptionColumnIndex); + if (optionText.contains(FeatureDialog.ITEM_ALL_CHECKED) + || optionText.contains(FeatureDialog.ITEM_PART_CHECKED)) { + return true; + } + return false; + } + } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java index f706629..a4a89a0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java @@ -126,12 +126,12 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender // draw checkBox image Image checkImg = null; - if (item.getText(1).contains( - FeatureDialog.ITEM_ALL_CHECKED)) { + if (item.getText(1).contains(FeatureDialog.ITEM_ALL_CHECKED) + || item.getText(1).contains(FeatureDialog.ITEM_PART_CHECKED)) { checkImg = ImageResources.CHECKBOX_SELECTED; - } else if (item.getText(1).contains( - FeatureDialog.ITEM_PART_CHECKED)) { - checkImg = ImageResources.CHECKBOX_SELECTED_PART; +// } else if (item.getText(1).contains( +// FeatureDialog.ITEM_PART_CHECKED)) { +// checkImg = ImageResources.CHECKBOX_SELECTED_PART; } else { checkImg = ImageResources.CHECKBOX_UNSELECTED; } @@ -188,11 +188,11 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender } private void updateDetails(GridItem item) { - if (ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC.equals(item.getText())) { + if (ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE.equals(item.getText())) { updateSystemDetails(item); - } else if (ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC.equals(item.getText())) { + } else if (ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE.equals(item.getText())) { updateSamplingDetails(item); - } else if (ConfigureLabels.SNAPSHOT_PERIODIC_AUTO.equals(item.getText())) { + } else if (ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION.equals(item.getText())) { updateScreenShotDetails(item); } @@ -212,7 +212,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender FormData data = new FormData(); data.top = new FormAttachment(0, 5); data.left = new FormAttachment(0, 0); - data.width = 100; + data.width = 90; data.height = 16; systemTitle.setLayoutData(data); systemTitle.setForeground(ColorResources.SETTING_COLOR); @@ -238,7 +238,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender data = new FormData(); data.top = new FormAttachment(0, 5); data.left = new FormAttachment(systemTextBox.getControl(), 5); - data.width = 20; + data.width = 30; data.height = 16; systemTextBoxLabel.setLayoutData(data); systemTextBoxLabel.setForeground(ColorResources.SETTING_COLOR); @@ -269,7 +269,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender FormData data = new FormData(); data.top = new FormAttachment(0, 5); data.left = new FormAttachment(0, 0); - data.width = 100; + data.width = 90; data.height = 16; samplingTitle.setLayoutData(data); samplingTitle.setForeground(ColorResources.SETTING_COLOR); @@ -295,7 +295,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender data = new FormData(); data.top = new FormAttachment(0, 5); data.left = new FormAttachment(samplingTextBox.getControl(), 5); - data.width = 20; + data.width = 30; data.height = 16; samplingTextBoxLabel.setLayoutData(data); samplingTextBoxLabel.setForeground(ColorResources.SETTING_COLOR); @@ -332,7 +332,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender auto.setForeground(ColorResources.SETTING_COLOR); auto.setBackground(ColorResources.DIALOG_BG_UPPER); auto.setFont(FontResources.SETTING_DESCRIPTION_FONT); - auto.setText(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO); + auto.setText(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION); auto.addSelectionListener(autoScreenShotButtonListener); radioGroup.addChild(auto); auto.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD); @@ -347,7 +347,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender period.setForeground(ColorResources.SETTING_COLOR); period.setBackground(ColorResources.DIALOG_BG_UPPER); period.setFont(FontResources.SETTING_DESCRIPTION_FONT); - period.setText(ConfigureLabels.PERIODIC); + period.setText(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY); period.addSelectionListener(periodScreenShotButtonListener); radioGroup.addChild(period); period.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD); @@ -515,31 +515,31 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender // TODO:refactoring about the legacy code. private boolean checkValidInputText(String featuresName, DAText textBox, Label info) { if (textBox.getText().isEmpty()) { - info.setText(ConfigureLabels.VALUE_IS_EMPTY); + info.setText(ConfigureLabels.FEATURE_DETAIL_VALUE_WARNING_FOR_EMPTY); return false; } else if (!AnalyzerUtil.isInteger(textBox.getText())) { - info.setText(ConfigureLabels.YOU_HAVE_TO_SET_CHARACTER); + info.setText(ConfigureLabels.FEATURE_DETAIL_VALUE_WARNING_FOR_CHARACTER); return false; } int value = Integer.parseInt(textBox.getText()); - if (featuresName.equals(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC) - || featuresName.equals(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC)) { + if (featuresName.equals(ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE) + || featuresName.equals(ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE)) { if (value < 0 || 1000 < value) { - info.setText(ConfigureLabels.VALUE_SHOULD_BE_IN_RANGE_FROM_1_TO_1000); + info.setText(ConfigureLabels.FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE_IN_SYSTEM_SAMPLING_RATE); return false; } } - if (featuresName.equals(ConfigureLabels.PERIODIC)) { + if (featuresName.equals(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY)) { if (value < 0 || 100 < value) { - info.setText(ConfigureLabels.VALUE_SHOULD_BE_IN_RANGE_FROM_1_TO_100); + info.setText(ConfigureLabels.FEATURE_DETAIL_VALUE_WARNING_FOR_OUT_OF_RANGE_IN_SCREENSHOT_PERIODIC); return false; } } - if (featuresName.equals(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC)) { + if (featuresName.equals(ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE)) { if (value % 10 != 0) { - info.setText(ConfigureLabels.YOU_HAVE_TO_SET_MULTIPLE_OF_10MS); + info.setText(ConfigureLabels.FEATURE_DETAIL_VALUE_WARNING_FOR_HAVE_TO_SET_MULTIPLE_OF_10MS_IN_SYSTEM_SAMPLING_RATE); return false; } } @@ -603,7 +603,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender public void handleSelectionEvent(DARadioButton radio) { if (auto.isSelected()) { screenShotTextBox.getControl().setEnabled(false); - setOptionText(getGridItem(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO), + setOptionText(getGridItem(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION), ConfigureLabels.AUTO, "1"); } SettingDialogManager.getInstance().updateFeatureButtonStatus(table); @@ -616,7 +616,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender public void handleSelectionEvent(DARadioButton radio) { if (period.isSelected()) { screenShotTextBox.getControl().setEnabled(true); - setOptionText(getGridItem(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO), + setOptionText(getGridItem(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION), ConfigureLabels.AUTO, "0"); } SettingDialogManager.getInstance().updateFeatureButtonStatus(table); @@ -628,16 +628,16 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender @Override public void keyReleased(KeyEvent e) { // check validation input text - boolean valid = checkValidInputText(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC, + boolean valid = checkValidInputText(ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE, systemTextBox, systemInfo); if (valid) { systemInfo.setText(CommonConstants.EMPTY); } // update button state - setOptionText(getGridItem(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC), + setOptionText(getGridItem(ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE), ConfigureLabels.SAMPLING, systemTextBox.getText()); - updateInputText(getGridItem(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC), valid); + updateInputText(getGridItem(ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE), valid); SettingDialogManager.getInstance().updateFeatureButtonStatus(table); } @@ -652,16 +652,16 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender @Override public void keyReleased(KeyEvent e) { // check validation input text - boolean valid = checkValidInputText(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC, + boolean valid = checkValidInputText(ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE, samplingTextBox, samplingInfo); if (valid) { samplingInfo.setText(CommonConstants.EMPTY); } // update button state - setOptionText(getGridItem(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC), + setOptionText(getGridItem(ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE), ConfigureLabels.SAMPLING, samplingTextBox.getText()); - updateInputText(getGridItem(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC), valid); + updateInputText(getGridItem(ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE), valid); SettingDialogManager.getInstance().updateFeatureButtonStatus(table); } @@ -676,16 +676,16 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender @Override public void keyReleased(KeyEvent e) { // check validation input text - boolean valid = checkValidInputText(ConfigureLabels.PERIODIC, + boolean valid = checkValidInputText(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY, screenShotTextBox, screenShotInfo); if (valid) { screenShotInfo.setText(CommonConstants.EMPTY); } // update button state - setOptionText(getGridItem(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO), + setOptionText(getGridItem(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION), ConfigureLabels.SAMPLING, screenShotTextBox.getText()); - updateInputText(getGridItem(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO), valid); + updateInputText(getGridItem(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION), valid); SettingDialogManager.getInstance().updateFeatureButtonStatus(table); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java index dfc05c9..729cd62 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java @@ -93,9 +93,9 @@ public class SettingDataManager { private long internalLogLevel = 4; private SettingDataManager() { + parseSettingData(SETTING_FILE_NAME); parseSettingData(FEATUER_FILE_NAME); parseSettingData(TEMPLATE_FILE_NAME); - parseSettingData(SETTING_FILE_NAME); } public synchronized static SettingDataManager getInstance() { @@ -176,23 +176,26 @@ public class SettingDataManager { } private void setSelectedTemplate(String list[]) { - if (list != null) { - TargetData target = getAndCreateTarget(list[1]); - target.setSelectedTemplate(list[2]); + if (list != null) { + if (isTarget(list[1]) == true) { + getTarget(list[1]).setSelectedTemplate(list[2]); + } } // else do nothing } private void makeSelectedFeatureList(String list[]) { if (list != null) { - TargetData target = getAndCreateTarget(list[1]); - target.makeSelectedFeatureList(list); + if (isTarget(list[1]) == true) { + getTarget(list[1]).makeSelectedFeatureList(list); + } } // else do nothing } private void makeAvailableChartList(String list[]) { if (list != null) { - TargetData target = getAndCreateTarget(list[1]); - target.makeAvailableChartList(list); + if (isTarget(list[1]) == true) { + getTarget(list[1]).makeAvailableChartList(list); + } } // else do nothing } @@ -207,16 +210,18 @@ public class SettingDataManager { private void initFeatureData(String readData) { String list[] = readData.split(READ_CSV_SEPARATOR, -1); if (list != null) { - TargetData target = getAndCreateTarget(list[0]); - target.makeAvailableFeatureListMap(list); + if (isTarget(list[0]) == true) { + getTarget(list[0]).makeAvailableFeatureListMap(list); + } } } private void initTemplateData(String readData) { String list[] = readData.split(READ_CSV_SEPARATOR, -1); if (list != null) { - TargetData target = getAndCreateTarget(list[0]); - target.makeAvailableTemplateListMap(list); + if (isTarget(list[0]) == true) { + getTarget(list[0]).makeAvailableTemplateListMap(list); + } } // else do nothing } @@ -530,36 +535,34 @@ public class SettingDataManager { TargetData target = SettingDataManager.getInstance().getConnectedTarget(); long state = 0; - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_FUNCTION_PROFILING); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_FUNCTION_SAMPLING); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_MEMORY_ALLOCATION); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_FILE); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_THREAD); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_USERINTERFACE); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_FUNCTION_PROFILING); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_FUNCTION_SAMPLING); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_MEMORY_ALLOCATION); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_FILE); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_THREAD); - if (target.isSelectedFeature(ConfigureLabels.PERIODIC) == false) { - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SCREENSHOT); + if (target.isSelectedFeature(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY) == false) { + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SCREENSHOT); } - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_USER_EVENT); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_RECORDING); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_USER_EVENT); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_RECORDING); if (DACommunicator.isSWAPVersion(devInfo)) { - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSCALL_IPC); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSCALL_PROCESS); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSCALL_SIGNAL); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSCALL_NETWORK); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSCALL_DESC); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_CONTEXT_SWITCH); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NETWORK); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_OPENGL); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.INCLUDE_INSIDE_CALL_UI); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_IPC); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_PROCESS); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_SIGNAL); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_NETWORK); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_DESC); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_CONTEXT_SWITCH); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_NETWORK); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_OPENGL); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_THREAD); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_FILE); - if ((target.isSelectedFeature(ConfigureLabels.FEATURE_FILE) - || (target.isSelectedFeature(ConfigureLabels.FEATURE_SYSCALL_FILE)))) { + if ((target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_FILE) + || (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_FILE)))) { state |= AnalyzerConstants.FEATURE_SYSCALL_FILE; } } @@ -570,19 +573,17 @@ public class SettingDataManager { TargetData target = SettingDataManager.getInstance().getConnectedTarget(); long state = 0; if (DACommunicator.isSWAPVersion(devInfo)) { - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.INCLUDE_INSIDE_OPENGL); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_CPU); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_PROCESSES); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_MEMORY); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_DISK); -// state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_FD); -// state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_THREAD); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_NETWORK); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_DEVICE); - state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_ENERGY); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_NETWORK); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_OPENGL); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_CPU); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_PROCESSES); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_MEMORY); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_DISK); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_NETWORK); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_DEVICE); + state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_NAME_SYSTEM_ENERGY); - if (target.isSelectedFeature(ConfigureLabels.FEATURE_THREAD)) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_THREAD)) { state |= AnalyzerConstants.SYSTEM_THREAD_LOAD; } } diff --git 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 index b844b80..af071e4 100644 --- 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 @@ -166,7 +166,7 @@ public class SettingDialog extends DAMessageBox { label.setForeground(ColorResources.DEFAULT_FONT_COLOR); label.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); label.setFont(FontResources.SETTING_TITLE_FONT); - label.setText(ConfigureLabels.SETTING_DIALOG_NOT_FOUND); + label.setText(ConfigureLabels.SETTING_WARNING_MESSAGE_FILE_NOT_FOUND); shell.addDisposeListener(new DisposeListener() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java index 4ea863f..cb2fdbd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java @@ -195,13 +195,14 @@ public class SettingDialogManager { FeatureValueData featureValue = null; String featureName = item.getText(0); - if ((ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC.equals(featureName)) - || (ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC.equals(featureName))) { + if ((ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE.equals(featureName)) + || (ConfigureLabels. + FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE.equals(featureName))) { int tableValue = Integer.parseInt(getOptionText(item, ConfigureLabels.SAMPLING)); featureValue = new FeatureValueData(); featureValue.setFeatureName(featureName); featureValue.setValue(tableValue); - } else if (ConfigureLabels.SNAPSHOT_PERIODIC_AUTO.equals(featureName)) { + } else if (ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION.equals(featureName)) { int tableAutoValue = Integer.parseInt(getOptionText(item, ConfigureLabels.AUTO)); if (tableAutoValue == 1) { featureValue = new FeatureValueData(); @@ -210,7 +211,7 @@ public class SettingDialogManager { } else { int tableValue = Integer.parseInt(getOptionText(item, ConfigureLabels.SAMPLING)); featureValue = new FeatureValueData(); - featureValue.setFeatureName(ConfigureLabels.PERIODIC); + featureValue.setFeatureName(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY); featureValue.setValue(tableValue); } } @@ -220,24 +221,26 @@ public class SettingDialogManager { private boolean changedDetailFeature(GridItem item, TargetData target) { String featureName = item.getText(0); - if ((ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC.equals(featureName)) - || (ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC.equals(featureName))) { + if ((ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE.equals(featureName)) + || (ConfigureLabels. + FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE.equals(featureName))) { int value = target.getSelectedFeatureValue(featureName); int tableValue = Integer.parseInt(getOptionText(item, ConfigureLabels.SAMPLING)); if (value != tableValue) { return true; } - } else if (ConfigureLabels.SNAPSHOT_PERIODIC_AUTO.equals(featureName)) { + } else if (ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION.equals(featureName)) { int tableAutoValue = Integer.parseInt(getOptionText(item, ConfigureLabels.AUTO)); if (tableAutoValue == 1) { - if (target.isSelectedFeature(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO) == false) { + if (target.isSelectedFeature( + ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION) == false) { return true; } } else { - if (target.isSelectedFeature(ConfigureLabels.PERIODIC) == false) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY) == false) { return true; } else { - int value = target.getSelectedFeatureValue(ConfigureLabels.PERIODIC); + int value = target.getSelectedFeatureValue(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY); int tableSamplingValue = Integer.parseInt(getOptionText(item, ConfigureLabels.SAMPLING)); if (value != tableSamplingValue) { return true; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogOptionPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogOptionPage.java index 1677881..1f080a0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogOptionPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogOptionPage.java @@ -57,7 +57,7 @@ public class SettingDialogOptionPage extends DAPageComposite { // Configuration Setting Label settingLabel = new Label(this, SWT.TRANSPARENT); - settingLabel.setText(ConfigureLabels.SETTING_CONFIGURATION_TITLE); + settingLabel.setText(ConfigureLabels.SETTING_OPTION_TAB_DESCRIPTION); settingLabel .setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); settingLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR); @@ -77,12 +77,12 @@ public class SettingDialogOptionPage extends DAPageComposite { showInitialCheckBox.setLayoutData(data); showInitialCheckBox.setForeground(ColorResources.BLACK); showInitialCheckBox.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); - showInitialCheckBox.setText(ConfigureLabels.WELCONE_ASK_USE_AGAIN); + showInitialCheckBox.setText(ConfigureLabels.SETTING_OPTION_SHOW_INITIAL); showInitialCheckBox.addSelectionListener(showInitiaRadioButtonListener); showInitialCheckBox.setChecked(SettingDataManager.getInstance().isShowInitial()); Label showInitalLabel = new Label(this, SWT.TRANSPARENT); - showInitalLabel.setText(ConfigureLabels.WELCONE_ASK_USE_AGAIN); + showInitalLabel.setText(ConfigureLabels.SETTING_OPTION_SHOW_INITIAL); showInitalLabel.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); showInitalLabel.setForeground(ColorResources.BLACK); showInitalLabel.setFont(FontResources.CONFIGURATION_TABLE_TITLE_FONT); @@ -101,12 +101,12 @@ public class SettingDialogOptionPage extends DAPageComposite { autoStopCheckBox.setLayoutData(data); autoStopCheckBox.setForeground(ColorResources.BLACK); autoStopCheckBox.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); - autoStopCheckBox.setText(ConfigureLabels.AUTO_STOP); + autoStopCheckBox.setText(ConfigureLabels.SETTING_OPTION_AUTO_STOP); autoStopCheckBox.addSelectionListener(autoStopRadioButtonListener); autoStopCheckBox.setChecked(SettingDataManager.getInstance().isAutoStop()); Label autoStopLabel = new Label(this, SWT.TRANSPARENT); - autoStopLabel.setText(ConfigureLabels.AUTO_STOP); + autoStopLabel.setText(ConfigureLabels.SETTING_OPTION_AUTO_STOP); autoStopLabel.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); autoStopLabel.setForeground(ColorResources.BLACK); autoStopLabel.setFont(FontResources.CONFIGURATION_TABLE_TITLE_FONT); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java index 17f22f0..c37dab9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java @@ -103,7 +103,7 @@ public class SettingDialogTemplatePage extends DAPageComposite { // Title Label title = new Label(this, SWT.TRANSPARENT); - title.setText(ConfigureLabels.TARGET_TITLE); + 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); @@ -122,8 +122,8 @@ public class SettingDialogTemplatePage extends DAPageComposite { private void initDataList() { targetHashMap = new HashMap(); targetHashMap.put(ConfigureLabels.TARGET_NAME_MOBILE_2_3, ImageResources.TARGET_MOBILE_2_3); - targetHashMap.put(ConfigureLabels.TARGET_NAME_TV_0_1, ImageResources.TARGET_NAME_TV_0_1); - targetHashMap.put(ConfigureLabels.TARGET_WEARABLE_2_3, ImageResources.TARGET_WEARABLE_2_3); + targetHashMap.put(ConfigureLabels.TARGET_NAME_TV_0_1, ImageResources.TARGET_TV_0_1); + targetHashMap.put(ConfigureLabels.TARGET_NAME_WEARABLE_2_3, ImageResources.TARGET_WEARABLE_2_3); templateHashMap = new HashMap(); @@ -272,7 +272,7 @@ public class SettingDialogTemplatePage extends DAPageComposite { data.height = 21; data.width = 84; targetLabel.setLayoutData(data); - targetLabel.setText(ConfigureLabels.TARGETS); + targetLabel.setText(ConfigureLabels.SETTING_DIALOG_TARGET_TITLE); targetLabel.setBackground(ColorResources.SETTING_TITLE_BACKGROUND); targetLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR); targetLabel.setFont(FontResources.SETTING_TITLE_FONT); @@ -435,7 +435,8 @@ public class SettingDialogTemplatePage extends DAPageComposite { data.height = 20; overheadLabel.setLayoutData(data); // TODO : get overhead value -// overheadLabel.setText(ConfigureLabels.OVERHEAD_FIRST + "1.75 " + ConfigureLabels.OVERHEAD_LAST); +// overheadLabel.setText(ConfigureLabels.SETTING_DIALOG_OVERHEAD_FIRST + "1.75 " +// + ConfigureLabels.SETTING_DIALOG_OVERHEAD_LAST); overheadLabel.setBackground(ColorResources.WHITE); overheadLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR); overheadLabel.setFont(FontResources.SETTING_TITLE_FONT); @@ -491,7 +492,7 @@ public class SettingDialogTemplatePage extends DAPageComposite { data.height = 21; data.width = 502; templateLabel.setLayoutData(data); - templateLabel.setText(ConfigureLabels.TEMPLATE); + 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); diff --git 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 index 5c61853..f8dda11 100644 --- 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 @@ -174,7 +174,7 @@ public class WelcomeDialog extends DAMessageBox { label.setForeground(ColorResources.DEFAULT_FONT_COLOR); label.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); label.setFont(FontResources.SETTING_TITLE_FONT); - label.setText(ConfigureLabels.SETTING_DIALOG_NOT_FOUND); + label.setText(ConfigureLabels.SETTING_WARNING_MESSAGE_FILE_NOT_FOUND); shell.addShellListener(shellListener); shell.open(); @@ -226,7 +226,7 @@ public class WelcomeDialog extends DAMessageBox { useAgainCheckButton.setForeground(ColorResources.BLACK); useAgainCheckButton .setBackground(ColorResources.CONFIGURATION_BUTTON_COVER_BACKGROUND_COLOR); - useAgainCheckButton.setText(ConfigureLabels.WELCONE_ASK_USE_AGAIN); + useAgainCheckButton.setText(ConfigureLabels.SETTING_OPTION_SHOW_INITIAL); useAgainCheckButton.addSelectionListener(useAgainCheckbuttonListener); useAgainCheckButton.setChecked(SettingDataManager.getInstance().isShowInitial());