Changeset 7452 in josm

Timestamp:

2014-08-28T16:08:11+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10397: menu scroller simplification: remove possibility to define a fixed number of items at the bottom of the menu (unused feature)

File:

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

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

@@ -33 +33 @@
 /**
  * A class that provides scrolling capabilities to a long menu dropdown or
- * popup menu.  A number of items can optionally be frozen at the top and/or
- * bottom of the menu.
+ * popup menu. A number of items can optionally be frozen at the top of the menu.
  * <P>
  * <B>Implementation note:</B>  The default number of items to display
@@ -52 +51 @@
     private int interval;
     private int topFixedCount;
-    private int bottomFixedCount;
     private int firstIndex = 0;
     private int keepVisibleIndex = -1;
@@ -169 +167 @@
      * Registers a menu to be scrolled, with the specified number of items
      * to display in the scrolling region, the specified scrolling interval,
-     * and the specified numbers of items fixed at the top and bottom of the
-     * menu.
+     * and the specified numbers of items fixed at the top of the menu.
      *
      * @param menu the menu
@@ -176 +173 @@
      * @param interval the scroll interval, in milliseconds
      * @param topFixedCount the number of items to fix at the top.  May be 0.
-     * @param bottomFixedCount the number of items to fix at the bottom. May be 0
      * @throws IllegalArgumentException if scrollCount or interval is 0 or
-     * negative or if topFixedCount or bottomFixedCount is negative
+     * negative or if topFixedCount is negative
      * @return the MenuScroller
      */
     public static MenuScroller setScrollerFor(JMenu menu, int scrollCount, int interval,
-            int topFixedCount, int bottomFixedCount) {
-        return new MenuScroller(menu, scrollCount, interval,
-                topFixedCount, bottomFixedCount);
+            int topFixedCount) {
+        return new MenuScroller(menu, scrollCount, interval, topFixedCount);
     }
 
@@ -190 +185 @@
      * Registers a popup menu to be scrolled, with the specified number of items
      * to display in the scrolling region, the specified scrolling interval,
-     * and the specified numbers of items fixed at the top and bottom of the
-     * popup menu.
+     * and the specified numbers of items fixed at the top of the popup menu.
      *
      * @param menu the popup menu
@@ -197 +191 @@
      * @param interval the scroll interval, in milliseconds
      * @param topFixedCount the number of items to fix at the top.  May be 0
-     * @param bottomFixedCount the number of items to fix at the bottom.  May be 0
      * @throws IllegalArgumentException if scrollCount or interval is 0 or
-     * negative or if topFixedCount or bottomFixedCount is negative
+     * negative or if topFixedCount is negative
      * @return the MenuScroller
      */
     public static MenuScroller setScrollerFor(JPopupMenu menu, int scrollCount, int interval,
-            int topFixedCount, int bottomFixedCount) {
-        return new MenuScroller(menu, scrollCount, interval,
-                topFixedCount, bottomFixedCount);
+            int topFixedCount) {
+        return new MenuScroller(menu, scrollCount, interval, topFixedCount);
     }
 
@@ -267 +259 @@
      */
     public MenuScroller(JMenu menu, int scrollCount, int interval) {
-        this(menu, scrollCount, interval, 0, 0);
+        this(menu, scrollCount, interval, 0);
     }
 
@@ -281 +273 @@
      */
     public MenuScroller(JPopupMenu menu, int scrollCount, int interval) {
-        this(menu, scrollCount, interval, 0, 0);
+        this(menu, scrollCount, interval, 0);
     }
 
@@ -288 +280 @@
      * specified number of items to display in the scrolling region, the
      * specified scrolling interval, and the specified numbers of items fixed at
-     * the top and bottom of the menu.
+     * the top of the menu.
      *
      * @param menu the menu
@@ -294 +286 @@
      * @param interval the scroll interval, in milliseconds
      * @param topFixedCount the number of items to fix at the top.  May be 0
-     * @param bottomFixedCount the number of items to fix at the bottom.  May be 0
      * @throws IllegalArgumentException if scrollCount or interval is 0 or
-     * negative or if topFixedCount or bottomFixedCount is negative
-     */
-    public MenuScroller(JMenu menu, int scrollCount, int interval,
-            int topFixedCount, int bottomFixedCount) {
-        this(menu.getPopupMenu(), scrollCount, interval, topFixedCount, bottomFixedCount);
+     * negative or if topFixedCount is negative
+     */
+    public MenuScroller(JMenu menu, int scrollCount, int interval, int topFixedCount) {
+        this(menu.getPopupMenu(), scrollCount, interval, topFixedCount);
     }
 
@@ -307 +297 @@
      * specified number of items to display in the scrolling region, the
      * specified scrolling interval, and the specified numbers of items fixed at
-     * the top and bottom of the popup menu.
+     * the top of the popup menu.
      *
      * @param menu the popup menu
@@ -313 +303 @@
      * @param interval the scroll interval, in milliseconds
      * @param topFixedCount the number of items to fix at the top.  May be 0
-     * @param bottomFixedCount the number of items to fix at the bottom.  May be 0
      * @throws IllegalArgumentException if scrollCount or interval is 0 or
-     * negative or if topFixedCount or bottomFixedCount is negative
-     */
-    public MenuScroller(JPopupMenu menu, int scrollCount, int interval,
-            int topFixedCount, int bottomFixedCount) {
+     * negative or if topFixedCount is negative
+     */
+    public MenuScroller(JPopupMenu menu, int scrollCount, int interval, int topFixedCount) {
         if (scrollCount <= 0 || interval <= 0) {
             throw new IllegalArgumentException("scrollCount and interval must be greater than 0");
         }
-        if (topFixedCount < 0 || bottomFixedCount < 0) {
-            throw new IllegalArgumentException("topFixedCount and bottomFixedCount cannot be negative");
+        if (topFixedCount < 0) {
+            throw new IllegalArgumentException("topFixedCount cannot be negative");
         }
 
@@ -331 +319 @@
         setInterval(interval);
         setTopFixedCount(topFixedCount);
-        setBottomFixedCount(bottomFixedCount);
 
         this.menu = menu;
@@ -406 +393 @@
         }
         this.topFixedCount = topFixedCount;
-    }
-
-    /**
-     * Returns the number of items fixed at the bottom of the menu or popup menu.
-     *
-     * @return the number of items
-     */
-    public int getBottomFixedCount() {
-        return bottomFixedCount;
-    }
-
-    /**
-     * Sets the number of items to fix at the bottom of the menu or popup menu.
-     *
-     * @param bottomFixedCount the number of items
-     */
-    public void setBottomFixedCount(int bottomFixedCount) {
-        this.bottomFixedCount = bottomFixedCount;
     }
 
@@ -487 +456 @@
 
             firstIndex = Math.max(topFixedCount, firstIndex);
-            firstIndex = Math.min(numOfNonSepItems - bottomFixedCount - scrollCount, firstIndex);
+            firstIndex = Math.min(numOfNonSepItems - scrollCount, firstIndex);
 
             upItem.setEnabled(firstIndex > topFixedCount);
-            downItem.setEnabled(firstIndex + scrollCount < numOfNonSepItems - bottomFixedCount);
+            downItem.setEnabled(firstIndex + scrollCount < numOfNonSepItems);
 
             menu.removeAll();
@@ -505 +474 @@
             }
             menu.add(downItem);
-
-            if (bottomFixedCount > 0) {
-                menu.addSeparator();
-            }
-            for (int i = menuItems.length - bottomFixedCount; i < menuItems.length; i++) {
-                menu.add(menuItems[i]);
-            }
 
             int preferredWidth = 0;
@@ -546 +508 @@
             int numOfNonSepItems = getNumberOfNonSeparatorItems(menuItems);
             if (keepVisibleIndex >= topFixedCount
-                    && keepVisibleIndex <= numOfNonSepItems - bottomFixedCount
+                    && keepVisibleIndex <= numOfNonSepItems
                     && (keepVisibleIndex > firstIndex + scrollCount
                     || keepVisibleIndex < firstIndex)) {
@@ -552 +514 @@
                 firstIndex = Math.max(firstIndex, keepVisibleIndex - scrollCount + 1);
             }
-            if (numOfNonSepItems > topFixedCount + scrollCount + bottomFixedCount) {
+            if (numOfNonSepItems > topFixedCount + scrollCount) {
                 refreshMenu();
             }