- Timestamp:
- 2018-05-26T09:08:02+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
r13830 r13839 177 177 formats.setToolTipText(tr("Select image format for WMS layer")); 178 178 179 if (!GraphicsEnvironment.isHeadless() && 180 1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), tr("Add layers"), tr("Cancel")) { { 181 final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree()); 182 scrollPane.setPreferredSize(new Dimension(400, 400)); 183 final JPanel panel = new JPanel(new GridBagLayout()); 184 panel.add(scrollPane, GBC.eol().fill()); 185 panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL)); 186 setContent(panel); 187 } }.showDialog().getValue()) { 188 return null; 179 if (!GraphicsEnvironment.isHeadless()) { 180 ExtendedDialog dialog = new ExtendedDialog(Main.parent, tr("Select WMS layers"), tr("Add layers"), tr("Cancel")); 181 final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree()); 182 scrollPane.setPreferredSize(new Dimension(400, 400)); 183 final JPanel panel = new JPanel(new GridBagLayout()); 184 panel.add(scrollPane, GBC.eol().fill()); 185 panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL)); 186 dialog.setContent(panel); 187 188 if (dialog.showDialog().getValue() != 1) { 189 return null; 190 } 189 191 } 190 192 -
trunk/src/org/openstreetmap/josm/data/imagery/WMTSCapabilities.java
r13824 r13839 19 19 20 20 /** 21 * Constructor for the class 21 22 * 22 23 * @param baseUrl of this service … … 29 30 30 31 /** 31 * 32 * Adds layers to this WMTS service response 32 33 * @param layers layers to add to this document 33 34 */ … … 37 38 38 39 /** 39 * 40 * Layers of this WMTS service 40 41 * @return layers defined by this service 41 42 */ … … 45 46 46 47 /** 47 * 48 * base URL of this WMTS service 48 49 * @return base url for this service 49 50 */ … … 53 54 54 55 /** 55 * 56 * TransferMode for this service 56 57 * @return transfer mode (KVP or RESTful) for this service 57 58 */ -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r13733 r13839 1358 1358 if (info == null) { 1359 1359 List<Tile> allTiles = this.allExistingTiles(); 1360 info = new TileSetInfo();1361 info.hasLoadingTiles = allTiles.size() < this.size();1362 info.hasAllLoadedTiles = true;1360 TileSetInfo newInfo = new TileSetInfo(); 1361 newInfo.hasLoadingTiles = allTiles.size() < this.size(); 1362 newInfo.hasAllLoadedTiles = true; 1363 1363 for (Tile t : allTiles) { 1364 1364 if ("no-tile".equals(t.getValue("tile-info"))) { 1365 info.hasOverzoomedTiles = true;1365 newInfo.hasOverzoomedTiles = true; 1366 1366 } 1367 1367 if (t.isLoaded()) { 1368 1368 if (!t.hasError()) { 1369 info.hasVisibleTiles = true;1369 newInfo.hasVisibleTiles = true; 1370 1370 } 1371 1371 } else { 1372 info.hasAllLoadedTiles = false;1372 newInfo.hasAllLoadedTiles = false; 1373 1373 if (t.isLoading()) { 1374 info.hasLoadingTiles = true;1374 newInfo.hasLoadingTiles = true; 1375 1375 } 1376 1376 } 1377 1377 } 1378 info = newInfo; 1378 1379 } 1379 1380 }
Note:
See TracChangeset
for help on using the changeset viewer.