From 3957ac86ae43aaf8f16a3d8dce65f22f3a1b3cb1 Mon Sep 17 00:00:00 2001 From: heeyoung Date: Wed, 10 Sep 2014 18:44:53 +0900 Subject: [PATCH] Setting : modify the setting function calling place Change-Id: I249f74c7b1d8c9ac5eb96c8cbc79811ee8655e2b Signed-off-by: heeyoung --- .../dynamicanalyzer/common/AnalyzerManager.java | 52 ++++++----- .../communicator/Communicator22.java | 6 +- .../handlers/ReplayTraceHandler.java | 4 +- .../listeners/AnalyzerPerspectiveListener.java | 10 ++- .../swap/communicator/Communicator30.java | 28 ++++-- .../swap/platform/BinarySettingManager.java | 4 +- .../dynamicanalyzer/swap/platform/ui/InputRow.java | 4 +- .../ui/file/manager/FileDataMaker.java | 18 +++- .../tizen/dynamicanalyzer/ui/page/BaseView.java | 33 +++---- .../ui/summary/leaks/LeakDetector.java | 50 ++++++----- .../ui/summary/leaks/NewLeakDetector.java | 50 ++++++----- .../summary/profiling/FunctionUsageProfiler.java | 30 +++++-- .../ui/timeline/common/TimelineChartManager.java | 100 +++++++++++++-------- .../timeline/common/TimelineEditItemsDialog.java | 43 +++++---- .../ui/toolbar/setting/SettingDataManager.java | 21 +++-- .../ui/toolbar/setting/SettingDialog.java | 5 +- .../setting/SettingDialogBinarySettingsPage.java | 3 +- .../ui/toolbar/setting/SettingDialogManager.java | 23 +++-- .../ui/toolbar/setting/TargetData.java | 4 + .../ui/toolbar/setting/WelcomeDialog.java | 2 +- .../profiling/UIFunctionProfilingDataChecker.java | 4 +- .../dynamicanalyzer/utils/InternalLogManager.java | 8 +- 22 files changed, 307 insertions(+), 195 deletions(-) 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 cfb0a3b..8ab6f6e 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java @@ -55,9 +55,9 @@ import org.tizen.dynamicanalyzer.ui.summary.leaks.NewLeakDetector; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; @@ -377,28 +377,38 @@ public class AnalyzerManager { } public static synchronized void startScreenshotTimer() { - stopScreenshotTimer(); - ConfigureManager configureManager = ConfigurationDialogDataManager.getInstance() - .getConfigureManager(); - 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(); + stopScreenshotTimer(); + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); + if (target.isSelectedFeature(ConfigureLabels.FEATURE_SCREENSHOT)) { + if (target.isSelectedFeature(ConfigureLabels.PERIODIC)) { + int value = target.getSelectedFeatureValue(ConfigureLabels.PERIODIC); + if (value > 0) { + screenshotTimer = new Timer(); + screenshotTimer.scheduleAtFixedRate(new ScreenshotTimerTask(), 1000, value*1000); } - screenshotTimer = new Timer(); - screenshotTimer.scheduleAtFixedRate(new ScreenshotTimerTask(), 1000, period); } } +// 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/communicator/Communicator22.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java index a8e9742..6635f3b 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java @@ -50,8 +50,8 @@ import org.tizen.dynamicanalyzer.swap.channel.control.EventObject; import org.tizen.dynamicanalyzer.swap.channel.control.ReplayEvent; import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.Logger; @@ -117,7 +117,7 @@ public class Communicator22 extends BaseCommunicator { @Override public HostResult sendConfigurationMessage(DeviceInfo devInfo, int type, String msg) { - long state = ConfigureManager.getInstance().getConfiguration(devInfo); + long state = SettingDataManager.getInstance().getConfiguration(devInfo); String statestr = Long.toString(state); String message = AnalyzerConstants.MSG_OPTION + CommonConstants.CMD_SPLIT + statestr.length() @@ -177,7 +177,7 @@ public class Communicator22 extends BaseCommunicator { } String rearMessage = CommonConstants.EMPTY + res + isEmul + isArm + CommonConstants.CMD_SPLIT - + ConfigureManager.getInstance().getConfiguration(device) + + SettingDataManager.getInstance().getConfiguration(device) + CommonConstants.CMD_SPLIT + pkg.getMainApp().getInfo(AppInfo.PROPERTY.EXEC.index); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java index ac3484b..db579c6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java @@ -35,8 +35,8 @@ import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.swap.model.data.ReplayData; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.replay.data.ReplayDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; import org.tizen.dynamicanalyzer.util.ByteUtil; import org.tizen.dynamicanalyzer.widgets.timer.IAlarm; import org.tizen.dynamicanalyzer.widgets.timer.TimerClock; @@ -105,7 +105,7 @@ public class ReplayTraceHandler extends AbstractHandler { } public static void setStopAlarm() { - if (ConfigurationDialogDataManager.getInstance().isAutoStop()) { + if (SettingDataManager.getInstance().isAutoStop()) { TimerClock timer = ToolbarArea.getInstance().getTimer(); timer.setAlarm(stopTime, new IAlarm() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java index 04e8dd7..33c8756 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java @@ -37,7 +37,7 @@ import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.communicator.IDECommunicator; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.workbench.SingletonFocusManager; @@ -61,9 +61,11 @@ public class AnalyzerPerspectiveListener extends PerspectiveAdapter { IDECommunicator.startIDECommunicatorThread(); Logger.performance("TEST", "DA Start", "Start IDE Communicator"); - ConfigurationDialogDataManager.getInstance() - .updateFeaturesValueFromConfigureManager(); - +// TODO : check and remove +// ConfigurationDialogDataManager.getInstance() +// .updateFeaturesValueFromConfigureManager(); + SettingDataManager.getInstance(); + ExecutionCallbackManager.registerCallback( ExecutionCallbackManager.WINDOWADVISOR_POSTWINDOWOPEN, new PostWindowOpenCallback()); 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 cc20bfd..7547a8a 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 @@ -72,6 +72,7 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.handlers.ReplayTraceHandler; import org.tizen.dynamicanalyzer.model.AddrSymbolPair; import org.tizen.dynamicanalyzer.model.DeviceInfo; +import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.project.AppInfo; import org.tizen.dynamicanalyzer.project.BinaryInfo; import org.tizen.dynamicanalyzer.project.DeviceStatusInfo; @@ -90,9 +91,10 @@ import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.info.screenshot.EmulatorScreenshot; import org.tizen.dynamicanalyzer.ui.info.screenshot.SocketClient; import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.StartProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData; import org.tizen.dynamicanalyzer.util.ByteUtil; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.Logger; @@ -480,10 +482,26 @@ public class Communicator30 extends BaseCommunicator { // send config message byte[] config = ByteUtil.toBytes(AnalyzerConstants.MSG_CONFIG); RunTimeConfiguration rt = new RunTimeConfiguration(); - rt.setFeatures(ConfigureManager.getInstance().getConfiguration(devInfo), ConfigureManager - .getInstance().getPreConfiguration(devInfo)); - rt.setSystemTracePeriod(ConfigureManager.getInstance().getSystemPeriod()); - rt.setSamplingPeriod(ConfigureManager.getInstance().getSamplingPeriod()); + 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); + if (systemPeriod < 0) { + systemPeriod = target.getAvailableFeature( + ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC).getDefaultValue(); + } + int samplingPeriod = target.getSelectedFeatureValue(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC); + if (samplingPeriod < 0) { + samplingPeriod = target.getAvailableFeature( + ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC).getDefaultValue(); + } + rt.setSystemTracePeriod(systemPeriod); + rt.setSamplingPeriod(samplingPeriod); + byte[] rtByte = rt.toByteStream(); int length = rtByte.length; byte[] msg = ByteUtil.getByte(config, length, rtByte); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java index 5f94e4b..87be305 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java @@ -43,7 +43,7 @@ import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.project.BinaryInfo; import org.tizen.dynamicanalyzer.swap.platform.ui.InputRow; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; @@ -59,7 +59,7 @@ public class BinarySettingManager { private List realBinarySettings = new ArrayList(); - private String debugRoot = PathManager.getRootstrapsPath(ConfigureManager + private String debugRoot = PathManager.getRootstrapsPath(SettingDataManager.getInstance() .getPlatform()); public static synchronized BinarySettingManager getInstance() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/InputRow.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/InputRow.java index 1c6a215..6bc2a91 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/InputRow.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/InputRow.java @@ -47,7 +47,7 @@ import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer.FileExplorerDialog; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.BinarySettingsPage; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDialogBinarySettingsPage; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -82,7 +82,7 @@ public class InputRow extends Composite { BinarySettingManager.getInstance().removeRealBinarySettingData( binaryNameLabel.getText()); button.getParent().dispose(); - ((BinarySettingsPage) (inputComposite.getParent().getParent())) + ((SettingDialogBinarySettingsPage) (inputComposite.getParent().getParent())) .updateLayout(); } }; 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 f04d503..330d69d 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 @@ -60,7 +60,8 @@ import org.tizen.dynamicanalyzer.ui.file.model.FileStatus; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningCase; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; @@ -132,13 +133,22 @@ public class FileDataMaker { // filtering out internal call // some internal calls are sent when the open or close event to check leak - if (ConfigurationDialogDataManager.getInstance() - .getfeatureValue( - ConfigureLabels.INCLUDE_INSIDE_CALL_FILE) == 0) { + + // TODO : check and remove +// if (ConfigurationDialogDataManager.getInstance() +// .getfeatureValue( +// ConfigureLabels.INCLUDE_INSIDE_CALL_FILE) == 0) { +// if (input.isInternal()) { +// continue; +// } +// } + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); + if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) { if (input.isInternal()) { continue; } } + // filtering out print log and main func log // TODO: DISCUSSION: checkInvalidApiName: make the SWAP not send // TODO: DISCUSSION: isOpenMainLog: why osp main? diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java index 3a68d17..f1f3cb4 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java @@ -29,12 +29,12 @@ package org.tizen.dynamicanalyzer.ui.page; import java.util.ArrayList; import java.util.List; +import java.util.Set; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.part.ViewPart; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.ui.file.FilePage; @@ -44,8 +44,8 @@ import org.tizen.dynamicanalyzer.ui.opengl.GLPage; import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.thread.ThreadPage; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; @@ -85,42 +85,37 @@ public class BaseView extends ViewPart { * create tab pages */ public void createTabViewPage() { - ConfigureManager configureManager = ConfigureManager.getInstance(); + Set selectedPageList = SettingDataManager.getInstance().getSelectedPageList(null); List tabViewList = new ArrayList(); tabViewList.add(CommonConstants.PAGE_TIME_LINE); // default : timeline tab - + // thread tab - if (AnalyzerConstants.FEATURE_OFF != - configureManager.getValueLong(ConfigureLabels.FEATURE_THREAD)) { + if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_THREAD)) { tabViewList.add(CommonConstants.PAGE_THREAD); } // else nothing // network tab - if (AnalyzerConstants.FEATURE_OFF != - configureManager.getValueLong(ConfigureLabels.FEATURE_NETWORK)) { + if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_NETWORK)) { tabViewList.add(CommonConstants.PAGE_NETWORK); } // else nothing + // file tab + if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_FILE)) { + tabViewList.add(CommonConstants.PAGE_FILE); + } // else nothing + // openGL tab - if (AnalyzerConstants.FEATURE_OFF != - configureManager.getValueLong(ConfigureLabels.FEATURE_OPENGL)) { + if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_OPENGL)) { tabViewList.add(CommonConstants.PAGE_GRAPHICS); } // else nothing // kernel tab - if (AnalyzerConstants.FEATURE_OFF != - configureManager.getValueLong(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) { + if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_KERNEL)) { tabViewList.add(CommonConstants.PAGE_KERNEL); } // else nothing - - // file tab - if (AnalyzerConstants.FEATURE_OFF != configureManager - .getValueLong(ConfigureLabels.FEATURE_FILE)) { - tabViewList.add(CommonConstants.PAGE_FILE); - } // else nothing tabViewList.add(CommonConstants.PAGE_SUMMARY); // default : summary tab - addTabViewPage(tabViewList); + addTabViewPage(tabViewList); } /** 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 a9f90c7..e41d43e 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 @@ -31,14 +31,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData; public class LeakDetector { public final static int API_TYPE_OPEN = 0; @@ -91,35 +89,45 @@ public class LeakDetector { // } private boolean isDropLog(LogData logData) { - ConfigureManager configureManager = ConfigurationDialogDataManager - .getInstance().getConfigureManager(); + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); int id = logData.getId(); - String statStr = null; +// TODO : check and remove +// String statStr = null; switch (id) { case DataChannelConstants.MSG_PROBE_FILE: - statStr = configureManager - .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); +// statStr = configureManager +// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); + if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) { + return true; + } break; case DataChannelConstants.MSG_PROBE_MEMORY: - statStr = configureManager - .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY); +// statStr = configureManager +// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY); + if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)) { + return true; + } break; case DataChannelConstants.MSG_PROBE_THREAD: - statStr = configureManager - .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD); +// statStr = configureManager +// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD); + if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) { + return true; + } break; default: break; } - long state = AnalyzerUtil.addrToLong(statStr); - if (state != AnalyzerConstants.FEATURE_OFF) { - // feature on - return false; - } - return true; - // feature on : false - // feature off : true + 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 62c73c8..5469ce8 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 @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; @@ -38,9 +37,8 @@ import org.tizen.dynamicanalyzer.swap.model.data.FileData; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.MemoryData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData; public class NewLeakDetector { // TODO : understand and refactoring @@ -91,35 +89,45 @@ public class NewLeakDetector { // } private boolean isDropLog(LogData logData) { - ConfigureManager configureManager = ConfigurationDialogDataManager - .getInstance().getConfigureManager(); + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); int id = logData.getId(); - String statStr = null; + // TODO : check and remove +// String statStr = null; switch (id) { case DataChannelConstants.MSG_PROBE_FILE: - statStr = configureManager - .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); +// statStr = configureManager +// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); + if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) { + return true; + } break; case DataChannelConstants.MSG_PROBE_MEMORY: - statStr = configureManager - .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY); +// statStr = configureManager +// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY); + if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)) { + return true; + } break; case DataChannelConstants.MSG_PROBE_THREAD: - statStr = configureManager - .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD); +// statStr = configureManager +// .getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD); + if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) { + return true; + } break; default: break; } - long state = AnalyzerUtil.addrToLong(statStr); - if (state != AnalyzerConstants.FEATURE_OFF) { - // feature on - return false; - } - return true; - // feature on : false - // feature off : true + 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 a394106..7a67f3c 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 @@ -47,7 +47,8 @@ import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackData; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData; public class FunctionUsageProfiler extends PageDataManager { // default sampling rate = 10 ms @@ -225,18 +226,29 @@ public class FunctionUsageProfiler extends PageDataManager { @Override protected void makeData(LogPackage pack) { + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); + // TODO: will get sample_time from Project.java if (!isSetSamplePeriod) { - SAMPLE_TIME = ConfigurationDialogDataManager - .getInstance() - .getfeatureValue( - ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC); - isSetSamplePeriod = true; + // 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); + if (SAMPLE_TIME < 0) { + SAMPLE_TIME = target.getAvailableFeature( + ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC).getDefaultValue(); + } } - if (ConfigurationDialogDataManager.getInstance() // sampling is on - .getfeatureValue( - ConfigureLabels.FEATURE_FUNCTION_PROFILING) != 0) { +// TODO : check and remove +// if (ConfigurationDialogDataManager.getInstance() // sampling is on +// .getfeatureValue( +// ConfigureLabels.FEATURE_FUNCTION_PROFILING) != 0) { + if (target.isSelectedFeature(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { + Logs logs = pack.getLogs(DataChannelConstants.MSG_DATA_SAMPLE); if (null != logs && logs.getRawLogs().size() != 0) { List> insertData = new ArrayList>(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java index 49ebde6..1931ced 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java @@ -82,7 +82,8 @@ import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.UserCustomChart; import org.tizen.dynamicanalyzer.ui.timeline.logparser.CustomLogParser; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; @@ -168,14 +169,18 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer } private void loadSavedChartList() { - String savedChartNameList = ConfigureManager.getInstance().getValue( - ConfigureLabels.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST); - String[] chartNameList = savedChartNameList.split(","); //$NON-NLS-1$ - int size = chartNameList.length; + // TODO : check and remove +// String savedChartNameList = ConfigureManager.getInstance().getValue( +// ConfigureLabels.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST); +// String[] chartNameList = savedChartNameList.split(","); //$NON-NLS-1$ + + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); + List chartNameList = target.getAvailableChartList(); + int size = chartNameList.size(); if (size > 1) { for (int i = 0; i < size; i++) { - TimelineChart chart = getChartInstance(chartNameList[i]); + TimelineChart chart = getChartInstance(chartNameList.get(i)); if (chart != null) { chartList.add(chart); } @@ -205,22 +210,33 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer } private void loadSelectedChartList() { - String strSaveSelectedItems = ConfigureManager.getInstance().getValue( - ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST); - if (strSaveSelectedItems.equalsIgnoreCase("")) {//$NON-NLS-1$ - selectedChartList.addAll(chartList); - } else { - String[] savedSelectedChartNameList = strSaveSelectedItems.split(","); //$NON-NLS-1$ - int size = savedSelectedChartNameList.length; - if (size != 0) { - for (int i = 0; i < size; i++) { - TimelineChart chart = getChartInstance(savedSelectedChartNameList[i]); - if (chart != null) { - selectedChartList.add(chart); - } + List savedSelectedChartNameList = SettingDataManager.getInstance().getSelectedChartList(); + int size = savedSelectedChartNameList.size(); + if (size != 0) { + for (int i = 0; i < size; i++) { + TimelineChart chart = getChartInstance(savedSelectedChartNameList.get(i)); + if (chart != null) { + selectedChartList.add(chart); } } } +// TODO : check and remove +// String strSaveSelectedItems = ConfigureManager.getInstance().getValue( +// ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST); +// if (strSaveSelectedItems.equalsIgnoreCase("")) {//$NON-NLS-1$ +// selectedChartList.addAll(chartList); +// } else { +// String[] savedSelectedChartNameList = strSaveSelectedItems.split(","); //$NON-NLS-1$ +// int size = savedSelectedChartNameList.length; +// if (size != 0) { +// for (int i = 0; i < size; i++) { +// TimelineChart chart = getChartInstance(savedSelectedChartNameList[i]); +// if (chart != null) { +// selectedChartList.add(chart); +// } +// } +// } +// } } public void setChartList(List chartList) { @@ -271,15 +287,23 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer newChartList.add(customChart); newCustomChart = true; - StringBuffer strSaveChartNameList = new StringBuffer(""); //$NON-NLS-1$ - +// TODO : check and remove +// StringBuffer strSaveChartNameList = new StringBuffer(""); //$NON-NLS-1$ +// +// for (int i = 0; i < chartList.size(); i++) { +// strSaveChartNameList.append(chartList.get(i).getChartName()); +// strSaveChartNameList.append(","); //$NON-NLS-1$ +// } +// +// ConfigureManager.getInstance().setValue(ConfigureLabels.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, +// strSaveChartNameList.toString()); + + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); + List list = new ArrayList(); for (int i = 0; i < chartList.size(); i++) { - strSaveChartNameList.append(chartList.get(i).getChartName()); - strSaveChartNameList.append(","); //$NON-NLS-1$ - } - - ConfigureManager.getInstance().setValue(ConfigureLabels.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, - strSaveChartNameList.toString()); + list.add(chartList.get(i).getChartName()); + } + SettingDataManager.getInstance().writeAvailableChartList(target.getTargetName(), list); } } @@ -307,16 +331,22 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer chartWidget.addMouseMoveListener(timelineChartMouseEventListener); chartWidget.addMouseTrackListener(new TimelineChartMouseTrackAdapter(chartBoard.getTimeline())); } - - StringBuffer selectedChartNameList = new StringBuffer(""); //$NON-NLS-1$ - for (TimelineChart selectedChart : selectedChartList) { - selectedChartNameList.append(selectedChart.getChartName()); - selectedChartNameList.append(","); //$NON-NLS-1$ - } - ConfigureManager.getInstance().setValue(ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, - selectedChartNameList.toString()); +// TODO : check and remove +// StringBuffer selectedChartNameList = new StringBuffer(""); //$NON-NLS-1$ +// for (TimelineChart selectedChart : selectedChartList) { +// selectedChartNameList.append(selectedChart.getChartName()); +// selectedChartNameList.append(","); //$NON-NLS-1$ +// } +// ConfigureManager.getInstance().setValue(ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, +// selectedChartNameList.toString()); // AnalyzerUtil.getTimelineComposite().resetItems(); + + List list = new ArrayList(); + for (TimelineChart selectedChart : selectedChartList) { + list.add(selectedChart.getChartName()); + } + SettingDataManager.getInstance().writeSelectedChartList(list); } for (TimelineChart timelineChart : chartList) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineEditItemsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineEditItemsDialog.java index f48c19d..55a9f79 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineEditItemsDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineEditItemsDialog.java @@ -72,15 +72,14 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.tizen.dynamicanalyzer.appearance.DesignConstants; -import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.nl.WidgetLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; @@ -127,23 +126,25 @@ public class TimelineEditItemsDialog extends DAMessageBox { List chartList = new ArrayList(); List selectedChartList = new ArrayList(); - StringBuffer strSaveChartNameList = new StringBuffer( - CommonConstants.EMPTY); - StringBuffer strSaveSelectedChartNameList = new StringBuffer( - CommonConstants.EMPTY); - +// StringBuffer strSaveChartNameList = new StringBuffer( +// CommonConstants.EMPTY); +// StringBuffer strSaveSelectedChartNameList = new StringBuffer( +// CommonConstants.EMPTY); + List strSaveChartNameList = new ArrayList(); + List strSaveSelectedChartNameList = new ArrayList(); + for (TableItem item : tableitems) { TableItemData itemData = (TableItemData)item.getData(); chartList.add(chartManager.getChartInstance(itemData.chartType)); - strSaveChartNameList.append(itemData.titleText); - strSaveChartNameList.append(CommonConstants.COMMA); + strSaveChartNameList.add(itemData.titleText); +// strSaveChartNameList.append(CommonConstants.COMMA); if (itemData.isEnabled) { selectedChartList.add(chartManager .getChartInstance(itemData.chartType)); - strSaveSelectedChartNameList.append(itemData.titleText); - strSaveSelectedChartNameList.append(CommonConstants.COMMA); + strSaveSelectedChartNameList.add(itemData.titleText); +// strSaveSelectedChartNameList.append(CommonConstants.COMMA); showInfo.add(true); } else { showInfo.add(false); @@ -162,12 +163,18 @@ public class TimelineEditItemsDialog extends DAMessageBox { chartManager.setSelectedChartList(selectedChartList); AnalyzerUtil.getTimelineComposite().reArrangeChart(order, showInfo); - ConfigureManager.getInstance().setValue( - ConfigureLabels.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, - strSaveChartNameList.toString()); - ConfigureManager.getInstance().setValue( - ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, - strSaveSelectedChartNameList.toString()); + // TODO : check and remove +// ConfigureManager.getInstance().setValue( +// ConfigureLabels.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, +// strSaveChartNameList.toString()); +// ConfigureManager.getInstance().setValue( +// ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, +// strSaveSelectedChartNameList.toString()); + + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); + SettingDataManager.getInstance().writeAvailableChartList(target.getTargetName(), strSaveChartNameList); + SettingDataManager.getInstance().writeSelectedChartList(strSaveSelectedChartNameList); + shell.dispose(); RunningDialog = false; } 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 61f0a15..7d9a7a9 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 @@ -82,7 +82,7 @@ public class SettingDataManager { // TODO : check additional property private String platform = null; - private long internalLogLevel = 0; + private long internalLogLevel = 4; private SettingDataManager() { parseSettingData(FEATUER_FILE_NAME); @@ -314,6 +314,17 @@ public class SettingDataManager { return targetListMap; } + public TargetData getConnectedTarget() { + // TODO : check connected target + Map map = getTargetListMap(); +// if () { +// +// } else { + return map.get(selectedTarget); +// } +// return null; + } + public TargetData getTarget(String targetName) { Map map = getTargetListMap(); if (targetName == null) { @@ -495,8 +506,7 @@ public class SettingDataManager { } public long getConfiguration(DeviceInfo devInfo) { - // TODO : check connected target - TargetData target = SettingDataManager.getInstance().getTarget(null); + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); long state = 0; state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_FUNCTION_PROFILING); @@ -527,12 +537,12 @@ public class SettingDataManager { state |= target.getSelectedFeatureSwapValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE); state |= target.getSelectedFeatureSwapValue(ConfigureLabels.INCLUDE_INSIDE_CALL_UI); } + Logger.debug("getConfiguration() : " + state); return state; } public long getPreConfiguration(DeviceInfo devInfo) { - // TODO : check connected target - TargetData target = SettingDataManager.getInstance().getTarget(null); + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); long state = 0; if (DACommunicator.isSWAPVersion(devInfo)) { // TODO: check FEATURE_SYSTEM_THREAD @@ -548,6 +558,7 @@ public class SettingDataManager { state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_DEVICE); state |= target.getSelectedFeatureSwapValue(ConfigureLabels.FEATURE_SYSTEM_ENERGY); } + Logger.debug("getPreConfiguration() : " + state); return state; } } 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 f213279..229aec6 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 @@ -100,7 +100,7 @@ public class SettingDialog extends DAMessageBox { SettingDataManager.getInstance().applySettingData(); // add & remove tab view page - SettingDialogManager.getInstance().createTabViewPage(); + SettingDialogManager.getInstance().updateTabViewPage(); // add & remove (timeline) chart SettingDialogManager.getInstance().updateChartList(); @@ -213,7 +213,6 @@ public class SettingDialog extends DAMessageBox { @Override public void handleEvent(Event event) { - Logger.debug("binary settings show"); FormData data = (FormData) applyButton.getLayoutData(); data.width = 0; @@ -228,7 +227,6 @@ public class SettingDialog extends DAMessageBox { @Override public void handleEvent(Event event) { - Logger.debug("binary settings hide"); FormData data = (FormData) applyButton.getLayoutData(); data.width = 100; @@ -278,7 +276,6 @@ public class SettingDialog extends DAMessageBox { @Override public void widgetDisposed(DisposeEvent e) { - Logger.debug("shell disposed!"); //$NON-NLS-1$ opened = false; ShortCutManager.getInstance().setEnabled(!opened); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogBinarySettingsPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogBinarySettingsPage.java index 0bfc965..e57ec5a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogBinarySettingsPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogBinarySettingsPage.java @@ -62,7 +62,6 @@ import org.tizen.dynamicanalyzer.swap.platform.ui.LoadSettingDialog; import org.tizen.dynamicanalyzer.swap.platform.ui.SaveSettingDialog; import org.tizen.dynamicanalyzer.swap.platform.ui.DeviceExplorer.DeviceExplorerDilaog; import org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer.FileExplorerDialog; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; @@ -242,7 +241,7 @@ public class SettingDialogBinarySettingsPage extends DAPageComposite { me = this; setTitle("Binary Settings"); // TODO nl rootPath = PathManager - .getRootstrapsPath(ConfigureManager.getPlatform()); + .getRootstrapsPath(SettingDataManager.getInstance().getPlatform()); inputRowHash = BinarySettingManager.getInstance().getInputRowHash(); inputRowList = BinarySettingManager.getInstance().getInputRowList(); 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 8f76ea8..1a658db 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 @@ -31,6 +31,7 @@ import java.util.Set; import org.eclipse.nebula.widgets.grid.Grid; import org.eclipse.nebula.widgets.grid.GridItem; +import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.GlobalInformation; import org.tizen.dynamicanalyzer.common.HostResult; import org.tizen.dynamicanalyzer.communicator.DACommunicator; @@ -38,7 +39,6 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogFeaturesPage; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; @@ -72,8 +72,7 @@ public class SettingDialogManager { this.featureDlg = featureDlg; } - public void applySwapValue() { - + public void applySwapValue() { if (null != GlobalInformation.getCurrentDeviceInfo()) { HostResult result = DACommunicator.sendRuntimeMessage( DACommunicator.MSG_TYPE_CONFIG, null); @@ -139,8 +138,8 @@ public class SettingDialogManager { String optionText = table.getItem(i).getText(1); FeatureData feature = target.getAvailableFeature(featureName); - if ((optionText.contains(ConfigurationDialogFeaturesPage.ITEM_ALL_CHECKED)) - || (optionText.contains(ConfigurationDialogFeaturesPage.ITEM_PART_CHECKED))) { + if ((optionText.contains(FeatureDialog.ITEM_ALL_CHECKED)) + || (optionText.contains(FeatureDialog.ITEM_PART_CHECKED))) { // check detail feature if (feature.getFeatureType() == FeatureData.FEATURE_TYPE_DETAIL) { @@ -171,8 +170,8 @@ public class SettingDialogManager { String optionText = table.getItem(i).getText(1); FeatureData feature = target.getAvailableFeature(featureName); - if ((optionText.contains(ConfigurationDialogFeaturesPage.ITEM_ALL_CHECKED)) - || (optionText.contains(ConfigurationDialogFeaturesPage.ITEM_PART_CHECKED))) { + if ((optionText.contains(FeatureDialog.ITEM_ALL_CHECKED)) + || (optionText.contains(FeatureDialog.ITEM_PART_CHECKED))) { count++; // check detail feature @@ -271,9 +270,9 @@ public class SettingDialogManager { /** * create tab pages */ - public void createTabViewPage() { - // TODO : check connected target - Set selectedPageList = SettingDataManager.getInstance().getSelectedPageList(null); + public void updateTabViewPage() { + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); + Set selectedPageList = target.getSelectedPageList(); List tabViewList = new ArrayList(); tabViewList.add(CommonConstants.PAGE_TIME_LINE); // default : timeline tab @@ -312,8 +311,8 @@ public class SettingDialogManager { * update chart list */ public void updateChartList() { - // TODO : check connected target - Set selectedChartList = SettingDataManager.getInstance().getSelectedChartList(null); + TargetData target = SettingDataManager.getInstance().getConnectedTarget(); + Set selectedChartList = target.getSelectedChartList(); TimelineChartManager.getInstance().loadSelectedChartList(selectedChartList); // TODO : selectedChartList remove? 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 7d2d47f..8a0de90 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 @@ -280,8 +280,10 @@ public class TargetData { List selectedFeatures = getSelectedFeatureList(); FeatureValueData feature = getFeatureValueData(selectedFeatures, featureName); if (feature == null) { + Logger.debug("getSelectedFeatureValue() : " + featureName + "is not selected"); return -1; } + Logger.debug("getSelectedFeatureValue() : " + feature.getValue()); return feature.getValue(); } @@ -296,8 +298,10 @@ public class TargetData { if (isSelectedFeature(featureName) == true) { Map map = getAvailableFeatureListMap(); FeatureData feature = map.get(featureName); + Logger.debug("getSelectedFeatureSwapValue() : " + feature.getSwapValue()); return feature.getSwapValue(); } + Logger.debug("getSelectedFeatureSwapValue() : " + featureName + "is not selected"); return AnalyzerConstants.FEATURE_OFF; } 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 a3f77a6..34674ca 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 @@ -96,7 +96,7 @@ public class WelcomeDialog extends DAMessageBox { SettingDataManager.getInstance().applySettingData(); // add & remove tab view page - SettingDialogManager.getInstance().createTabViewPage(); + SettingDialogManager.getInstance().updateTabViewPage(); // add & remove (timeline) chart SettingDialogManager.getInstance().updateChartList(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java index f36782d..a1f317e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java @@ -43,7 +43,7 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.Logger; @@ -294,7 +294,7 @@ public class UIFunctionProfilingDataChecker { if(CommunicatorUtils.isCurrentDeviceArmArch()) isArm = true; - String platform = ConfigureManager.getPlatform(); + String platform = SettingDataManager.getInstance().getPlatform(); if (platform == null) { return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java index babd7db..2f10f1a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java @@ -41,7 +41,7 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager; import org.tizen.dynamicanalyzer.util.CommonUtil; public class InternalLogManager { @@ -92,8 +92,10 @@ public class InternalLogManager { } private void init() { - logLevel = ConfigureManager.getInstance().getValueLong( - ConfigureLabels.INTERNAL_LOG_LEVEL); +// TODO : check and remove +// logLevel = ConfigureManager.getInstance().getValueLong( +// ConfigureLabels.INTERNAL_LOG_LEVEL); + logLevel = SettingDataManager.getInstance().getInternalLogLevel(); dateFormat = new SimpleDateFormat("yyyy:MM:dd:HH:mm:ss:SSS"); if (checkLevel(LOG_TYPE_FUNCTION)) { -- 2.7.4