From 46b6290da7fc6d161c0eda272db7d7c735ba51ab Mon Sep 17 00:00:00 2001 From: "jungwook.ryu" Date: Mon, 11 Aug 2014 16:41:00 +0900 Subject: [PATCH] Common : fix split file path including "\" Change-Id: Ie43c11d73691ee39670847c3af845b0aa539ac22 Signed-off-by: jungwook.ryu --- .../dynamicanalyzer/ui/timeline/common/TimelineChartManager.java | 7 +++++-- .../src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java | 7 +++++++ .../tizen/dynamicanalyzer/utils/DownloadContentfileManager.java | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) 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 3dffe8f..65f22ea 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,6 +82,7 @@ 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.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; @@ -568,15 +569,17 @@ public class TimelineChartManager extends PageDataManager implements ScreenShotData log = (ScreenShotData) screenShotLogList.get(i); ArrayList dbScreenShotData = new ArrayList(); String imagePathLog = null; + String[] splitedImagePathLog = null; if (DACommunicator.isTargetEmulator() && SocketClient.getInstance().isConnected()) { imagePathLog = GlobalInformation.getCurrentDeviceInfo().emulatorScreenshot .getFilePath(); + splitedImagePathLog = AnalyzerUtil.splitFilePath(imagePathLog, File.separator); } else { imagePathLog = log.getImageFilePath(); + splitedImagePathLog = AnalyzerUtil.splitFilePath(imagePathLog, "/"); } - String[] splitedImagePathLog = imagePathLog - .split("/"); //$NON-NLS-1$ + String fileName = splitedImagePathLog[splitedImagePathLog.length - 1]; dbScreenShotData.add(new Long(log.getTime())); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java index da40963..d2fbcef 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -484,4 +484,11 @@ public class AnalyzerUtil { return false; } } + + public static String[] splitFilePath(String filePath, String separator) { + if (separator.equals("\\")) { + separator = "\\\\"; + } + return filePath.split(separator); + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java index 90fae67..956b376 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java @@ -63,8 +63,8 @@ public class DownloadContentfileManager { } String deviceFilePath = strFile[SPLIT_PATH_INDEX]; - String[] fileNameSplit = deviceFilePath.split(File.separator - + AnalyzerConstants.TMP_FOLDER + File.separator); + String[] fileNameSplit = deviceFilePath.split("/" + + AnalyzerConstants.TMP_FOLDER + "/"); if (fileNameSplit.length < SPLIT_PATH_INDEX) { return returnString; } -- 2.7.4