Changeset 13824 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2018-05-23T21:03:31+02:00 (6 years ago)

Author:

Don-vip

Message:

SonarQube - fix code style issues

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/imagery

Files:

• AddWMSLayerPanel.java (modified) (2 diffs)
• AddWMTSLayerPanel.java (modified) (4 diffs)
• WMSLayerTree.java (modified) (1 diff)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.data.imagery.LayerDetails;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -154 +155 @@
         if (wms != null && wms.buildRootUrl() != null) {
             wmsUrl.setText(wms.buildGetMapUrl(
-                    tree.getSelectedLayers().stream().map(x -> x.getName()).collect(Collectors.toList()),
+                    tree.getSelectedLayers().stream().map(LayerDetails::getName).collect(Collectors.toList()),
                     (List<String>) null,
                     (String) formats.getSelectedItem(),

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.util.Collections;
-import java.util.List;
-import java.util.Map.Entry;
 
 import javax.swing.JButton;
@@ -30 +28 @@
  * Panel for adding WMTS imagery sources
  * @author Wiktor Niesiobędzki
- *
+ * @since 8568
  */
 public class AddWMTSLayerPanel extends AddImageryPanel {
@@ -36 +34 @@
     private transient WMTSLayerSelection layerTable;
     private final JCheckBox setDefaultLayer = new JCheckBox(tr("Set default layer?"));
-    private List<Entry<String, List<Layer>>> layers;
-    
 
     /**
@@ -68 +64 @@
             try {
                 WMTSCapabilities capabilities = WMTSTileSource.getCapabilities(rawUrl.getText(), getCommonHeaders());
-                layers = WMTSTileSource.groupLayersByNameAndTileMatrixSet(capabilities.getLayers());
-                layerTable = new WMTSLayerSelection(layers);
+                layerTable = new WMTSLayerSelection(WMTSTileSource.groupLayersByNameAndTileMatrixSet(capabilities.getLayers()));
                 layerTable.getTable().getSelectionModel().addListSelectionListener(lsl -> {
                     if (layerTable.getSelectedLayer() != null) {

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

@@ -76 +76 @@
      */
     public void updateTree(WMSImagery wms) {
-        // treeRootNode = new DefaultMutableTreeNode();
         while (treeRootNode.getChildCount() > 0) {
             treeRootNode.remove(0);