Browse Source

Eliminate unnecessary conversions of option keys

Change-Id: I5f3b267cec0357fe1a1c1a13bafdf3c1f3b6d426
tags/7.0.6
Henri Sara 11 years ago
parent
commit
6d7f5e4bc9

+ 3
- 3
client/src/com/vaadin/client/ui/VFilterSelect.java View File

@@ -147,8 +147,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
*
* @return The key of the item
*/
public int getOptionKey() {
return Integer.parseInt(key);
public String getOptionKey() {
return key;
}

/**
@@ -1281,7 +1281,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
newKey = "";
} else {
// normal selection
newKey = String.valueOf(suggestion.getOptionKey());
newKey = suggestion.getOptionKey();
}

String text = suggestion.getReplacementString();

+ 1
- 2
client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java View File

@@ -131,8 +131,7 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
if (optionUidl.hasAttribute("selected")) {
if (!getWidget().waitingForFilteringResponse
|| getWidget().popupOpenerClicked) {
String newSelectedOptionKey = Integer.toString(suggestion
.getOptionKey());
String newSelectedOptionKey = suggestion.getOptionKey();
if (!newSelectedOptionKey
.equals(getWidget().selectedOptionKey)
|| suggestion.getReplacementString().equals(

Loading…
Cancel
Save