MISC: package version up (2.1.139) - Fixes for Command Bar

- Command Bar
 - Prevented 'sdb dlog' and 'sdb status-window'
 - Removed gradient by the error 'BadPixmap (invalid Pixmap parameter)'

Change-Id: If69245d572712968db0a482bf8c6912ced872061
Signed-off-by: kh5325.kim <kh5325.kim@samsung.com>

4 files changed, 19 insertions, 3 deletions

diff --git a/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/command/SdbCommand.java b/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/command/SdbCommand.java
index d86e9b2c8..eba4f0acb 100644
--- a/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/command/SdbCommand.java
+++ b/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/command/SdbCommand.java
@@ -46,13 +46,17 @@ public class SdbCommand extends ConsoleCommand {
         }
     }
 
+    private boolean isInteractiveCommand(String cmd) {
+        return "shell".equals(cmd) || "dlog".equals(cmd) || "status-window".equals(cmd);
+    }
+
     private boolean check(String[] opts) {
         // "sdb shell" or "sdb shell su" can cause IDE hang by its interactive shell
-        if (opts != null && opts.length >= 1 && "shell".equals(opts[0])) {
+        if (opts != null && opts.length >= 1 && isInteractiveCommand(opts[0])) {
             ConsoleManager console = new ConsoleManager(CONSOLE_NAME, true);
             final MessageConsoleStream stream = console.getMessageConsoleStream();
             try {
-                stream.println("Interactive command 'sdb shell' is not supported.");
+                stream.println(String.format("Interactive command 'sdb %s' is not supported.", opts[0]));
                 return false;
             } finally {
                 IOUtil.tryClose(stream);
diff --git a/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/textAssist/TextAssist.java b/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/textAssist/TextAssist.java
index a9d5e6591..5be079c48 100644
--- a/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/textAssist/TextAssist.java
+++ b/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/textAssist/TextAssist.java
@@ -218,6 +218,9 @@ public class TextAssist extends Composite {
             }

         });

         addSelectOnFocusToText(text);

+        // Removed gradient by the error 'BadPixmap (invalid Pixmap parameter)'

+        //  cf.)) https://bugs.eclipse.org/bugs/show_bug.cgi?id=236324

+        /*

         this.text.addListener(SWT.Resize, new Listener() {

             public void handleEvent(Event event) {

                 Display display = SWTUtil.getDisplay();

@@ -234,6 +237,7 @@ public class TextAssist extends Composite {
                 oldImage = newImage;

             }

         });

+        */

         column1 = new TableColumn(table, SWT.NONE);

         column2 = new TableColumn(table, SWT.NONE);

     }

@@ -414,6 +418,9 @@ public class TextAssist extends Composite {
     }

 

     public void showPopup(List<String[]> values, List<String[]>[] customValuesArray, boolean remainsOnEnter) {

+        if (TextAssist.this.text.isDisposed())

+            return;

+

         TextAssist.this.table.removeAll();

         // Recommendations

         if (customValuesArray != null) {

diff --git a/package/changelog b/package/changelog
index cd75d45f5..cd16caf00 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,8 @@
+* 2.1.139
+- Command Bar
+ - Prevented 'sdb dlog' and 'sdb status-window'
+ - Removed gradient by the error 'BadPixmap (invalid Pixmap parameter)'
+== kh5325.kim <kh5325.kim@samsung.com> 2014-01-23
 * 2.1.138
 - Add LinkDialog
 == hyunsik.noh <hyunsik.noh@samsung.com> 2014-01-21
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index f3a08590f..90250e749 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.138
+Version:2.1.139
 Source:common-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>, shingil kang <shingil.kang@samsung.com>