From a42589b7bce1cc09d66d27b2bb0e496bfe3e4da2 Mon Sep 17 00:00:00 2001 From: "jungwook.ryu" Date: Fri, 27 Jun 2014 17:30:27 +0900 Subject: [PATCH] Common : revision configuration default value, disable timeline chart(UI Event, Device) Change-Id: I5d655185a4785d92f9ff65394463e611ce18a3fb Signed-off-by: jungwook.ryu --- .../handlers/ReplayTraceHandler.java | 46 +++++++++++----------- .../tizen/dynamicanalyzer/ui/page/BaseView.java | 6 +-- .../ui/timeline/common/TimelineChartManager.java | 4 +- .../ui/toolbar/ConfigureManager.java | 10 ++--- .../ConfigurationDialogDataManager.java | 2 +- .../ConfigurationTableComparator.java | 7 +++- 6 files changed, 38 insertions(+), 37 deletions(-) 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 0cbeec2..d5477e7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java @@ -58,8 +58,7 @@ public class ReplayTraceHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (!DACommunicator.isSWAPVersion()) { - String xmlFileName = AnalyzerManager.getProject().getSavePath() - + RECORD_DATA_FILE_NAME; + String xmlFileName = AnalyzerManager.getProject().getSavePath() + RECORD_DATA_FILE_NAME; if (xmlFileName == null || xmlFileName.isEmpty()) { return FAILED; @@ -74,31 +73,34 @@ public class ReplayTraceHandler extends AbstractHandler { // make replay event // on/off , replay start time, count, event objs - ReplayData replayData = ReplayDataManager.getInstance() - .getReplayDBManager().getReplayLogs(true); + ReplayData replayData = ReplayDataManager.getInstance().getReplayDBManager() + .getReplayLogs(true); + int count = 0; + if (null != replayData) { + count = replayData.getObjectCount(); + } - int count = replayData.getObjectCount(); byte[] eventObjs = null; for (int i = 0; i < count; i++) { - eventObjs = ByteUtil.concatByteArray(eventObjs, replayData - .getRecordEvent().get(i).getByteValues()); + eventObjs = ByteUtil.concatByteArray(eventObjs, replayData.getRecordEvent().get(i) + .getByteValues()); -// System.out.println(" sec : " -// + replayData.getRecordEvent().get(i).getEventTime() -// .getSec() -// + " nano : " -// + replayData.getRecordEvent().get(i).getEventTime() -// .getNano() + " id : " -// + replayData.getRecordEvent().get(i).getEventId() -// + " code : " -// + replayData.getRecordEvent().get(i).getEventCode() -// + " type : " -// + replayData.getRecordEvent().get(i).getEventType() -// + " value : " -// + replayData.getRecordEvent().get(i).getEventValue()); + // System.out.println(" sec : " + // + replayData.getRecordEvent().get(i).getEventTime() + // .getSec() + // + " nano : " + // + replayData.getRecordEvent().get(i).getEventTime() + // .getNano() + " id : " + // + replayData.getRecordEvent().get(i).getEventId() + // + " code : " + // + replayData.getRecordEvent().get(i).getEventCode() + // + " type : " + // + replayData.getRecordEvent().get(i).getEventType() + // + " value : " + // + replayData.getRecordEvent().get(i).getEventValue()); } - replayEvent = ByteUtil.getByte(REPLAY_ON, startTime.getSec(), - startTime.getNano(), count, eventObjs); + replayEvent = ByteUtil.getByte(REPLAY_ON, startTime.getSec(), startTime.getNano(), + count, eventObjs); } return null; } 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 dea0f69..0c27d2f 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 @@ -97,10 +97,8 @@ public class BaseView extends ViewPart { } // else nothing // network tab - if ((AnalyzerConstants.FEATURE_OFF != - configureManager.getValueLong(ConfigureLabels.FEATURE_NETWORK)) || - (AnalyzerConstants.FEATURE_OFF != - configureManager.getValueLong(ConfigureLabels.FEATURE_MEMORY_ALLOCATION))) { + if (AnalyzerConstants.FEATURE_OFF != + configureManager.getValueLong(ConfigureLabels.FEATURE_NETWORK)) { tabViewList.add(CommonConstants.PAGE_NETWORK); } // else nothing 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 86e29f8..bc94566 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 @@ -167,10 +167,10 @@ public class TimelineChartManager extends PageDataManager implements initChartMap(ProcessMemoryChart.getInstance()); initChartMap(SystemMemoryChart.getInstance()); initChartMap(ScreenshotChart.getInstance()); - initChartMap(UIEventChart.getInstance()); +// initChartMap(UIEventChart.getInstance()); initChartMap(DiskIOChart.getInstance()); initChartMap(NetworkIOChart.getInstance()); - initChartMap(DeviceChart.getInstance()); +// initChartMap(DeviceChart.getInstance()); initChartMap(EnergyChart.getInstance()); loadSavedChartList(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java index 4e4316f..202a58e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java @@ -134,7 +134,7 @@ public class ConfigureManager { if (null == data.get(ConfigureLabels.FEATURE_MEMORY_ALLOCATION)) { data.put(ConfigureLabels.FEATURE_MEMORY_ALLOCATION, - Long.toString(AnalyzerConstants.FEATURE_OFF)); + Long.toString(AnalyzerConstants.FEATURE_ALLOCATION)); } if (null == data.get(ConfigureLabels.FEATURE_FILE)) { data.put(ConfigureLabels.FEATURE_FILE, @@ -154,7 +154,7 @@ public class ConfigureManager { } if (null == data.get(ConfigureLabels.FEATURE_SCREENSHOT)) { data.put(ConfigureLabels.FEATURE_SCREENSHOT, - Long.toString(AnalyzerConstants.FEATURE_OFF)); + Long.toString(AnalyzerConstants.FEATURE_SCREENSHOT)); } if (null == data.get(ConfigureLabels.FEATURE_USER_EVENT)) { data.put(ConfigureLabels.FEATURE_USER_EVENT, @@ -162,7 +162,7 @@ public class ConfigureManager { } if (null == data.get(ConfigureLabels.FEATURE_RECORDING)) { data.put(ConfigureLabels.FEATURE_RECORDING, - Long.toString(AnalyzerConstants.FEATURE_OFF)); + Long.toString(AnalyzerConstants.FEATURE_RECORDING)); } // if (null == data.get(ConfigureLabels.FEATURE_SYSCALL)) { @@ -239,10 +239,6 @@ public class ConfigureManager { data.put(ConfigureLabels.FEATURE_SYSTEM_NETWORK, Long.toString(AnalyzerConstants.SYSTEM_NETWORK)); } - if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) { - data.put(ConfigureLabels.FEATURE_SYSTEM_NETWORK, - Long.toString(AnalyzerConstants.SYSTEM_NETWORK)); - } if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) { data.put(ConfigureLabels.FEATURE_SYSTEM_DEVICE, Long.toString(AnalyzerConstants.SYSTEM_DEVICE)); 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 542f478..be59bf3 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 @@ -80,7 +80,7 @@ public class ConfigurationDialogDataManager { ConfigureLabels.FEATURE_OPENGL, // ConfigureLabels.FEATURE_USERINTERFACE, ConfigureLabels.FEATURE_SCREENSHOT, - ConfigureLabels.FEATURE_USER_EVENT, + // ConfigureLabels.FEATURE_USER_EVENT, ConfigureLabels.FEATURE_RECORDING, ConfigureLabels.FEATURE_CONTEXT_SWITCH, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationTableComparator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationTableComparator.java index 7df2c23..1032241 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationTableComparator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationTableComparator.java @@ -28,6 +28,7 @@ package org.tizen.dynamicanalyzer.ui.toolbar.configuration; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class ConfigurationTableComparator extends DefaultTableComparator { @@ -39,6 +40,10 @@ public class ConfigurationTableComparator extends DefaultTableComparator { @Override public int compare(Object arg0, Object arg1) { - return 1; + if (CommonUtil.isMac()) { + return -1; + } else { + return 1; + } } } -- 2.7.4