From 579aa49ba5da45013613d3af299e7a3d069cc4c7 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Tue, 29 Aug 2006 09:26:45 +0000
Subject: [PATCH] Fix bug 153271: pressing enter in content assist should not
 send the command

---
 .../rse/shells/ui/view/CommandsViewPage.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java
index c91c893ed0a..1bce5476d86 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java
@@ -57,7 +57,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
@@ -82,12 +81,13 @@ FocusListener
 	{
 		private boolean checkState(Event event)
 		{
+			boolean isEnabled = !_inputEntry.isInCodeAssist();
 			if (event.character == '\r')
 			{
 				_inputEntry.setInCodeAssist(false);
 			}
 			
-			return !_inputEntry.isInCodeAssist();
+			return isEnabled;
 		}
 
 		public void handleEvent(Event e)
@@ -113,7 +113,7 @@ FocusListener
 				}
 				else if (e.stateMask == 262144)
 				{
-					if (((int)e.character) == 3)
+					if (e.character == 3)
 					{
 					    if (_inputEntry.getSelectedText().length() == 0)
 					    {
@@ -254,7 +254,7 @@ FocusListener
 
 			Table table = _viewer.getTable();
 
-			Display display = _viewer.getShell().getDisplay();
+			//Display display = _viewer.getShell().getDisplay();
 			Color bgcolour = _tabFolderPage.getBackground();
 
 			table.setBackground(bgcolour);
@@ -336,7 +336,7 @@ FocusListener
 	}
 	public void updateTheme()
 	{
-	    Display display = getViewer().getControl().getDisplay();
+	    //Display display = getViewer().getControl().getDisplay();
 	    IThemeManager mgr = PlatformUI.getWorkbench().getThemeManager();
 		Color bg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_BG_COLOR);
 		Color fg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_FG_COLOR);
@@ -355,7 +355,7 @@ FocusListener
 			return;
 
 		ISystemViewElementAdapter adapter = (ISystemViewElementAdapter) ((IAdaptable) element).getAdapter(ISystemViewElementAdapter.class);
-		boolean alreadyHandled = false;
+		//boolean alreadyHandled = false;
 		if (adapter != null)
 		{
 			if (adapter.hasChildren(element))
@@ -399,12 +399,12 @@ FocusListener
 				}
 				else
 				{
-					alreadyHandled = adapter.handleDoubleClick(element);
+					/*alreadyHandled =*/ adapter.handleDoubleClick(element);
 				}
 			}
 			else
 			{
-				alreadyHandled = adapter.handleDoubleClick(element);
+				/*alreadyHandled =*/ adapter.handleDoubleClick(element);
 			}
 		}
 	}