From: kh5325.kim Date: Wed, 22 May 2013 08:55:11 +0000 (+0900) Subject: Refactored to sdblib X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37ed3d9080db7732277d54b240a3cb6cb6aab1dc;p=sdk%2Fide%2Fnativeplatform-eplugin.git Refactored to sdblib --- diff --git a/org.tizen.nativeplatform/META-INF/MANIFEST.MF b/org.tizen.nativeplatform/META-INF/MANIFEST.MF index b532ef7..08f3e27 100644 --- a/org.tizen.nativeplatform/META-INF/MANIFEST.MF +++ b/org.tizen.nativeplatform/META-INF/MANIFEST.MF @@ -54,4 +54,8 @@ Import-Package: org.eclipse.cdt.debug.core, org.tizen.nativeappcommon.templateengine, org.tizen.nativeappcommon.wizards, org.tizen.nativeappcommon.wizards.model, - org.tizen.sdblib + org.tizen.sdblib, + org.tizen.sdblib.exception, + org.tizen.sdblib.receiver, + org.tizen.sdblib.service, + org.tizen.sdblib.util diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegate.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegate.java index fe76771..870e8c1 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegate.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegate.java @@ -97,11 +97,11 @@ import org.tizen.nativeplatform.build.PlatformProjectPackaging; import org.tizen.nativeplatform.launch.wizards.PlatformLaunchUtils; import org.tizen.nativeplatform.launch.wizards.ShowPackageStatusDialog; import org.tizen.nativeplatform.pkgmgr.model.LocalPackage; +import org.tizen.sdblib.Arch; import org.tizen.sdblib.IDevice; -import org.tizen.sdblib.IDevice.Arch; -import org.tizen.sdblib.SdbCommandRejectedException; -import org.tizen.sdblib.SdbShellProcess; -import org.tizen.sdblib.TimeoutException; +import org.tizen.sdblib.exception.SdbCommandRejectedException; +import org.tizen.sdblib.exception.TimeoutException; +import org.tizen.sdblib.util.SdbShellProcess; @SuppressWarnings("restriction") public class TizenDebianLaunchDelegate extends AbstractCLaunchDelegate { diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegateForAttach.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegateForAttach.java index 58d06d4..498ea20 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegateForAttach.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegateForAttach.java @@ -62,8 +62,8 @@ import org.tizen.nativecommon.launch.TizenLaunchMessages; import org.tizen.nativeplatform.build.PlatformConfigurationManager; import org.tizen.nativeplatform.launch.wizards.PlatformLaunchUtils; import org.tizen.nativeplatform.pkgmgr.model.LocalPackage; -import org.tizen.sdblib.SdbCommandRejectedException; -import org.tizen.sdblib.TimeoutException; +import org.tizen.sdblib.exception.SdbCommandRejectedException; +import org.tizen.sdblib.exception.TimeoutException; public class TizenDebianLaunchDelegateForAttach extends TizenDebianLaunchDelegate { diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/TizenDebianMainAttachTab.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/TizenDebianMainAttachTab.java index a603c66..5f63143 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/TizenDebianMainAttachTab.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/TizenDebianMainAttachTab.java @@ -105,8 +105,8 @@ import org.tizen.nativeplatform.pkgmgr.RPMPackageCommander; import org.tizen.nativeplatform.pkgmgr.model.LocalPackage; import org.tizen.nativeplatform.rootstrap.RootstrapManager; -import org.tizen.sdblib.FileListingService.FileEntry; import org.tizen.sdblib.IDevice; +import org.tizen.sdblib.service.FileListingService.FileEntry; public class TizenDebianMainAttachTab extends CMainTab { diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/TizenDebianMainTab.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/TizenDebianMainTab.java index 7894edf..35cd442 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/TizenDebianMainTab.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/TizenDebianMainTab.java @@ -96,8 +96,8 @@ import org.tizen.nativeplatform.launch.wizards.PlatformLaunchUtils; import org.tizen.nativeplatform.pkgmgr.model.LocalPackage; import org.tizen.nativeplatform.rootstrap.RootstrapManager; -import org.tizen.sdblib.FileListingService.FileEntry; import org.tizen.sdblib.IDevice; +import org.tizen.sdblib.service.FileListingService.FileEntry; @SuppressWarnings({ "deprecation", "restriction" }) public class TizenDebianMainTab extends CMainTab { diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/TizenPathInputDialog.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/TizenPathInputDialog.java index eeff0e9..2aec3c9 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/TizenPathInputDialog.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/TizenPathInputDialog.java @@ -50,8 +50,8 @@ import org.tizen.common.connection.ui.TizenRemoteFileDialog; import org.tizen.common.connection.ui.TizenRemoteFileDialog.TizenRemoteFileDialogResult; import org.tizen.nativecommon.launch.TizenLaunchMessages; -import org.tizen.sdblib.FileListingService.FileEntry; import org.tizen.sdblib.IDevice; +import org.tizen.sdblib.service.FileListingService.FileEntry; public class TizenPathInputDialog extends Dialog { /** diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingBinPage.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingBinPage.java index 7f2552a..80361b8 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingBinPage.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingBinPage.java @@ -50,7 +50,7 @@ import org.tizen.nativeplatform.launch.wizards.PlatformLaunchWizard; import org.tizen.nativeplatform.launch.wizards.PlatformLaunchWizardDialog; import org.tizen.nativeplatform.views.ui.AddRootstrapDialog; import org.tizen.sdblib.IDevice; -import org.tizen.sdblib.FileListingService.FileEntry; +import org.tizen.sdblib.service.FileListingService.FileEntry; public class PlatformLaunchSettingBinPage extends WizardPage { diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchUtils.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchUtils.java index 04fcc85..5117566 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchUtils.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchUtils.java @@ -77,10 +77,10 @@ import org.tizen.nativeplatform.preferences.PreferencesManager; import org.tizen.nativeplatform.rootstrap.RootstrapManager; import org.tizen.nativeplatform.views.model.PlatformRootstrap; import org.tizen.sdblib.IDevice; -import org.tizen.sdblib.SdbCommandRejectedException; -import org.tizen.sdblib.SyncService; -import org.tizen.sdblib.SyncService.SyncResult; -import org.tizen.sdblib.TimeoutException; +import org.tizen.sdblib.exception.SdbCommandRejectedException; +import org.tizen.sdblib.exception.TimeoutException; +import org.tizen.sdblib.service.SyncService; +import org.tizen.sdblib.service.SyncService.SyncResult; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOuputReceiver.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOuputReceiver.java index 6dd62bd..9f9c3e2 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOuputReceiver.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOuputReceiver.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import org.eclipse.ui.console.MessageConsoleStream; -import org.tizen.sdblib.MultiLineReceiver; +import org.tizen.sdblib.receiver.MultiLineReceiver; public class PackageManagerOuputReceiver extends MultiLineReceiver { @@ -43,7 +43,7 @@ public class PackageManagerOuputReceiver extends MultiLineReceiver { public PackageManagerOuputReceiver() { super(); - setTrimLine(false); + setTrimLines(false); } public void setMessageConsoleStream(MessageConsoleStream mcs) { diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java index c55ec71..11f5ed1 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java @@ -52,11 +52,11 @@ import org.tizen.nativeplatform.pkgmgr.model.Package; import org.tizen.nativeplatform.util.CommandLauncher; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.IShellOutputReceiver; -import org.tizen.sdblib.SdbCommandRejectedException; -import org.tizen.sdblib.ShellCommandUnresponsiveException; -import org.tizen.sdblib.SyncService; -import org.tizen.sdblib.SyncService.SyncResult; -import org.tizen.sdblib.TimeoutException; +import org.tizen.sdblib.exception.SdbCommandRejectedException; +import org.tizen.sdblib.exception.ShellCommandUnresponsiveException; +import org.tizen.sdblib.exception.TimeoutException; +import org.tizen.sdblib.service.SyncService; +import org.tizen.sdblib.service.SyncService.SyncResult; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException;