Changeset 9081 in josm

Timestamp:

2015-12-02T21:41:41+01:00 (9 years ago)

Author:

wiktorn

Message:

FIx missing scrollbar on WMTS layer selection list. Closes #12151.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (3 diffs)
• test/data/wmts/getCapabilities-lots-of-layers.xml (added)
• test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.awt.Point;
@@ -25 +24 @@
 
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
@@ -200 +200 @@
                         }
                     });
-            this.list.setPreferredSize(new Dimension(400, 400));
             this.list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
             this.list.setRowSelectionAllowed(true);
             this.list.setColumnSelectionAllowed(false);
             JPanel panel = new JPanel(new GridBagLayout());
-            panel.add(this.list, GBC.eol().fill());
+            panel.add(new JScrollPane(this.list), GBC.eol().fill());
             setContent(panel);
         }

trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

@@ -30 +30 @@
     private ImageryInfo testImageryWALLONIE = getImagery("test/data/wmts/WMTSCapabilities-Wallonie.xml");
     private ImageryInfo testImageryOntario = getImagery("test/data/wmts/WMTSCapabilities-Ontario.xml");
+    private ImageryInfo testLotsOfLayers = getImagery("test/data/wmts/getCapabilities-lots-of-layers.xml");
 
     /**
@@ -101 +102 @@
     }
 
-    //TODO: @Test - disable this test, needs further working
+    // XXX - disable this test, needs further working
+    // @Test
     public void testWALLONIENoMatrixDimension() throws MalformedURLException, IOException {
         Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
@@ -208 +210 @@
     }
 
-    // disabled as this needs user action
-    // @Test
+    // XXX: disabled as this needs user action
+    //@Test
     public void testTwoTileSetsForOneProjection() throws Exception {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
@@ -216 +218 @@
         verifyTile(new LatLon(45.4105023, -75.7153702), testSource, 303751, 375502, 12);
         verifyTile(new LatLon(45.4601306, -75.7617187), testSource, 1186, 1466, 4);
+
+    }
+
+    // XXX: disabled as this needs user action
+    // @Test
+    public void testManyLayersScrollbars() throws Exception {
+        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        WMTSTileSource testSource = new WMTSTileSource(testLotsOfLayers);
+        testSource.initProjection(Main.getProjection());
 
     }