From 3e1a93ca7846ece598c3e17fb013eb2f30ad9209 Mon Sep 17 00:00:00 2001 From: "Hyunjong,park" Date: Fri, 6 Dec 2013 10:58:12 +0900 Subject: [PATCH] [Title] check device connected [Desc.] apply configuration value [Issue] - --- .../toolbar/configuration/ConfigurationDialog.java | 18 +---------- .../ConfigurationDialogDataManager.java | 36 ++++++++++++++++++++++ .../ui/toolbar/configuration/WelcomeDialog.java | 12 ++------ 3 files changed, 39 insertions(+), 27 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java index 34971e2..095352d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java @@ -38,7 +38,6 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -85,22 +84,7 @@ public class ConfigurationDialog extends DAMessageBox { private void doApply() { Composite selectedComposite = tabView.getTopComposite(); if (!(selectedComposite instanceof BinarySettingsPage)) { - // TODO list - // 1. send swap message and get return value - // 2. check return value is success - // 3. if return value is fail then do not save configurations to - // Configuration manager and file - // 4. if return value is success then save configurations. - // 5. need temporary save data for send swap message - ConfigurationDialogDataManager.getInstance() - .setFeaturesStatusFromTableItemsList(featuresTable); - ConfigurationDialogDataManager.getInstance() - .applySettingValueToConfigureManager(); - ConfigurationDialogDataManager.getInstance() - .setSettingValueFromConfigureManager(); - featuresTable.updateTable(); - DACommunicator.sendRuntimeMessage(DACommunicator.MSG_TYPE_CONFIG, - null); + ConfigurationDialogDataManager.getInstance().applySwapValue(featuresTable); } else { BinarySettingsPage page = (BinarySettingsPage) selectedComposite; page.doApply(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java index afc78df..bf33f5a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java @@ -31,6 +31,7 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.CommonConstants; +import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.ui.timeline.chart.ScreenshotChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; @@ -429,6 +430,41 @@ public class ConfigurationDialogDataManager { } else { return false; } + } + + public void applySwapValue(DATableComposite featuresTable) { + // TODO list + // 1. send swap message and get return value + // 2. check return value is success + // 3. if return value is fail then do not save configurations to + // Configuration manager and file + // 4. if return value is success then save configurations. + // 5. need temporary save data for send swap message + if (null != DACommunicator.getSelectedDevice()) { + DACommunicator.sendRuntimeMessage(DACommunicator.MSG_TYPE_CONFIG, + null); + // 2. check return value is success + boolean isApply = true; + if (isApply) { + applySuccessSwapValue(featuresTable); + } else { + applyFailedSwapValue(featuresTable); + } + } else { + applyFailedSwapValue(featuresTable); + System.out.println("device is not Connected"); + } + } + + public void applySuccessSwapValue(DATableComposite featuresTable) { + setFeaturesStatusFromTableItemsList(featuresTable); + applySettingValueToConfigureManager(); + setSettingValueFromConfigureManager(); + featuresTable.updateTable(); + } + public void applyFailedSwapValue(DATableComposite featuresTable) { + setSettingValueFromConfigureManager(); + featuresTable.updateTable(); } } 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 58933e4..52b746a 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 @@ -37,7 +37,6 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.communicator.IDECommunicator; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; @@ -82,15 +81,8 @@ public class WelcomeDialog extends DAMessageBox { }; private void doApply() { - - ConfigurationDialogDataManager.getInstance() - .setFeaturesStatusFromTableItemsList(featuresTable); - ConfigurationDialogDataManager.getInstance() - .applySettingValueToConfigureManager(); - - DACommunicator.sendRuntimeMessage(DACommunicator.MSG_TYPE_CONFIG, null); - ConfigurationDialogDataManager.getInstance() - .setSettingValueFromConfigureManager(); + ConfigurationDialogDataManager.getInstance().applySwapValue( + featuresTable); notifyAutoRun(); } -- 2.7.4