Upload tizen_2.2 source

Change-Id: Ib84f0c6e00129e4cd6500ab3df3351509b29ed97

4 files changed, 18 insertions, 10 deletions

diff --git a/org.tizen.codecoverage/META-INF/MANIFEST.MF b/org.tizen.codecoverage/META-INF/MANIFEST.MF
index 446ec02..fe54632 100644
--- a/org.tizen.codecoverage/META-INF/MANIFEST.MF
+++ b/org.tizen.codecoverage/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.tizen.common.connection,
- org.tizen.nativecpp.editors.manifest,
  org.eclipse.cdt.managedbuilder.core,
- org.tizen.sdblib
+ org.tizen.sdblib,
+ org.tizen.sdblib.service
 Export-Package: org.tizen.codecoverage.helper
diff --git a/org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java b/org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java
index 20d1ddf..8af71d3 100644
--- a/org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java
+++ b/org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java
@@ -20,6 +20,10 @@
 
 package org.tizen.codecoverage.helper;
 
+import static org.tizen.sdblib.service.SyncServiceConstants.RESULT_OK;
+
+import java.io.File;
+import java.net.URI;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -35,14 +39,12 @@ import org.eclipse.linuxtools.gcov.parser.CovManager;
 import org.eclipse.linuxtools.gcov.view.CovView;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
-import org.tizen.common.TizenPlatformConstants;
-import org.tizen.common.sdb.command.SdbCommand;
 import org.tizen.common.connection.ConnectionPlugin;
 import org.tizen.common.util.IOUtil;
 import org.tizen.nativecommon.ProjectUtil;
 import org.tizen.sdblib.IDevice;
-import org.tizen.sdblib.SyncService;
-import org.tizen.sdblib.SyncService.SyncResult;
+import org.tizen.sdblib.service.SyncResult;
+import org.tizen.sdblib.service.SyncService;
 
 public class GcovHelper {
     final static String DATA_DIR = "/data/";
@@ -142,11 +144,11 @@ public class GcovHelper {
 
         try {
             for (String gcdaPath: gcdaPathsInGcno) {
-                dstFile = gcdaPath;
+                dstFile = new Path(gcdaPath).removeLastSegments(1).toString();
                 srcFile = targetPath + gcdaPath;
 
-                SyncResult syncSuccess = syncService.pullFile(srcFile, dstFile, SyncService.getNullProgressMonitor());
-                if (syncSuccess.getCode() != SyncService.RESULT_OK) {
+                SyncResult syncSuccess = syncService.pull( currentDevice.getFileEntry( srcFile ), dstFile);
+                if (syncSuccess.getCode() != RESULT_OK) {
                     Exception e = new Exception();
                     throw e;
                 }
diff --git a/package/changelog b/package/changelog
index 9704cea..822f254 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,9 @@
+* 2.1.8
+- Refactoring sdblib
+== kh5325.kim <kh5325.kim@samsung.com> 2013-06-05
+* 2.1.7
+- 2.1.1 package
+== kh5325.kim <kh5325.kim@samsung.com> 2013-05-24
 * 2.1.6
 - Changed result directory to /tmp/<pkgId>/data
 == kh5325.kim <ho.namkoong@samsung.com> 2013-04-17
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 837fd34..db192ca 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.6
+Version:2.1.8
 Source:codecoverage-eplugin
 Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>