[Command Bar] Fixed to hide a help tooltip, Modified FocusBehavior to hide prompt...

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

diff --git a/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/StatusBar.java b/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/StatusBar.java
index 0fdb9ae..5f669b4 100644 (file)
--- a/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/StatusBar.java
+++ b/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/StatusBar.java
@@ -38,6 +38,7 @@ import java.util.List;
 import org.eclipse.jface.preference.IPreferenceStore;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.custom.StyledText;\r
+import org.eclipse.swt.graphics.Cursor;\r
 import org.eclipse.swt.layout.RowData;\r
 import org.eclipse.swt.layout.RowLayout;\r
 import org.eclipse.swt.widgets.Composite;\r
@@ -45,6 +46,7 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;\r
 import org.eclipse.swt.widgets.Listener;\r
 import org.eclipse.ui.IWorkbenchWindow;\r
+import org.eclipse.ui.PlatformUI;\r
 import org.eclipse.ui.menus.AbstractWorkbenchTrimWidget;\r
 import org.mihalis.opal.promptSupport.PromptSupport;\r
 import org.mihalis.opal.promptSupport.PromptSupport.FocusBehavior;\r
@@ -52,7 +54,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;\r
 import org.tizen.common.CommonPlugin;\r
 import org.tizen.common.ui.Activator;\r
-import org.tizen.common.ui.HelpToolTip;\r
 import org.tizen.common.ui.commandbar.assistant.AssistantBubble;\r
 import org.tizen.common.ui.commandbar.assistant.AssistantBubble.Order;\r
 import org.tizen.common.ui.commandbar.command.HelpCommand;\r
@@ -112,16 +113,17 @@ public class StatusBar extends AbstractWorkbenchTrimWidget implements SubmitList
         final StyledText txt = fTxtAssist.getTextControl();\r
         PromptSupport.setPrompt("Search or type a command", txt);\r
         PromptSupport.setFontStyle(SWT.NONE, txt);\r
-        PromptSupport.setFocusBehavior(FocusBehavior.HIGHLIGHT_PROMPT, txt);\r
+        PromptSupport.setFocusBehavior(FocusBehavior.HIDE_PROMPT, txt);\r
         PromptSupport.setForeground(txt.getDisplay().getSystemColor(SWT.COLOR_GRAY), txt);\r
 \r
         fTxtAssist.setCustomFont(SWTUtil.deriveFont(fTxtAssist.getTableControl().getFont(), SWT.ITALIC));\r
         fTxtAssist.addSubmitListener(this);\r
         //fTxtAssist.addTableSelectionListener(this);\r
 \r
-        HelpToolTip toolTip = new HelpToolTip(fComposite);\r
-        toolTip.setText("Show command bar help");\r
-        toolTip.addControlSelectionListener(new Listener() {\r
+        Label helpIcon = new Label(fComposite, SWT.NONE);\r
+        helpIcon.setImage(PlatformUI.getWorkbench().getSharedImages().getImage("IMG_LCL_LINKTO_HELP"));\r
+        helpIcon.setCursor(new Cursor(helpIcon.getDisplay(), SWT.CURSOR_HAND));\r
+        helpIcon.addListener(SWT.MouseDown, new Listener() {\r
             @Override\r
             public void handleEvent(Event event) {\r
                 HelpCommand command = new HelpCommand(StatusBar.this);\r

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 b30710c..8cf661f 100644 (file)
--- 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
@@ -41,6 +41,7 @@ import org.tizen.common.util.ArrayUtil;
 import org.tizen.common.util.CollectionUtil;\r
 import org.tizen.common.util.ObjectUtil;\r
 import org.tizen.common.util.SWTUtil;\r
+import org.tizen.common.util.StringUtil;\r
 \r
 /**\r
  * Instances of this class are selectable user interface objects that allow the\r
@@ -379,7 +380,7 @@ public class TextAssist extends Composite {
                         return;\r
                     }\r
                     final String string = TextAssist.this.text.getText();\r
-                    if (string.length() == 0) {\r
+                    if (StringUtil.isEmpty(string)) {\r
                         TextAssist.this.popup.setVisible(false);\r
                         return;\r
                     }\r