[Title] Set Tizen icon to shell image

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

2 files changed, 8 insertions, 12 deletions

diff --git a/org.tizen.common.connection/icons/16_TIZEN_SDK_icon.png b/org.tizen.common.connection/icons/16_TIZEN_SDK_icon.png
new file mode 100644
index 000000000..1b75de141
--- /dev/null
+++ b/org.tizen.common.connection/icons/16_TIZEN_SDK_icon.png
diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileDialog.java b/org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileDialog.java
index e5a830d9a..634f420f0 100755
--- a/org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileDialog.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileDialog.java
@@ -50,13 +50,13 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.swt.widgets.TreeItem;
 import org.tizen.common.TizenPlatformConstants;
+import org.tizen.common.connection.ConnectionPlugin;
 import org.tizen.common.util.log.Logger;
 import org.tizen.sdblib.FileListingService.FileEntry;
 import org.tizen.sdblib.IDevice;
 import org.tizen.sdblib.MultiLineReceiver;
 
 public class TizenRemoteFileDialog {
-
     public enum TizenRemoteFileDialogResult {
         OK,
         CANCEL
@@ -77,8 +77,7 @@ public class TizenRemoteFileDialog {
     TizenRemoteFileContentProvider remoteContentProvider = null;
 
     public TizenRemoteFileDialog(Shell parent, String dlgTitle, IDevice device, boolean isDirOnly, String defaultPath) throws IllegalArgumentException {
-        if (parent == null || device == null)
-        {
+        if (parent == null || device == null) {
             throw new IllegalArgumentException();
         }
 
@@ -86,6 +85,7 @@ public class TizenRemoteFileDialog {
         shell = createNewShell(parent);
         shell.setText(dlgTitle);
         shell.setSize(300, 400);
+        shell.setImage(ConnectionPlugin.getImageDescriptorFromPlugin("icons/16_TIZEN_SDK_icon.png").createImage());
         shell.addListener(SWT.Traverse, new Listener() {
             public void handleEvent(Event event) {
                 switch (event.detail) {
@@ -141,8 +141,7 @@ public class TizenRemoteFileDialog {
         selectDefaultPath(defaultExpandedPath);
 
         // set default path to the top item.
-        if (pathTree.getSelection().length > 0)
-        {
+        if (pathTree.getSelection().length > 0) {
             pathTreeViewer.getTree().setTopItem(pathTree.getSelection()[0]);
         }
 
@@ -170,8 +169,7 @@ public class TizenRemoteFileDialog {
         TreeItem[] items = pathTree.getItems();
         TreeItem found = null;
         for (int i = 0; i < defaultExpandedPath.length; i++) {
-        	if (found != null)
-        	{
+        	if (found != null) {
         		items = found.getItems();
         	}
         	for (TreeItem item : items) {
@@ -368,8 +366,7 @@ public class TizenRemoteFileDialog {
         Display tmpDisplay = loopShell.getDisplay();
 
         while (!loopShell.isDisposed()) {
-            if (!tmpDisplay.readAndDispatch())
-            {
+            if (!tmpDisplay.readAndDispatch()) {
                 tmpDisplay.sleep();
             }
         }
@@ -377,8 +374,7 @@ public class TizenRemoteFileDialog {
     }
 
     private void setDefaultPath(final String corePath) {
-        if (corePath == null)
-        {
+        if (corePath == null) {
             defaultPath = "/";
         }
 
@@ -395,4 +391,4 @@ public class TizenRemoteFileDialog {
             Logger.error("Problem occurred while executing command '" + command + "'", e.getMessage(), e);
         }
     }
-}
\ No newline at end of file
+}