Fix SuggestBox related deprecation warnings

We always use the DefaultSuggestionDisplay so its reasonable to
perform the downcast here to that type in order to control the
UI as we want it to behave.

Change-Id: Id48fdaf59ece74abe67773c800f23c3b8312ff3c
Signed-off-by: Shawn O. Pearce <sop@google.com>

4 files changed, 12 insertions, 6 deletions

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java
index 82e6b786d0..41f0540c00 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java
@@ -41,6 +41,7 @@ import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.SuggestBox;
+import com.google.gwt.user.client.ui.SuggestBox.DefaultSuggestionDisplay;
 import com.google.gwt.user.client.ui.SuggestOracle.Suggestion;
 import com.google.gwtexpui.globalkey.client.GlobalKey;
 import com.google.gwtexpui.globalkey.client.HidePopupPanelCommand;
@@ -173,7 +174,8 @@ public class MyWatchedProjectsScreen extends SettingsScreen implements
         submitOnSelection = false;
 
         if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER) {
-          if (nameTxt.isSuggestionListShowing()) {
+          if (((DefaultSuggestionDisplay) nameTxt.getSuggestionDisplay())
+              .isSuggestionListShowing()) {
             submitOnSelection = true;
           } else {
             doAddNew();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddIncludedGroupBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddIncludedGroupBox.java
index f6d8a4a436..60b8ccb1c9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddIncludedGroupBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddIncludedGroupBox.java
@@ -28,6 +28,7 @@ import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.SuggestBox;
+import com.google.gwt.user.client.ui.SuggestBox.DefaultSuggestionDisplay;
 import com.google.gwt.user.client.ui.SuggestOracle.Suggestion;
 
 public class AddIncludedGroupBox extends Composite {
@@ -52,7 +53,8 @@ public class AddIncludedGroupBox extends Composite {
         submitOnSelection = false;
 
         if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER) {
-          if (nameTxt.isSuggestionListShowing()) {
+          if (((DefaultSuggestionDisplay) nameTxt.getSuggestionDisplay())
+              .isSuggestionListShowing()) {
             submitOnSelection = true;
           } else {
             doAdd();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
index 3e2c09c0e3..c63ae84a9f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
@@ -15,8 +15,6 @@
 package com.google.gerrit.client.ui;
 
 import com.google.gerrit.client.admin.Util;
-import com.google.gerrit.client.ui.HintTextBox;
-import com.google.gerrit.client.ui.RPCSuggestOracle;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.KeyCodes;
@@ -28,6 +26,7 @@ import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.SuggestBox;
+import com.google.gwt.user.client.ui.SuggestBox.DefaultSuggestionDisplay;
 import com.google.gwt.user.client.ui.SuggestOracle.Suggestion;
 
 public class AddMemberBox extends Composite {
@@ -52,7 +51,8 @@ public class AddMemberBox extends Composite {
         submitOnSelection = false;
 
         if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER) {
-          if (nameTxt.isSuggestionListShowing()) {
+          if (((DefaultSuggestionDisplay) nameTxt.getSuggestionDisplay())
+              .isSuggestionListShowing()) {
             submitOnSelection = true;
           } else {
             doAdd();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java
index 6575b61d2d..814fb1fd4f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java
@@ -27,6 +27,7 @@ import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwtexpui.globalkey.client.NpTextBox;
 import com.google.gwt.user.client.ui.SuggestBox;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.SuggestBox.DefaultSuggestionDisplay;
 
 
 public class HintTextBox extends NpTextBox {
@@ -152,7 +153,8 @@ public class HintTextBox extends NpTextBox {
         ((SuggestBox)p).showSuggestionList();
 
         // The suggestion list lingers if we don't hide it.
-        ((SuggestBox)p).hideSuggestionList();
+        ((DefaultSuggestionDisplay) ((SuggestBox) p).getSuggestionDisplay())
+            .hideSuggestions();
       }
 
       setFocus(false);