From 436dd2236e63fc8625147d353fe8e74538c11ecc Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sat, 22 Mar 2014 14:44:54 +0700
Subject: [PATCH] IDEMPIERE-1777:improvement behavior of WSearchEditor

---
 .../adempiere/webui/editor/WSearchEditor.java | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
index 1db172a23c..3d1e357fba 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
@@ -233,6 +233,12 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 				infoPanel.detach();
 		 	 	infoPanel = null;
 		 	}
+			// hsv: fix to when switch has text => emtpy text, don't show info panel
+			if ("".equals(getComponent().getText().trim())){
+				actionCombo(null);
+				resetButtonState();
+				return;
+			}
 			actionText(getComponent().getText());
 		}
 		else if ((Events.ON_OK.equals(e.getName()))) {
@@ -264,14 +270,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 	{
 		if ("FieldValue".equals(evt.getPropertyName()))
 		{
-			if ( evt.getNewValue()== null)
-			{
-				actionRefresh("");
-			}
-			else
-			{
-				actionRefresh(evt.getNewValue());
-			}
+			actionRefresh(evt.getNewValue());
 		}
 	}
 
@@ -578,12 +577,14 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 					if (log.isLoggable(Level.CONFIG)) log.config(getColumnName() + " - Result = null (cancelled)");
 					if (value != null) 
 					{
-						if (lookup.getDisplay(value).equals(getComponent().getText()))
-						{
-							return;
+						if (!lookup.getDisplay(value).equals(getComponent().getText())){
+							getComponent().setText(lookup.getDisplay(value));
+							
 						}
-					}
-					actionCombo(null);
+					}else{
+						getComponent().setText("");
+						actionCombo(null);
+					}						
 				}
 				else
 				{