Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java	(revision 13828)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java	(revision 13829)
@@ -60,5 +60,5 @@
     @Override
     public String getTileUrl(int zoom, int tilex, int tiley) {
-        String bbox = getBbox(zoom, tilex, tiley, wmsi.belowWMS130() ? false : getTileProjection().switchXY());
+        String bbox = getBbox(zoom, tilex, tiley, !wmsi.belowWMS130() && getTileProjection().switchXY());
 
         // Using StringBuffer and generic PATTERN_PARAM matcher gives 2x performance improvement over replaceAll
Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 13828)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 13829)
@@ -103,5 +103,5 @@
  * @author imi
  */
-public final class DataSet implements OsmData<OsmPrimitive, Node, Way, Relation>, ProjectionChangeListener, Lockable {
+public final class DataSet implements OsmData<OsmPrimitive, Node, Way, Relation>, ProjectionChangeListener {
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java	(revision 13828)
+++ /trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java	(revision 13829)
@@ -65,5 +65,5 @@
     @Override
     public OsmPrimitiveType getDisplayType() {
-        return memberType;
+        return getMemberType();
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java	(revision 13828)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java	(revision 13829)
@@ -53,5 +53,4 @@
     private JComboBox<String> minimumCacheExpiryUnit;
     private TimeUnit currentUnit;
-
 
     /**
Index: /trunk/src/org/openstreetmap/josm/io/audio/fx/JavaFxMediaPlayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/audio/fx/JavaFxMediaPlayer.java	(revision 13828)
+++ /trunk/src/org/openstreetmap/josm/io/audio/fx/JavaFxMediaPlayer.java	(revision 13829)
@@ -41,5 +41,5 @@
     private MediaPlayer mediaPlayer;
 
-    JavaFxMediaPlayer() throws JosmRuntimeException {
+    JavaFxMediaPlayer() {
         try {
             initFxPlatform();
Index: /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java	(revision 13828)
+++ /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java	(revision 13829)
@@ -18,5 +18,5 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -546,5 +546,5 @@
 
     private Bounds parseBoundingBox(XMLStreamReader reader, Projection conv) {
-        Function<String, String> attrGetter = tag -> belowWMS130() ?
+        UnaryOperator<String> attrGetter = tag -> belowWMS130() ?
                 reader.getAttributeValue(null, tag)
                 : reader.getAttributeValue(WMS_NS_URL, tag);
@@ -589,5 +589,4 @@
             // If the url doesn't already have GetCapabilities, add it in
             getCapabilitiesUrl = new URL(serviceUrlStr);
-            ret = serviceUrlStr;
             if (getCapabilitiesUrl.getQuery() == null) {
                 ret = serviceUrlStr + '?' + CAPABILITIES_QUERY_STRING;