From c7a36d44d47d08fcbdf0654b4429ca7adedcf956 Mon Sep 17 00:00:00 2001 From: Maria Guseva Date: Wed, 13 Jul 2016 15:38:30 +0300 Subject: [PATCH] SRADA-863: Fixed saving of page list in CLI mode. In CLI mode FlatFeatures are not supported yet. Thus page list must be defined based on selected Features, not FlatFeatures as in GUI. Also restored selecting template removed in previous commit. Change-Id: I9ddcc663c00f68c8e7f997696a21ab0723a52a02 --- .../src/org/tizen/dynamicanalyzer/cli/CliInternals.java | 5 +++++ .../src/org/tizen/dynamicanalyzer/setting/SettingDataManager.java | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java index 1244e7c..773dcce 100644 --- a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java +++ b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java @@ -28,6 +28,7 @@ import org.tizen.dynamicanalyzer.handlers.UIActionHolder; import org.tizen.dynamicanalyzer.project.PackageInfo; import org.tizen.dynamicanalyzer.setting.FeatureValueData; import org.tizen.dynamicanalyzer.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.setting.TargetData; import org.tizen.dynamicanalyzer.setting.Template; import org.tizen.dynamicanalyzer.setting.UILayoutDataManager; import org.tizen.dynamicanalyzer.util.InternalLogger; @@ -280,6 +281,10 @@ public final class CliInternals { // features instead of templates if (template == Template.TEMPLATE_CUSTOM) return false; + TargetData target = SettingDataManager.INSTANCE.getTarget(null); + target.setSelectedTemplate(template); + target.changeSelectedFeatureList(template); + Set selectedChartSet = new HashSet(); for (FeatureValueData feature : template.getData().getFeatureList()) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/SettingDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/SettingDataManager.java index 9f2606f..bd4d1f3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/SettingDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/SettingDataManager.java @@ -775,6 +775,13 @@ public enum SettingDataManager { if (featureList.get(i).getPage() != null) selectedPageList.add(featureList.get(i).getPage()); } + // FIXME support for previous 'Feature' format, + // to be removed when CLI supports FlatFeatures + if (Global.isCLIMode()) { + for (FeatureValueData featureVal : target.getSelectedFeatureList()) { + selectedPageList.addAll(featureVal.getKey().getData().getPageList()); + } + } } else { Logger.debug("Does not exist targetName : " + targetName); } -- 2.7.4