Changeset 11506 in josm for trunk/src/org

Timestamp:

2017-01-27T02:24:04+01:00 (7 years ago)

Author:

Don-vip

Message:

simplify MenuScroller

File:

• trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MenuScroller.java

@@ -48 +48 @@
     private final MenuScrollListener menuListener = new MenuScrollListener();
     private final MouseWheelListener mouseWheelListener = new MouseScrollListener();
-    private int interval;
     private int topFixedCount;
     private int firstIndex;
@@ -260 +259 @@
         }
 
-        upItem = new MenuScrollItem(MenuIcon.UP, -1);
-        downItem = new MenuScrollItem(MenuIcon.DOWN, +1);
-        setInterval(interval);
+        upItem = new MenuScrollItem(MenuIcon.UP, -1, interval);
+        downItem = new MenuScrollItem(MenuIcon.DOWN, +1, interval);
         setTopFixedCount(topFixedCount);
 
@@ -268 +266 @@
         menu.addPopupMenuListener(menuListener);
         menu.addMouseWheelListener(mouseWheelListener);
-    }
-
-    /**
-     * Returns the scroll interval in milliseconds
-     *
-     * @return the scroll interval in milliseconds
-     */
-    public int getInterval() {
-        return interval;
-    }
-
-    /**
-     * Sets the scroll interval in milliseconds
-     *
-     * @param interval the scroll interval in milliseconds
-     * @throws IllegalArgumentException if interval is 0 or negative
-     */
-    public void setInterval(int interval) {
-        if (interval <= 0) {
-            throw new IllegalArgumentException("interval must be greater than 0");
-        }
-        upItem.setInterval(interval);
-        downItem.setInterval(interval);
-        this.interval = interval;
     }
 
@@ -445 +419 @@
         private final MenuScrollTimer timer;
 
-        MenuScrollItem(MenuIcon icon, int increment) {
+        MenuScrollItem(MenuIcon icon, int increment, int interval) {
             setIcon(icon);
             setDisabledIcon(icon);
             timer = new MenuScrollTimer(increment, interval);
             addChangeListener(this);
-        }
-
-        public void setInterval(int interval) {
-            timer.setDelay(interval);
         }