From 35f0ccf0a5b355699c28b00933acecca7cf98d21 Mon Sep 17 00:00:00 2001 From: jihye kim Date: Tue, 19 Mar 2013 14:17:34 +0900 Subject: [PATCH] [Title] emulator-manager : update version(2.1.0) [Desc.] modify reset function [Issue] N_SE-28353 --- package/changelog | 6 ++++++ package/pkginfo.manifest | 2 +- src/org/tizen/emulator/manager/tool/FilePath.java | 8 ++++---- src/org/tizen/emulator/manager/vms/VMsWorker.java | 10 ++++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/package/changelog b/package/changelog index 762e860..9f63f88 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,9 @@ +* 2.1.0 +- update vesrion (2.1.0 a) +- delete file seperator +- modify reset function +== jihye kim 2013-03-19 + * 1.3.89 - update version == Sooyoung Ha 2013-03-08 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index b2c203c..7b4f96d 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source: emulator-manager -Version: 1.3.89 +Version: 2.1.0 Maintainer: Yeong-Kyoon Lee Package: emulator-manager diff --git a/src/org/tizen/emulator/manager/tool/FilePath.java b/src/org/tizen/emulator/manager/tool/FilePath.java index cc39315..648ac90 100644 --- a/src/org/tizen/emulator/manager/tool/FilePath.java +++ b/src/org/tizen/emulator/manager/tool/FilePath.java @@ -229,8 +229,8 @@ public class FilePath { workspacePath = EmulatorVMs.getInstance().getVMsBaseDirectory(); vmsPath = EmulatorVMs.getInstance().getVMsConfigDirectory(); - swapPath = workspacePath + File.separator + swap_suffix; - dataSkinPath = workspacePath + File.separator + skin_suffix; + swapPath = workspacePath + swap_suffix; + dataSkinPath = workspacePath + skin_suffix; EmulatorVMs.makeSDKDataPath(tizenSDKDataPath); setVMSPath(); @@ -240,8 +240,8 @@ public class FilePath { public static void setVMSPath() { workspacePath = EmulatorVMs.getInstance().getVMsBaseDirectory(); vmsPath = EmulatorVMs.getInstance().getVMsConfigDirectory(); - swapPath = workspacePath + File.separator + swap_suffix; - dataSkinPath = workspacePath + File.separator + skin_suffix; + swapPath = workspacePath + swap_suffix; + dataSkinPath = workspacePath + skin_suffix; //testPrintPath(); } diff --git a/src/org/tizen/emulator/manager/vms/VMsWorker.java b/src/org/tizen/emulator/manager/vms/VMsWorker.java index 5e35564..6d831ac 100644 --- a/src/org/tizen/emulator/manager/vms/VMsWorker.java +++ b/src/org/tizen/emulator/manager/vms/VMsWorker.java @@ -218,6 +218,11 @@ public class VMsWorker { "Emulator Name : " + property.getName()); } + File oldImageFile = new File(targetPath); + if (oldImageFile.exists()) { + oldImageFile.delete(); + } + try { Creator.createInitialVMImage(basePath, targetPath); } catch (VMsCreatorException e) { @@ -237,6 +242,11 @@ public class VMsWorker { "Emulator Name : " + property.getName()); } + File oldSwapFile = new File(swapTargetPath); + if (oldSwapFile.exists()) { + oldSwapFile.delete(); + } + try { Creator.createSwapImage(swapBasePath, swapTargetPath); } catch (VMsCreatorException e) { -- 2.7.4