Changeset 13746 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java

Timestamp:

2018-05-13T11:41:14+02:00 (6 years ago)

Author:

wiktorn

Message:

Add filter for WMTS layers, calculate preferred widths for columns.

See: #16249

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.io.IOException;
@@ -16 +15 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
 
 import org.openstreetmap.josm.data.imagery.DefaultLayer;
@@ -26 +23 @@
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.Layer;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
+import org.openstreetmap.josm.gui.layer.imagery.WMTSLayerSelection;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
@@ -36 +34 @@
 public class AddWMTSLayerPanel extends AddImageryPanel {
     private final transient JPanel layerPanel = new JPanel(new GridBagLayout());
-    private transient JTable layerTable;
+    private transient WMTSLayerSelection layerTable;
     private final JCheckBox setDefaultLayer = new JCheckBox(tr("Set default layer?"));
     private List<Entry<String, List<Layer>>> layers;
@@ -69 +67 @@
                 WMTSCapabilities capabilities = WMTSTileSource.getCapabilities(rawUrl.getText(), getCommonHeaders());
                 layers = WMTSTileSource.groupLayersByNameAndTileMatrixSet(capabilities.getLayers());
-                layerTable = WMTSTileSource.getLayerSelectionPanel(layers);
+                layerTable = new WMTSLayerSelection(layers);
                 layerPanel.removeAll();
-                JScrollPane scrollPane = new JScrollPane(layerTable);
-                scrollPane.setPreferredSize(new Dimension(100, 100));
-                layerPanel.add(scrollPane, GBC.eol().fill());
+                layerPanel.add(layerTable, GBC.eol().fill());
                 layerPanel.revalidate();
             } catch (IOException | WMTSGetCapabilitiesException ex) {
@@ -93 +89 @@
                 throw new IllegalArgumentException(tr("You need to get fetch layers"));
             }
-            int index = layerTable.getSelectedRow();
-            if (index < 0) {
-                throw new IllegalArgumentException(tr("Invalid layer selected. Index: {1}", index));
-            }
-            Layer selectedLayer = layers.get(layerTable.convertRowIndexToModel(index)).getValue().get(0);
+            Layer selectedLayer = layerTable.getSelectedLayer();
             ret.setDefaultLayers(
                     Collections.<DefaultLayer>singletonList(