Committing issue http://gwt-code-reviews.appspot.com/2007, renaming SuggestBox.setSelectsFirstItem.
Review by:rjrjr
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4470 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/reference/code-museum/src/com/google/gwt/museum/client/defaultmuseum/VisualsForSuggestBox.java b/reference/code-museum/src/com/google/gwt/museum/client/defaultmuseum/VisualsForSuggestBox.java
index b0964e3..b7d0f78 100644
--- a/reference/code-museum/src/com/google/gwt/museum/client/defaultmuseum/VisualsForSuggestBox.java
+++ b/reference/code-museum/src/com/google/gwt/museum/client/defaultmuseum/VisualsForSuggestBox.java
@@ -119,7 +119,7 @@
private SuggestBox suggestBoxWithDefault() {
final SuggestBox b = new SuggestBox(girlsNamesWithDefault);
- b.setSelectsFirstItem(false);
+ b.setAutoSelectEnabled(false);
b.getTextBox().addMouseDownHandler(new MouseDownHandler() {
public void onMouseDown(MouseDownEvent event) {
diff --git a/reference/code-museum/src/com/google/gwt/museum/client/defaultmuseum/VisualsForSuggestBoxEvents.java b/reference/code-museum/src/com/google/gwt/museum/client/defaultmuseum/VisualsForSuggestBoxEvents.java
index 9d1dbb6..70ab7ad 100644
--- a/reference/code-museum/src/com/google/gwt/museum/client/defaultmuseum/VisualsForSuggestBoxEvents.java
+++ b/reference/code-museum/src/com/google/gwt/museum/client/defaultmuseum/VisualsForSuggestBoxEvents.java
@@ -84,10 +84,10 @@
final CheckBox selectsFirst = new CheckBox("Selects first suggestion");
selectsFirst.addValueChangeHandler(new ValueChangeHandler<Boolean>() {
public void onValueChange(ValueChangeEvent<Boolean> event) {
- b.setSelectsFirstItem(event.getValue());
+ b.setAutoSelectEnabled(event.getValue());
}
});
- selectsFirst.setChecked(b.getSelectsFirstItem());
+ selectsFirst.setChecked(b.isAutoSelectEnabled());
p.add(selectsFirst);
final EventReporter<String, SuggestBox> handler = new EventReporter<String, SuggestBox>(
report);
diff --git a/user/src/com/google/gwt/user/client/ui/SuggestBox.java b/user/src/com/google/gwt/user/client/ui/SuggestBox.java
index 02bede2..90a464e 100644
--- a/user/src/com/google/gwt/user/client/ui/SuggestBox.java
+++ b/user/src/com/google/gwt/user/client/ui/SuggestBox.java
@@ -388,16 +388,6 @@
}
/**
- * Returns whether or not the first suggestion will be automatically selected.
- * This behavior is off by default.
- *
- * @return true if the first suggestion will be automatically selected
- */
- public boolean getSelectsFirstItem() {
- return selectsFirstItem;
- }
-
- /**
* Gets the suggest box's {@link com.google.gwt.user.client.ui.SuggestOracle}.
*
* @return the {@link SuggestOracle}
@@ -439,6 +429,16 @@
}
/**
+ * Returns whether or not the first suggestion will be automatically selected.
+ * This behavior is on by default.
+ *
+ * @return true if the first suggestion will be automatically selected
+ */
+ public boolean isAutoSelectEnabled() {
+ return selectsFirstItem;
+ }
+
+ /**
* @return true if the list of suggestions is currently showing, false if not
*/
public boolean isSuggestionListShowing() {
@@ -478,6 +478,17 @@
suggestionPopup.setAnimationEnabled(enable);
}
+ /**
+ * Turns on or off the behavior that automatically selects the first suggested
+ * item. This behavior is on by default.
+ *
+ * @param selectsFirstItem Whether or not to automatically select the first
+ * suggestion
+ */
+ public void setAutoSelectEnabled(boolean selectsFirstItem) {
+ this.selectsFirstItem = selectsFirstItem;
+ }
+
public void setFocus(boolean focused) {
box.setFocus(focused);
}
@@ -502,17 +513,6 @@
suggestionPopup.setStyleName(style);
}
- /**
- * Turns on or off the behavior that automatically selects the first suggested
- * item. It defaults to off.
- *
- * @param selectsFirstItem Whether or not to automatically select the first
- * suggested
- */
- public void setSelectsFirstItem(boolean selectsFirstItem) {
- this.selectsFirstItem = selectsFirstItem;
- }
-
public void setTabIndex(int index) {
box.setTabIndex(index);
}
diff --git a/user/test/com/google/gwt/user/client/ui/SuggestBoxTest.java b/user/test/com/google/gwt/user/client/ui/SuggestBoxTest.java
index 82546d8..96e2f3c 100644
--- a/user/test/com/google/gwt/user/client/ui/SuggestBoxTest.java
+++ b/user/test/com/google/gwt/user/client/ui/SuggestBoxTest.java
@@ -40,10 +40,10 @@
assertEquals(5, box.getLimit());
// setSelectsFirstItem
- box.setSelectsFirstItem(true);
- assertTrue(box.getSelectsFirstItem());
- box.setSelectsFirstItem(false);
- assertFalse(box.getSelectsFirstItem());
+ box.setAutoSelectEnabled(true);
+ assertTrue(box.isAutoSelectEnabled());
+ box.setAutoSelectEnabled(false);
+ assertFalse(box.isAutoSelectEnabled());
// isSuggestionListShowing
assertFalse(box.isSuggestionListShowing());
@@ -93,11 +93,11 @@
public void testShowFirst() {
SuggestBox box = createSuggestBox();
- assertTrue(box.getSelectsFirstItem());
+ assertTrue(box.isAutoSelectEnabled());
SuggestBox box2 = createSuggestBox();
- assertTrue(box2.getSelectsFirstItem());
- box.setSelectsFirstItem(false);
- assertFalse(box.getSelectsFirstItem());
+ assertTrue(box2.isAutoSelectEnabled());
+ box.setAutoSelectEnabled(false);
+ assertFalse(box.isAutoSelectEnabled());
box.setText("t");
box.showSuggestionList();
// Todo(ecc) once event triggering is enabled, submit a return key to the
