Changeset 12705 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-09-01T01:07:32+02:00 (7 years ago)

Author:

michael2402

Message:

See #15167: Make size of the OSM download panel fixed, only allow resizing for overpass.

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• AbstractDownloadSourcePanel.java (modified) (3 diffs)
• DownloadDialog.java (modified) (6 diffs)
• DownloadSourceSizingPolicy.java (added)
• OverpassDownloadSource.java (modified) (4 diffs)

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.gui.download.DownloadSourceSizingPolicy.FixedDownloadSourceSizePolicy;
 
 /**
@@ -16 +17 @@
  */
 public abstract class AbstractDownloadSourcePanel<T> extends JPanel {
+
+    /**
+     * A prefix to be used for tab height preferences
+     */
+    public static final String TAB_SPLIT_NAMESPACE = "download.tabsplit.";
 
     /**
@@ -107 +113 @@
      */
     public abstract String getSimpleName();
+
+    /**
+     * Gets the policy that defines how this component should be sized
+     * @return The sizing policy. A fixed policy on default.
+     * @since 12705
+     */
+    public DownloadSourceSizingPolicy getSizingPolicy() {
+        return new FixedDownloadSourceSizePolicy(this);
+    }
 }

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

@@ -15 +15 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -62 +61 @@
 public class DownloadDialog extends JDialog {
 
-    /**
-     * Preference properties
-     */
-    private static final String TAB_SPLIT_NAMESPACE = "download.tabsplit.";
     private static final IntegerProperty DOWNLOAD_TAB = new IntegerProperty("download.tab", 0);
     private static final IntegerProperty DOWNLOAD_SOURCE_TAB = new IntegerProperty("download-source.tab", 0);
@@ -97 +92 @@
     protected SlippyMapChooser slippyMapChooser;
     protected JPanel mainPanel;
-    protected JSplitPane dialogSplit;
+    protected DownloadDialogSplitPane dialogSplit;
 
     /*
@@ -144 +139 @@
         tpDownloadAreaSelectors.setMinimumSize(new Dimension(0, 0));
 
-        dialogSplit = new JSplitPane(
-                JSplitPane.VERTICAL_SPLIT,
+        dialogSplit = new DownloadDialogSplitPane(
                 downloadSourcesTab,
                 tpDownloadAreaSelectors);
-        dialogSplit.addPropertyChangeListener(getDividerChangedListener());
 
         ChangeListener tabChangedListener = getDownloadSourceTabChangeListener();
@@ -556 +549 @@
             if (selectedComponent instanceof AbstractDownloadSourcePanel) {
                 AbstractDownloadSourcePanel<?> panel = (AbstractDownloadSourcePanel<?>) selectedComponent;
-                dialogSplit.setDividerLocation(Main.pref.getInteger(
-                        TAB_SPLIT_NAMESPACE + panel.getSimpleName(),
-                        panel.getMinimumSize().height));
-            }
-        };
-    }
-
-    /**
-     * Creates a listener that react on dialog splitters movements to save users preferences.
-     * @return A listener to save user preferred split of the dialog.
-     */
-    private PropertyChangeListener getDividerChangedListener() {
-        return evt -> {
-            if (evt.getPropertyName().equalsIgnoreCase(JSplitPane.DIVIDER_LOCATION_PROPERTY)) {
-                Component selectedComponent = downloadSourcesTab.getSelectedComponent();
-                if (selectedComponent instanceof AbstractDownloadSourcePanel) {
-                    AbstractDownloadSourcePanel<?> panel = (AbstractDownloadSourcePanel<?>) selectedComponent;
-                    Main.pref.put(
-                            TAB_SPLIT_NAMESPACE + panel.getSimpleName(),
-                            String.valueOf(dialogSplit.getDividerLocation())
-                    );
-                }
+                dialogSplit.setPolicy(panel.getSizingPolicy());
             }
         };
@@ -659 +631 @@
         }
     }
+
+    /**
+     * A special split pane that acts according to a {@link DownloadSourceSizingPolicy}
+     *
+     * It attempts to size the top tab content correctly.
+     *
+     * @author Michael Zangl
+     * @since 12705
+     */
+    private static class DownloadDialogSplitPane extends JSplitPane {
+        private DownloadSourceSizingPolicy policy;
+        private JTabbedPane topComponent;
+
+        DownloadDialogSplitPane(JTabbedPane newTopComponent, Component newBottomComponent) {
+            super(VERTICAL_SPLIT, newTopComponent, newBottomComponent);
+            this.topComponent = newTopComponent;
+        }
+
+        public void setPolicy(DownloadSourceSizingPolicy policy) {
+            this.policy = policy;
+
+            super.setDividerLocation(policy.getComponentHeight() + computeOffset());
+            setDividerSize(policy.isHeightAdjustable() ? 10 : 0);
+            setEnabled(policy.isHeightAdjustable());
+        }
+
+        @Override
+        public void doLayout() {
+            // We need to force this height before the layout manager is run.
+            // We cannot do this in the setDividerLocation, since the offset cannot be computed there.
+            int offset = computeOffset();
+            if (policy.isHeightAdjustable()) {
+                policy.storeHeight(Math.max(getDividerLocation() - offset, 0));
+            }
+            super.setDividerLocation(policy.getComponentHeight() + offset);
+            super.doLayout();
+        }
+
+        /**
+         * @return The difference between the content height and the divider location
+         */
+        private int computeOffset() {
+            Component selectedComponent = topComponent.getSelectedComponent();
+            return topComponent.getHeight() - (selectedComponent == null ? 0 : selectedComponent.getHeight());
+        }
+    }
 }

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

@@ -29 +29 @@
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.preferences.AbstractProperty;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.download.DownloadSourceSizingPolicy.AdjustableDownloadSizePolicy;
 import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -44 +47 @@
  */
 public class OverpassDownloadSource implements DownloadSource<OverpassDownloadSource.OverpassDownloadData> {
+
 
     @Override
@@ -81 +85 @@
     public static class OverpassDownloadSourcePanel extends AbstractDownloadSourcePanel<OverpassDownloadData> {
 
-        private JosmTextArea overpassQuery;
-        private OverpassQueryList overpassQueryList;
-
         private static final String SIMPLE_NAME = "overpassdownloadpanel";
+        private static final AbstractProperty<Integer> PANEL_SIZE_PROPERTY =
+                new IntegerProperty(TAB_SPLIT_NAMESPACE + SIMPLE_NAME, 150).cached();
         private static final BooleanProperty OVERPASS_QUERY_LIST_OPENED =
                 new BooleanProperty("download.overpass.query-list.opened", false);
         private static final String ACTION_IMG_SUBDIR = "dialogs";
+
+        private JosmTextArea overpassQuery;
+        private OverpassQueryList overpassQueryList;
 
         /**
@@ -278 +284 @@
         }
 
+        @Override
+        public DownloadSourceSizingPolicy getSizingPolicy() {
+            return new AdjustableDownloadSizePolicy(PANEL_SIZE_PROPERTY);
+        }
+
         /**
          * Action that delegates snippet creation to {@link OverpassQueryList#createNewItem()}.