From: heeyoung <heeyoung1008.hwang@samsung.com>
Date: Wed, 24 Sep 2014 02:43:55 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/tizen' into da-setting
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f5d846a3fd9a5ef5d0fad8b3e4e3750e12e7c37;p=sdk%2Ftools%2Fdynamic-analyzer.git

Merge remote-tracking branch 'origin/tizen' into da-setting

Conflicts:
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java

Change-Id: I9b94bc15c1b6d8abb824794722267946718b646c
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>
---

4f5d846a3fd9a5ef5d0fad8b3e4e3750e12e7c37
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
index bb9b286,d7e300a..3c3145b
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
@@@ -382,14 -275,15 +275,15 @@@ public class AnalyzerManager 
  	}
  
  	public static synchronized void startScreenshotTimer() {
- 		stopScreenshotTimer();		
+ 		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);
+ 					screenshotTimer.scheduleAtFixedRate(new ScreenshotTimerTask(), 1000,
+ 							value * 1000);
  				}
  			}
  		}
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java
index 729cd62,47adbdc..665e53d
--- 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
@@@ -174,31 -174,28 +174,31 @@@ public class SettingDataManager 
  			}
  		} // else do nothing
  	}
- 	
+ 
  	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
  	}
- 	
+ 
  	private void makeChartList(List<String> chartList, String list[]) {
  		if (list != null) {
  			for (int i = 1; i < list.length; i++) {
@@@ -206,16 -203,15 +206,16 @@@
  			}
  		} // else do nothing
  	}
- 		
- 	private void initFeatureData(String readData) {		
+ 
+ 	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) {
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java
index cb2fdbd,fbde15a..0766b88
--- 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
@@@ -190,14 -192,13 +192,14 @@@ public class SettingDialogManager 
  		}
  		return true;
  	}
- 	
+ 
  	private FeatureValueData addDetailFeature(GridItem item, TargetData target) {
  		FeatureValueData featureValue = null;
 -		String featureName = item.getText(0);
 -
 -		if ((ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC.equals(featureName))
 -				|| (ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC.equals(featureName))) {
 +		String featureName = item.getText(0);	
 +			
 +		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);
@@@ -217,13 -218,12 +219,12 @@@
  		}
  		return featureValue;
  	}
- 	
- 	private boolean changedDetailFeature(GridItem item, TargetData target) {
- 		String featureName = item.getText(0);	
  
+ 	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) {