summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-06-12 16:27:21 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2012-06-12 16:27:21 +0300
commit5fc8a1d9d0d4474af0465ecdb69bc586ab79a945 (patch)
treef7d0fc71d41c6761790e6b6408ceb88fab7eea19 /src
parent21e1ddb3f3e3c903c4f37b7df52a2bced688fc6e (diff)
parente978b997047573b1497a07f77f730195e3ea467a (diff)
downloadvaadin-framework-5fc8a1d9d0d4474af0465ecdb69bc586ab79a945.tar.gz
vaadin-framework-5fc8a1d9d0d4474af0465ecdb69bc586ab79a945.zip
Merge commit 'e978b99'
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java
index 00da2f3adf..08985cc471 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java
@@ -1691,7 +1691,6 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
suggestionPopup.hide();
}
- @Override
public Element getSubPartElement(String subPart) {
if ("textbox".equals(subPart)) {
return this.tb.getElement();
@@ -1701,7 +1700,6 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
return null;
}
- @Override
public String getSubPartName(Element subElement) {
if (tb.getElement().isOrHasChild(subElement)) {
return "textbox";