From: kamuru Date: Mon, 30 Sep 2013 06:00:55 +0000 (+0900) Subject: [Title] change chart's probe type X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5eeb9bf9c24b2058031594ad1d51bc9ab1be16d7;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] change chart's probe type [Desc.] [Issue] --- 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 13989ec..57c0319 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 @@ -402,34 +402,34 @@ public class Communicator30 extends BaseCommunicator { // FIXME: permission denied problem if (!targetHashCode.equals(localHashCode)) { - String destFilePath = AnalyzerPaths.TEMP_FOLDER_PATH - + File.separator - + selectedApp.getExecFileName(appInfo.getAppType()); - try { - DACommunicator.getSelectedDevice().getIDevice() - .becomeSuperUser(true); - } catch (TimeoutException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (SdbCommandRejectedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - SyncResult res = CommunicatorUtils.pull(targetPath, destFilePath); - if (null != res && res.isOk()) { - System.out.println("binary copy success!!");//$NON-NLS-1$ - } else { - System.out.println("Failed to get " + targetPath + " step 2"); //$NON-NLS-1$ - return HostResult.ERR_BIN_INFO_GET_FAIL; - } - String[] splitName = binaryPath.split(CommonConstants.SLASH); - binaryPath = AnalyzerPaths.TEMP_FOLDER_PATH + File.separator - + new String(splitName[splitName.length - 1]); - binInfo.setPath(binaryPath); +// String destFilePath = AnalyzerPaths.TEMP_FOLDER_PATH +// + File.separator +// + selectedApp.getExecFileName(appInfo.getAppType()); +// try { +// DACommunicator.getSelectedDevice().getIDevice() +// .becomeSuperUser(true); +// } catch (TimeoutException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (SdbCommandRejectedException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } +// +// SyncResult res = CommunicatorUtils.pull(targetPath, destFilePath); +// if (null != res && res.isOk()) { +// System.out.println("binary copy success!!");//$NON-NLS-1$ +// } else { +// System.out.println("Failed to get " + targetPath + " step 2"); //$NON-NLS-1$ +// return HostResult.ERR_BIN_INFO_GET_FAIL; +// } +// String[] splitName = binaryPath.split(CommonConstants.SLASH); +// binaryPath = AnalyzerPaths.TEMP_FOLDER_PATH + File.separator +// + new String(splitName[splitName.length - 1]); +// binInfo.setPath(binaryPath); } binInfo.setPath(binaryPath); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java index 6f44d61..b051361 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java @@ -28,7 +28,7 @@ package org.tizen.dynamicanalyzer.ui.timeline.chart; import java.util.List; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -60,7 +60,7 @@ public class CPUChart extends TimelineChart { private CPUChart() { chartType = TimelineConstants.CHART_TYPE_CPU; - probeType = LogCenterConstants.LOG_DEVICE; + probeType = AnalyzerConstants.MSG_DATA_SYSTEM; chartName = TimelineChartLabels.CPU_CHART_TITLE; chartIcon = ImageResources.CHART_CPU; addIcon = ImageResources.ADD_CHART_CPU; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java index b949ab7..9714ceb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java @@ -29,7 +29,7 @@ package org.tizen.dynamicanalyzer.ui.timeline.chart; import java.util.ArrayList; import java.util.List; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -67,7 +67,7 @@ public class CPUCoreChart extends TimelineChart { public CPUCoreChart() { chartType = TimelineConstants.CHART_TYPE_CPU_CORE; - probeType = LogCenterConstants.LOG_DEVICE; + probeType = AnalyzerConstants.MSG_DATA_SYSTEM; chartName = TimelineChartLabels.CPU_CORE_CHART_TITLE; chartIcon = ImageResources.CHART_CPU_CORE; addIcon = ImageResources.ADD_CHART_CPU_CORE; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java index 64580fc..05d7105 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java @@ -28,7 +28,7 @@ package org.tizen.dynamicanalyzer.ui.timeline.chart; import java.util.List; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -57,7 +57,7 @@ public class CPUFrequencyChart extends TimelineChart { private CPUFrequencyChart() { chartType = TimelineConstants.CHART_TYPE_CPU_FREQUENCY; - probeType = LogCenterConstants.LOG_DEVICE; + probeType = AnalyzerConstants.MSG_DATA_SYSTEM; chartName = TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE; chartIcon = ImageResources.CHART_CPU_FREQUENCY; addIcon = ImageResources.ADD_CHART_CPU_FREQUENCY; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java index 6e17d25..3aed177 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Semaphore; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -100,7 +100,7 @@ public class FileChart extends TimelineChart { private FileChart() { chartType = TimelineConstants.CHART_TYPE_FILE; - probeType = LogCenterConstants.LOG_DEVICE; + probeType = AnalyzerConstants.MSG_DATA_SYSTEM; chartName = TimelineChartLabels.FILE_CHART_TITLE; chartIcon = ImageResources.CHART_FILE; addIcon = ImageResources.ADD_CHART_FILE; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java index f051552..29e5fa3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java @@ -29,6 +29,7 @@ package org.tizen.dynamicanalyzer.ui.timeline.chart; 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.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -69,7 +70,7 @@ public class HeapChart extends TimelineChart { private HeapChart() { chartType = TimelineConstants.CHART_TYPE_HEAP; - probeType = LogCenterConstants.LOG_DEVICE; + probeType = AnalyzerConstants.MSG_DATA_SYSTEM; chartName = TimelineChartLabels.HEAP_CHART_TITLE; chartIcon = ImageResources.CHART_HEAP; addIcon = ImageResources.ADD_CHART_HEAP; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java index 166a618..e711394 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java @@ -28,7 +28,7 @@ package org.tizen.dynamicanalyzer.ui.timeline.chart; import java.util.List; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -61,7 +61,7 @@ public class ProcessMemoryChart extends TimelineChart { private ProcessMemoryChart() { chartType = TimelineConstants.CHART_TYPE_PROCESS_MEMORY; - probeType = LogCenterConstants.LOG_DEVICE; + probeType = AnalyzerConstants.MSG_DATA_SYSTEM; chartName = TimelineChartLabels.PROCESS_MEMORY_CHART_TITLE; chartIcon = ImageResources.CHART_PROCESS_MEMORY; addIcon = ImageResources.ADD_CHART_PROCESS_MEMORY; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java index 5f9f0a3..87b0788 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java @@ -34,7 +34,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; @@ -64,7 +63,7 @@ public class ScreenshotChart extends TimelineChart { private ScreenshotChart() { chartType = TimelineConstants.CHART_TYPE_SCREENSHOT; chartStyle = DAChart.CHART_STYLE_SCREENSHOT; - probeType = LogCenterConstants.LOG_SCREENSHOT; + probeType = AnalyzerConstants.MSG_PROBE_SCREENSHOT; chartName = TimelineChartLabels.SCREENSHOT_CHART_TITLE; chartIcon = ImageResources.CHART_SCREENSHOT; addIcon = ImageResources.ADD_CHART_SCREENSHOT; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java index 6cc8a23..b7149fc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java @@ -28,8 +28,8 @@ package org.tizen.dynamicanalyzer.ui.timeline.chart; import java.util.List; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -62,7 +62,7 @@ public class SystemMemoryChart extends TimelineChart { private SystemMemoryChart() { chartType = TimelineConstants.CHART_TYPE_SYSTEM_MEMORY; - probeType = LogCenterConstants.LOG_DEVICE; + probeType = AnalyzerConstants.MSG_DATA_SYSTEM; chartName = TimelineChartLabels.SYSTEM_MEMORY_CHART_TITLE; chartIcon = ImageResources.CHART_SYSTEM_MEMORY; addIcon = ImageResources.ADD_CHART_SYSTEM_MEMORY; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java index 58a3d7a..2e238fa 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java @@ -28,8 +28,8 @@ package org.tizen.dynamicanalyzer.ui.timeline.chart; import java.util.List; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.CommonConstants; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -84,7 +84,7 @@ public class UIEventChart extends TimelineChart { private UIEventChart() { chartType = TimelineConstants.CHART_TYPE_UIEVENT; chartStyle = DAChart.CHART_STYLE_MULTI; - probeType = LogCenterConstants.LOG_UI_EVENT; + probeType = AnalyzerConstants.MSG_PROBE_UIEVENT; chartName = TimelineChartLabels.UI_EVENT_CHART_TITLE; chartIcon = ImageResources.CHART_UI_EVENT; addIcon = ImageResources.ADD_CHART_UI_EVENT;