Changeset 14418 in josm for trunk/src/org/openstreetmap/josm/gui/download/DownloadSourceSizingPolicy.java

Timestamp:

2018-11-07T22:38:38+01:00 (5 years ago)

Author:

michael2402

Message:

Fix #16945: Only store changed overpass height if user changes it. Add minimum size to overpass query / map view

File:

• trunk/src/org/openstreetmap/josm/gui/download/DownloadSourceSizingPolicy.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/download/DownloadSourceSizingPolicy.java

@@ -3 +3 @@
 
 import java.awt.Component;
+import java.util.function.IntSupplier;
 
 import org.openstreetmap.josm.data.preferences.AbstractProperty;
@@ -67 +68 @@
 
         private final AbstractProperty<Integer> preference;
+        private IntSupplier minHeight;
 
         /**
          * Create a new {@link AdjustableDownloadSizePolicy}
-         * @param preference The preference key to use
+         * @param preference The preference to use
          */
         public AdjustableDownloadSizePolicy(AbstractProperty<Integer> preference) {
+            this(preference, () -> 1);
+        }
+
+        /**
+         * Create a new {@link AdjustableDownloadSizePolicy}
+         * @param preference The preference to use
+         * @param minHeight A supplier that gives the minimum height of the component. Must be positive or 0.
+         * @since 14418
+         */
+        public AdjustableDownloadSizePolicy(AbstractProperty<Integer> preference, IntSupplier minHeight) {
             this.preference = preference;
+            this.minHeight = minHeight;
         }
 
         @Override
         public int getComponentHeight() {
-            return Math.max(1, preference.get());
+            int computedMinHeight = this.minHeight.getAsInt();
+            if (computedMinHeight < 0) {
+                throw new IllegalStateException("Illegal minimum component height:" + computedMinHeight);
+            }
+            return Math.max(computedMinHeight, preference.get());
         }