Ignore:
Timestamp:
2018-05-23T21:03:31+02:00 (7 years ago)
Author:
Don-vip
Message:

SonarQube - fix code style issues

Location:
trunk/src/org/openstreetmap/josm/data/imagery
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java

    r13742 r13824  
    126126            if (XMLStreamReader.START_ELEMENT == event) {
    127127                if (level > 0) {
    128                     ret.append("<" + reader.getLocalName() +">");
     128                    ret.append('<').append(reader.getLocalName()).append('>');
    129129                }
    130130                level += 1;
    … …  
    134134                    return ret.toString();
    135135                }
    136                 ret.append("</" + reader.getLocalName() +">");
     136                ret.append("</").append(reader.getLocalName()).append('>');
    137137            } else if (XMLStreamReader.CHARACTERS == event) {
    138138                ret.append(reader.getText());

  • trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

    r13792 r13824  
    409409            modTileFeatures = i.isModTileFeatures();
    410410            if (!i.defaultLayers.isEmpty()) {
    411                 default_layers = i.defaultLayers.stream().map(x -> x.toJson()).collect(JsonCollectors.toJsonArray()).toString();
     411                default_layers = i.defaultLayers.stream().map(DefaultLayer::toJson).collect(JsonCollectors.toJsonArray()).toString();
    412412            }
    413413            customHttpHeaders = i.customHttpHeaders;

  • trunk/src/org/openstreetmap/josm/data/imagery/LayerDetails.java

    r13818 r13824  
    1515 */
    1616public class LayerDetails {
    17     private Map<String, String> styles = new ConcurrentHashMap<>(); // name -> title
    18     private Collection<String> crs = new ArrayList<>();
     17    private final Map<String, String> styles = new ConcurrentHashMap<>(); // name -> title
     18    private final Collection<String> crs = new ArrayList<>();
    1919    /**
    2020     * The layer name (WMS {@code Title})
    … …  
    3030     */
    3131    private String abstr;
    32     private LayerDetails parentLayer;
     32    private final LayerDetails parentLayer;
    3333    private Bounds bounds;
    3434    private List<LayerDetails> children = new ArrayList<>();

  • trunk/src/org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java

    r13742 r13824  
    2424 *
    2525 * @author Wiktor Niesiobedzki
    26  *
     26 * @since 13733
    2727 */
    2828public class WMSEndpointTileSource extends AbstractWMSTileSource implements TemplatedTileSource {
    2929
    3030    private final WMSImagery wmsi;
    31     private List<DefaultLayer> layers;
    32     private String urlPattern;
     31    private final List<DefaultLayer> layers;
     32    private final String urlPattern;
    3333    private static final Pattern PATTERN_PARAM = Pattern.compile("\\{([^}]+)\\}");
    3434    private final Map<String, String> headers = new ConcurrentHashMap<>();

  • trunk/src/org/openstreetmap/josm/data/imagery/WMTSCapabilities.java

    r13733 r13824  
    1111 *
    1212 * @author Wiktor Niesiobedzki
    13  *
     13 * @since 13733
    1414 */
    1515public class WMTSCapabilities {
    16     private String baseUrl;
    17     private TransferMode transferMode;
     16    private final String baseUrl;
     17    private final TransferMode transferMode;
    1818    private Collection<Layer> layers;
    19 
    2019
    2120    /**
    … …  
    3534    public void addLayers(Collection<Layer> layers) {
    3635        this.layers = layers;
    37 
    3836    }
    3937

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

    r13759 r13824  
    274274
    275275    private static final class SelectLayerDialog extends ExtendedDialog {
    276         private final transient List<Entry<String, List<Layer>>> layers;
    277276        private final WMTSLayerSelection list;
    278277
    279278        SelectLayerDialog(Collection<Layer> layers) {
    280279            super(Main.parent, tr("Select WMTS layer"), tr("Add layers"), tr("Cancel"));
    281             this.layers = groupLayersByNameAndTileMatrixSet(layers);
    282             this.list = new WMTSLayerSelection(this.layers);
     280            this.list = new WMTSLayerSelection(groupLayersByNameAndTileMatrixSet(layers));
    283281            setContent(list);
    284282        }
    … …  
    296294    private TileMatrixSet currentTileMatrixSet;
    297295    private double crsScale;
    298     private GetCapabilitiesParseHelper.TransferMode transferMode;
     296    private final GetCapabilitiesParseHelper.TransferMode transferMode;
    299297
    300298    private ScaleList nativeScaleList;
    … …  
    329327            }
    330328        } else {
    331             this.defaultLayer = info.getDefaultLayers().iterator().next();
     329            this.defaultLayer = info.getDefaultLayers().get(0);
    332330        }
    333331        if (this.layers.isEmpty())
Note: See TracChangeset for help on using the changeset viewer.