From: heeyoung Date: Fri, 12 Sep 2014 11:43:10 +0000 (+0900) Subject: Setting : Modify the CSV separator X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F32%2F27432%2F1;p=sdk%2Ftools%2Fdynamic-analyzer.git Setting : Modify the CSV separator Change-Id: I4e1b226cd224fbdf3a19263179298c45ce1910a6 Signed-off-by: heeyoung --- 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 cda07c8..7cb22f3 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 @@ -52,7 +52,8 @@ public class SettingDataManager { private static SettingDataManager instance = null; - public static final String CSV_SEPARATOR = "\\" + CommonConstants.CMD_SPLIT; + public static final String READ_CSV_SEPARATOR = "\\" + CommonConstants.CMD_SPLIT; + public static final String WRITE_CSV_SEPARATOR = CommonConstants.CMD_SPLIT; public static final String SETTING_FILE_NAME = "setting.csv"; public static final String FEATUER_FILE_NAME = "feature.csv"; public static final String TEMPLATE_FILE_NAME = "template.csv"; @@ -132,7 +133,7 @@ public class SettingDataManager { } private void initSettingData(String readData) { - String list[] = readData.split(CSV_SEPARATOR); + String list[] = readData.split(READ_CSV_SEPARATOR); if (list[0].equals(KEY_TARGET_LIST)) { makeTargetData(list); } else if (list[0].equals(KEY_SELECTED_TARGET)) { @@ -200,7 +201,7 @@ public class SettingDataManager { } private void initFeatureData(String readData) { - String list[] = readData.split(CSV_SEPARATOR, -1); + String list[] = readData.split(READ_CSV_SEPARATOR, -1); if (list != null) { TargetData target = getAndCreateTarget(list[0]); target.makeAvailableFeatureListMap(list); @@ -208,7 +209,7 @@ public class SettingDataManager { } private void initTemplateData(String readData) { - String list[] = readData.split(CSV_SEPARATOR, -1); + String list[] = readData.split(READ_CSV_SEPARATOR, -1); if (list != null) { TargetData target = getAndCreateTarget(list[0]); target.makeAvailableTemplateListMap(list); @@ -230,10 +231,10 @@ public class SettingDataManager { printWriter = new PrintWriter(buffWriter); printWriter.println(writeTargetData()); - printWriter.println(KEY_SELECTED_TARGET + CSV_SEPARATOR + selectedTarget); + printWriter.println(KEY_SELECTED_TARGET + WRITE_CSV_SEPARATOR + selectedTarget); printWriter.println(writeChartList(getSelectedChartList(), KEY_SELECTED_CHART_LIST)); - printWriter.println(KEY_SHOW_INITIAL + CSV_SEPARATOR + String.valueOf(showInitial)); - printWriter.println(AUTO_STOP + CSV_SEPARATOR + String.valueOf(autoStop)); + printWriter.println(KEY_SHOW_INITIAL + WRITE_CSV_SEPARATOR + String.valueOf(showInitial)); + printWriter.println(AUTO_STOP + WRITE_CSV_SEPARATOR + String.valueOf(autoStop)); // target : selected Template, selected feature, available chart list Map map = getTargetListMap(); @@ -258,18 +259,18 @@ public class SettingDataManager { Iterator iter = targetNameList.iterator(); while(iter.hasNext()) { - buffer.append(CSV_SEPARATOR + iter.next()); + buffer.append(WRITE_CSV_SEPARATOR + iter.next()); } return buffer.toString(); } private String writeChartList(List list, String key) { StringBuffer buffer = new StringBuffer(); - buffer.append(key + CSV_SEPARATOR); + buffer.append(key + WRITE_CSV_SEPARATOR); for (int i = 0; i < list.size(); i++) { if (i < list.size() -1) { - buffer.append(list.get(i) + CSV_SEPARATOR); + buffer.append(list.get(i) + WRITE_CSV_SEPARATOR); } else { buffer.append(list.get(i)); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/TargetData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/TargetData.java index 81ccaba..22c5ad3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/TargetData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/TargetData.java @@ -419,12 +419,12 @@ public class TargetData { * @throws IOException */ public void writeSelectedData(PrintWriter writer) throws IOException { - writer.println(SettingDataManager.KEY_SELECTED_TEMPLATE + SettingDataManager.CSV_SEPARATOR + - targetName + SettingDataManager.CSV_SEPARATOR + selectedTemplate); - writer.println(SettingDataManager.KEY_SELECTED_FEATURE_LIST + SettingDataManager.CSV_SEPARATOR + - targetName + SettingDataManager.CSV_SEPARATOR + writeSelectedFeatureListData()); - writer.println(SettingDataManager.KEY_AVAILABLE_CHART_LIST + SettingDataManager.CSV_SEPARATOR + - targetName + SettingDataManager.CSV_SEPARATOR + writeAvailableChartListData()); + writer.println(SettingDataManager.KEY_SELECTED_TEMPLATE + SettingDataManager.WRITE_CSV_SEPARATOR + + targetName + SettingDataManager.WRITE_CSV_SEPARATOR + selectedTemplate); + writer.println(SettingDataManager.KEY_SELECTED_FEATURE_LIST + SettingDataManager.WRITE_CSV_SEPARATOR + + targetName + SettingDataManager.WRITE_CSV_SEPARATOR + writeSelectedFeatureListData()); + writer.println(SettingDataManager.KEY_AVAILABLE_CHART_LIST + SettingDataManager.WRITE_CSV_SEPARATOR + + targetName + SettingDataManager.WRITE_CSV_SEPARATOR + writeAvailableChartListData()); writer.checkError(); } @@ -440,7 +440,7 @@ public class TargetData { } // else : (main feature or sub feature) feature does not have a value. if (i < list.size() -1) { - buffer.append(SettingDataManager.CSV_SEPARATOR); + buffer.append(SettingDataManager.WRITE_CSV_SEPARATOR); } // else : the last value will be written to a csv file does not contain a comma. } return buffer.toString(); @@ -452,7 +452,7 @@ public class TargetData { for (int i = 0; i < chartList.size(); i++) { if (i < chartList.size() -1) { - buffer.append(chartList.get(i) + SettingDataManager.CSV_SEPARATOR); + buffer.append(chartList.get(i) + SettingDataManager.WRITE_CSV_SEPARATOR); } else { buffer.append(chartList.get(i)); }