Changeset 13742 in josm for trunk/src/org/openstreetmap/josm


Ignore:
Timestamp:
2018-05-13T09:15:34+02:00 (16 months ago)
Author:
wiktorn
Message:

Checkstyle fixes

Location:
trunk/src/org/openstreetmap/josm
Files:
12 edited

Legend:

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

    r13732 r13742  
    117117     * @param reader XMLStreamReader that should point to start of element
    118118     * @return content of current tag
    119      * @throws XMLStreamException
     119     * @throws XMLStreamException if any XML stream error occurs
    120120     */
    121121    public static String getElementTextWithSubtags(XMLStreamReader reader) throws XMLStreamException {
  • trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

    r13733 r13742  
    14321432    /**
    14331433     * Sets custom HTTP headers that should be sent with request towards imagery provider
    1434      * @param customHttpHeaders
     1434     * @param customHttpHeaders http headers
    14351435     */
    14361436    public void setCustomHttpHeaders(Map<String, String> customHttpHeaders) {
     
    14621462    /**
    14631463     * Sets minimum tile expiration in seconds
    1464      * @param minimumTileExpire
     1464     * @param minimumTileExpire minimum tile expiration in seconds
    14651465     */
    14661466    public void setMinimumTileExpire(int minimumTileExpire) {
  • trunk/src/org/openstreetmap/josm/data/imagery/LayerDetails.java

    r13733 r13742  
    3838     * This is needed to properly handle layer attributes inheritance.
    3939     *
    40      * @param parentLayer
     40     * @param parentLayer parent layer
    4141     */
    4242    public LayerDetails(LayerDetails parentLayer) {
     
    7070
    7171    /**
     72     * @return title "Human readable" title of this layer
    7273     * @see LayerDetails#getName()
    73      * @return title "Human readable" title of this layer
    7474     */
    7575    public String getTitle() {
     
    7878
    7979    /**
     80     * @param title set title of this layer
    8081     * @see LayerDetails#getName()
    81      * @param title set title of this layer
    8282     */
    8383    public void setTitle(String title) {
     
    8888     *
    8989     * Citation from OGC WMS specification (WMS 1.3.0):
    90      * > A number of elements have both a <Name> and a <Title>. The Name is a text string used for machine-to-machine
     90     * > A number of elements have both a {@literal <Name>} and a {@literal <Title>}. The Name is a text string used for machine-to-machine
    9191     * > communication while the Title is for the benefit of humans. For example, a dataset might have the descriptive Title
    9292     * > “Maximum Atmospheric Temperature” and be requested using the abbreviated Name “ATMAX”.
    9393     *
    9494     * And second citation:
    95      * > If, and only if, a layer has a <Name>, then it is a map layer that can be requested by using that Name in the
    96      * > LAYERS parameter of a GetMap request. A Layer that contains a <Name> element is referred to as a “named
     95     * > If, and only if, a layer has a {@literal <Name>}, then it is a map layer that can be requested by using that Name in the
     96     * > LAYERS parameter of a GetMap request. A Layer that contains a {@literal <Name>} element is referred to as a “named
    9797     * > layer” in this International Standard. If the layer has a Title but no Name, then that layer is only a category title for
    9898     * > all the layers nested within.
     
    104104
    105105    /**
     106     * @param name sets the name of this Layer
    106107     * @see LayerDetails#getName()
    107      * @param name sets the name of this Layer
    108108     */
    109109    public void setName(String name) {
     
    138138    /**
    139139     * sets bounds of this layer
    140      * @param bounds
     140     * @param bounds of this layer
    141141     */
    142142    public void setBounds(Bounds bounds) {
     
    160160    /**
    161161     * sets children layers for this layer
    162      * @param children
     162     * @param children children of this layer
    163163     */
    164164    public void setChildren(List<LayerDetails> children) {
     
    192192    /**
    193193     * Sets abstract of this layer
    194      * @param abstr
     194     * @param abstr abstract of this layer
    195195     */
    196196    public void setAbstract(String abstr) {
  • trunk/src/org/openstreetmap/josm/data/imagery/TileJobOptions.java

    r13733 r13742  
    2323     * @param connectTimeout in milliseconds
    2424     * @param readTimeout in milliseconds
    25      * @param headers
     25     * @param headers http headers
    2626     * @param minimumExpiryTime in seconds
    2727     */
  • trunk/src/org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java

    r13733 r13742  
    3131    private List<DefaultLayer> layers;
    3232    private String urlPattern;
    33     private static final Pattern PATTERN_PARAM  = Pattern.compile("\\{([^}]+)\\}");
     33    private static final Pattern PATTERN_PARAM = Pattern.compile("\\{([^}]+)\\}");
    3434    private final Map<String, String> headers = new ConcurrentHashMap<>();
    3535
  • trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

    r13740 r13742  
    303303     * @param info imagery info
    304304     * @throws IOException if any I/O error occurs
    305      * @throws WMTSGetCapabilitiesException
     305     * @throws WMTSGetCapabilitiesException when document didn't contain any layers
    306306     * @throws IllegalArgumentException if any other error happens for the given imagery info
    307307     */
     
    312312        this.baseUrl = GetCapabilitiesParseHelper.normalizeCapabilitiesUrl(handleTemplate(info.getUrl()));
    313313        WMTSCapabilities capabilities = getCapabilities(baseUrl, headers);
    314         this.layers =  capabilities.getLayers();
     314        this.layers = capabilities.getLayers();
    315315        this.baseUrl = capabilities.getBaseUrl();
    316316        this.transferMode = capabilities.getTransferMode();
     
    374374     * @return capabilities
    375375     * @throws IOException in case of any I/O error
    376      * @throws WMTSGetCapabilitiesException
     376     * @throws WMTSGetCapabilitiesException when document didn't contain any layers
    377377     * @throws IllegalArgumentException in case of any other error
    378378     */
  • trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

    r13733 r13742  
    6666    public WMSLayer(ImageryInfo info) {
    6767        super(info);
    68         CheckParameterUtil.ensureThat(info.getImageryType() == ImageryType.WMS || info.getImageryType() == ImageryType.WMS_ENDPOINT, "ImageryType is WMS");
     68        CheckParameterUtil.ensureThat(
     69                info.getImageryType() == ImageryType.WMS || info.getImageryType() == ImageryType.WMS_ENDPOINT, "ImageryType is WMS");
    6970        CheckParameterUtil.ensureParameterNotNull(info.getUrl(), "info.url");
    7071        if (info.getImageryType() == ImageryType.WMS) {
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java

    r13734 r13742  
    4848    protected final transient Collection<ContentValidationListener> listeners = new ArrayList<>();
    4949
    50     private final JCheckBox validGeoreference= new JCheckBox(tr("Is layer properly georeferenced?"));
     50    private final JCheckBox validGeoreference = new JCheckBox(tr("Is layer properly georeferenced?"));
    5151    private HeadersTable headersTable;
    5252    private JSpinner minimumCacheExpiry;
     
    7272        headersTable = new HeadersTable();
    7373        minimumCacheExpiry = new JSpinner(new SpinnerNumberModel(
    74                 (Number)TimeUnit.MILLISECONDS.toSeconds(TMSCachedTileLoaderJob.MINIMUM_EXPIRES.get()),
     74                (Number) TimeUnit.MILLISECONDS.toSeconds(TMSCachedTileLoaderJob.MINIMUM_EXPIRES.get()),
    7575                0L,
    7676                Long.valueOf(Integer.MAX_VALUE),
     
    101101                    break;
    102102                default:
    103                     Logging.warn("Dupa: " + units.indexOf(e.getItem()));
     103                    Logging.warn("Unkown unit: " + units.indexOf(e.getItem()));
    104104                }
    105105                minimumCacheExpiry.setValue(newValue);
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java

    r13741 r13742  
    100100            Layer selectedLayer = layers.get(layerTable.convertRowIndexToModel(index)).getValue().get(0);
    101101            ret.setDefaultLayers(
    102                     Collections.<DefaultLayer> singletonList(
     102                    Collections.<DefaultLayer>singletonList(
    103103                            new DefaultLayer(
    104104                                    ImageryType.WMTS,
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java

    r13733 r13742  
    7272
    7373            } else if (row == headers.size()) {
    74                 String[] entry = new String[] { "", "" };
     74                String[] entry = new String[] {"", ""};
    7575                entry[col] = (String) value;
    7676                headers.add(entry);
     
    9393    /**
    9494     * Create table prefilled with headers
    95      * @param headers
     95     * @param headers contents of table
    9696     */
    9797    public HeadersTable(Map<String, String> headers) {
     
    108108    private static List<String[]> getHeadersAsVector(Map<String, String> headers) {
    109109        return headers.entrySet().stream().sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey()))
    110                 .map(e -> new String[] { e.getKey(), e.getValue() }).collect(Collectors.toList());
     110                .map(e -> new String[] {e.getKey(), e.getValue()}).collect(Collectors.toList());
    111111    }
    112112
  • trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

    r13733 r13742  
    290290                if ("layer".equals(qName)) {
    291291                    newState = State.NOOP;
    292                     defaultLayers.add(new DefaultLayer(entry.getImageryType(), atts.getValue("name"),atts.getValue("style"), atts.getValue("tileMatrixSet")));
     292                    defaultLayers.add(new DefaultLayer(
     293                            entry.getImageryType(),
     294                            atts.getValue("name"),
     295                            atts.getValue("style"),
     296                            atts.getValue("tileMatrixSet")
     297                            ));
    293298                }
    294299                break;
  • trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

    r13741 r13742  
    132132     * Make getCapabilities request towards given URL
    133133     * @param url service url
    134      * @throws IOException
    135      * @throws WMSGetCapabilitiesException
     134     * @throws IOException when connection error when fetching get capabilities document
     135     * @throws WMSGetCapabilitiesException when there are errors when parsing get capabilities document
    136136     */
    137137    public WMSImagery(String url) throws IOException, WMSGetCapabilitiesException {
     
    143143     * @param url service url
    144144     * @param headers HTTP headers to be sent with request
    145      * @throws IOException
    146      * @throws WMSGetCapabilitiesException
     145     * @throws IOException when connection error when fetching get capabilities document
     146     * @throws WMSGetCapabilitiesException when there are errors when parsing get capabilities document
    147147     */
    148148    public WMSImagery(String url, Map<String, String> headers) throws IOException, WMSGetCapabilitiesException {
     
    185185                } catch (MalformedURLException e1) { // NOPMD
    186186                    // do nothing, raise original exception
     187                    Logging.trace(e1);
    187188                }
    188189            }
     
    287288
    288289    /**
    289      * @see #buildGetMapUrl(List, boolean)
    290      *
    291290     * @param selectedLayers selected layers as subset of the tree returned by {@link #getLayers()}
    292291     * @param selectedStyles selected styles for all selectedLayers
    293292     * @param transparent whether returned images should contain transparent pixels (if supported by format)
    294293     * @return URL template for GetMap service
     294     * @see #buildGetMapUrl(List, boolean)
    295295     */
    296296    public String buildGetMapUrl(List<LayerDetails> selectedLayers, List<String> selectedStyles, boolean transparent) {
     
    303303
    304304    /**
    305      * @see #buildGetMapUrl(List, boolean)
    306      *
    307305     * @param selectedLayers selected layers as list of strings
    308306     * @param selectedStyles selected styles of layers as list of strings
     
    310308     * @param transparent whether returned images should contain transparent pixels (if supported by format)
    311309     * @return URL template for GetMap service
     310     * @see #buildGetMapUrl(List, boolean)
    312311     */
    313312    public String buildGetMapUrl(List<String> selectedLayers,
     
    385384        if (GetCapabilitiesParseHelper.moveReaderToTag(reader, this::tagEquals, QN_TITLE)) {
    386385            this.title = reader.getElementText();
     386            // CHECKSTYLE.OFF: EmptyBlock
    387387            for (int event = reader.getEventType();
    388388                    reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && tagEquals(QN_SERVICE, reader.getName()));
     
    390390                // empty loop, just move reader to the end of Service tag, if moveReaderToTag return false, it's already done
    391391            }
     392            // CHECKSTYLE.ON: EmptyBlock
    392393        }
    393394    }
     
    591592    }
    592593
    593 
    594594    private String normalizeUrl(String serviceUrlStr) throws MalformedURLException {
    595595        URL getCapabilitiesUrl = null;
     
    641641    }
    642642
    643 
    644643    static boolean imageFormatHasTransparency(final String format) {
    645644        return format != null && (format.startsWith("image/png") || format.startsWith("image/gif")
     
    686685
    687686    /**
    688      * @param defaultLayers
     687     * @param defaultLayers default layers that should select layer object
    689688     * @return collection of LayerDetails specified by DefaultLayers
    690689     */
Note: See TracChangeset for help on using the changeset viewer.