Changeset 13734 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java

Timestamp:

2018-05-12T14:19:28+02:00 (6 years ago)

Author:

wiktorn

Message:

GUI for imagery definitions refactor

Extend preferences panel by:

• allowing setting default layers for WMS / WMTS
• allowing setting minimum expires (expert mode)
• allowing setting custom headers (expert mode)

See: #15981, #7953, #16224, #15940, #16249

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.imagery;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.awt.Component;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.swing.JOptionPane;
 import javax.swing.JTree;
 import javax.swing.event.TreeSelectionEvent;
@@ -18 +16 @@
 import javax.swing.tree.TreePath;
 
+import org.openstreetmap.josm.data.imagery.LayerDetails;
 import org.openstreetmap.josm.io.imagery.WMSImagery;
 
@@ -27 +26 @@
     private final DefaultTreeModel treeData = new DefaultTreeModel(treeRootNode);
     private final JTree layerTree = new JTree(treeData);
-    private final List<WMSImagery.LayerDetails> selectedLayers = new LinkedList<>();
-    private boolean previouslyShownUnsupportedCrsError;
+    private final List<LayerDetails> selectedLayers = new LinkedList<>();
 
     /**
@@ -50 +48 @@
      * @return the list of selected layers
      */
-    public List<WMSImagery.LayerDetails> getSelectedLayers() {
+    public List<LayerDetails> getSelectedLayers() {
         return selectedLayers;
     }
@@ -62 +60 @@
     }
 
-    void addLayersToTreeData(MutableTreeNode parent, List<WMSImagery.LayerDetails> layers) {
-        for (WMSImagery.LayerDetails layerDetails : layers) {
+    void addLayersToTreeData(MutableTreeNode parent, Collection<LayerDetails> layers) {
+        for (LayerDetails layerDetails : layers.stream()
+                .sorted((l1, l2) -> -1 * l1.toString().compareTo(l2.toString()))
+                .toArray(LayerDetails[]::new)
+                ) {
             DefaultMutableTreeNode treeNode = new DefaultMutableTreeNode(layerDetails);
-            addLayersToTreeData(treeNode, layerDetails.children);
+            addLayersToTreeData(treeNode, layerDetails.getChildren());
             treeData.insertNodeInto(treeNode, parent, 0);
         }
@@ -71 +72 @@
 
     /**
-     * Updates the whole tree with the given WMS imagery info.
+     * Updates the whole tree with the given WMS imagery info. All previous content is removed
      * @param wms The imagery info for a given WMS server
      */
     public void updateTree(WMSImagery wms) {
-        treeRootNode.setUserObject(wms.getServiceUrl().getHost());
+        // treeRootNode = new DefaultMutableTreeNode();
+        while (treeRootNode.getChildCount() > 0) {
+            treeRootNode.remove(0);
+        }
+        treeRootNode.setUserObject(wms.buildRootUrl());
         updateTreeList(wms.getLayers());
     }
@@ -83 +88 @@
      * @param layers The list of layers to add to the root node
      */
-    public void updateTreeList(List<WMSImagery.LayerDetails> layers) {
+    public void updateTreeList(Collection<LayerDetails> layers) {
         addLayersToTreeData(getTreeRootNode(), layers);
         getLayerTree().expandRow(0);
@@ -98 +103 @@
             DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value;
             Object userObject = treeNode.getUserObject();
-            if (userObject instanceof WMSImagery.LayerDetails) {
-                WMSImagery.LayerDetails layer = (WMSImagery.LayerDetails) userObject;
-                setEnabled(layer.isSupported());
+            if (userObject instanceof LayerDetails) {
+                LayerDetails ld = (LayerDetails) userObject;
+                setEnabled(ld.isSelectable());
             }
             return this;
@@ -118 +123 @@
             for (TreePath i : selectionRows) {
                 Object userObject = ((DefaultMutableTreeNode) i.getLastPathComponent()).getUserObject();
-                if (userObject instanceof WMSImagery.LayerDetails) {
-                    WMSImagery.LayerDetails detail = (WMSImagery.LayerDetails) userObject;
-                    if (!detail.isSupported()) {
-                        layerTree.removeSelectionPath(i);
-                        if (!previouslyShownUnsupportedCrsError) {
-                            JOptionPane.showMessageDialog(null, tr("That layer does not support any of JOSM''s projections,\n" +
-                                    "so you can not use it. This message will not show again."),
-                                    tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-                            previouslyShownUnsupportedCrsError = true;
-                        }
-                    } else if (detail.ident != null) {
+                if (userObject instanceof LayerDetails) {
+                    LayerDetails detail = (LayerDetails) userObject;
+                    if (detail.isSelectable()) {
                         selectedLayers.add(detail);
                     }