Changeset 13829 in josm


Ignore:
Timestamp:
2018-05-25T01:24:24+02:00 (11 months ago)
Author:
Don-vip
Message:

SonarQube - fix minor issues

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

Legend:

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

    r13824 r13829  
    6060    @Override
    6161    public String getTileUrl(int zoom, int tilex, int tiley) {
    62         String bbox = getBbox(zoom, tilex, tiley, wmsi.belowWMS130() ? false : getTileProjection().switchXY());
     62        String bbox = getBbox(zoom, tilex, tiley, !wmsi.belowWMS130() && getTileProjection().switchXY());
    6363
    6464        // Using StringBuffer and generic PATTERN_PARAM matcher gives 2x performance improvement over replaceAll
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r13765 r13829  
    103103 * @author imi
    104104 */
    105 public final class DataSet implements OsmData<OsmPrimitive, Node, Way, Relation>, ProjectionChangeListener, Lockable {
     105public final class DataSet implements OsmData<OsmPrimitive, Node, Way, Relation>, ProjectionChangeListener {
    106106
    107107    /**
  • trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java

    r13766 r13829  
    6565    @Override
    6666    public OsmPrimitiveType getDisplayType() {
    67         return memberType;
     67        return getMemberType();
    6868    }
    6969
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java

    r13825 r13829  
    5353    private JComboBox<String> minimumCacheExpiryUnit;
    5454    private TimeUnit currentUnit;
    55 
    5655
    5756    /**
  • trunk/src/org/openstreetmap/josm/io/audio/fx/JavaFxMediaPlayer.java

    r13819 r13829  
    4141    private MediaPlayer mediaPlayer;
    4242
    43     JavaFxMediaPlayer() throws JosmRuntimeException {
     43    JavaFxMediaPlayer() {
    4444        try {
    4545            initFxPlatform();
  • trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

    r13828 r13829  
    1818import java.util.Set;
    1919import java.util.concurrent.ConcurrentHashMap;
    20 import java.util.function.Function;
     20import java.util.function.UnaryOperator;
    2121import java.util.regex.Pattern;
    2222import java.util.stream.Collectors;
     
    546546
    547547    private Bounds parseBoundingBox(XMLStreamReader reader, Projection conv) {
    548         Function<String, String> attrGetter = tag -> belowWMS130() ?
     548        UnaryOperator<String> attrGetter = tag -> belowWMS130() ?
    549549                reader.getAttributeValue(null, tag)
    550550                : reader.getAttributeValue(WMS_NS_URL, tag);
     
    589589            // If the url doesn't already have GetCapabilities, add it in
    590590            getCapabilitiesUrl = new URL(serviceUrlStr);
    591             ret = serviceUrlStr;
    592591            if (getCapabilitiesUrl.getQuery() == null) {
    593592                ret = serviceUrlStr + '?' + CAPABILITIES_QUERY_STRING;
Note: See TracChangeset for help on using the changeset viewer.