diff options
author | Henri Sara <henri.sara@itmill.com> | 2011-09-01 10:57:37 +0000 |
---|---|---|
committer | Henri Sara <henri.sara@itmill.com> | 2011-09-01 10:57:37 +0000 |
commit | 84d95e404d24a639412a4c39712deac948f378b6 (patch) | |
tree | e3c35d6fe40a55beae95642cba63347d53ab05f3 /src | |
parent | 5ffa4eb1f2827c70db5078c39efb3f652b59a259 (diff) | |
download | vaadin-framework-84d95e404d24a639412a4c39712deac948f378b6.tar.gz vaadin-framework-84d95e404d24a639412a4c39712deac948f378b6.zip |
Reformatted VFilterSelect
svn changeset:20787/svn branch:6.7
Diffstat (limited to 'src')
-rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java index 3833bbfd48..77d0fcbbb9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java @@ -323,34 +323,36 @@ public class VFilterSelect extends Composite implements Paintable, Field, * of consecutive mouse wheel events the pages does not flicker. */ private LazyPageScroller lazyPageScroller = new LazyPageScroller(); + private class LazyPageScroller extends Timer { private int pagesToScroll = 0; @Override public void run() { - if(pagesToScroll != 0){ - filterOptions(currentPage + pagesToScroll, lastFilter); - pagesToScroll = 0; - } + if (pagesToScroll != 0) { + filterOptions(currentPage + pagesToScroll, lastFilter); + pagesToScroll = 0; + } } - public void scrollUp() { - if(currentPage + pagesToScroll > 0){ - pagesToScroll--; - cancel(); - schedule(100); - } + public void scrollUp() { + if (currentPage + pagesToScroll > 0) { + pagesToScroll--; + cancel(); + schedule(100); + } } - public void scrollDown() { - if(totalMatches > (currentPage + pagesToScroll +1)*pageLength){ - pagesToScroll++; - cancel(); - schedule(100); - } + public void scrollDown() { + if (totalMatches > (currentPage + pagesToScroll + 1) + * pageLength) { + pagesToScroll++; + cancel(); + schedule(100); + } } } - + /* * (non-Javadoc) * @@ -363,16 +365,16 @@ public class VFilterSelect extends Composite implements Paintable, Field, if (event.getTypeInt() == Event.ONCLICK) { final Element target = DOM.eventGetTarget(event); if (target == up || target == DOM.getChild(up, 0)) { - lazyPageScroller.scrollUp(); + lazyPageScroller.scrollUp(); } else if (target == down || target == DOM.getChild(down, 0)) { - lazyPageScroller.scrollDown(); + lazyPageScroller.scrollDown(); } - } else if (event.getTypeInt() == Event.ONMOUSEWHEEL) { + } else if (event.getTypeInt() == Event.ONMOUSEWHEEL) { int velocity = event.getMouseWheelVelocityY(); - if (velocity > 0) { - lazyPageScroller.scrollDown(); + if (velocity > 0) { + lazyPageScroller.scrollDown(); } else { - lazyPageScroller.scrollUp(); + lazyPageScroller.scrollUp(); } } @@ -507,6 +509,7 @@ public class VFilterSelect extends Composite implements Paintable, Field, * com.google.gwt.event.logical.shared.CloseHandler#onClose(com.google * .gwt.event.logical.shared.CloseEvent) */ + @Override public void onClose(CloseEvent<PopupPanel> event) { if (event.isAutoClosed()) { lastAutoClosed = (new Date()).getTime(); |