Index: /trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java	(revision 14602)
+++ /trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java	(revision 14603)
@@ -52,10 +52,10 @@
     @Test
     public void testmageEntryWithImages() {
-        assertEquals(1, new ImageData(this.getOneImage()).getImages().size());
+        assertEquals(1, new ImageData(getOneImage()).getImages().size());
     }
 
     @Test
     public void testSortData() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         new Expectations(Collections.class) {{
@@ -68,10 +68,10 @@
     @Test
     public void testIsModifiedFalse() {
-        assertFalse(new ImageData(this.getOneImage()).isModified());
+        assertFalse(new ImageData(getOneImage()).isModified());
     }
 
     @Test
     public void testIsModifiedTrue() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         new Expectations(list.get(0)) {{
@@ -84,5 +84,5 @@
     @Test
     public void testSelectFirstImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         ImageData data = new ImageData(list);
@@ -93,5 +93,5 @@
     @Test
     public void testSelectLastImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         list.add(new ImageEntry());
 
@@ -103,5 +103,5 @@
     @Test
     public void testSelectNextImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         ImageData data = new ImageData(list);
@@ -116,5 +116,5 @@
     @Test
     public void testSelectPreviousImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         list.add(new ImageEntry());
 
@@ -131,5 +131,5 @@
     @Test
     public void testSetSelectedImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         ImageData data = new ImageData(list);
@@ -140,5 +140,5 @@
     @Test
     public void testClearSelectedImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
 
         ImageData data = new ImageData(list);
@@ -150,5 +150,5 @@
     @Test
     public void testSelectionListener() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
         ImageDataUpdateListener listener = new ImageDataUpdateListener() {
@@ -169,5 +169,5 @@
     @Test
     public void testRemoveSelectedImage() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
         data.selectFirstImage();
@@ -179,5 +179,5 @@
     @Test
     public void testRemoveSelectedWithImageTriggerListener() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         list.add(new ImageEntry());
         ImageData data = new ImageData(list);
@@ -199,5 +199,5 @@
     @Test
     public void testRemoveImageAndTriggerListener() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
         ImageDataUpdateListener listener = new ImageDataUpdateListener() {
@@ -219,7 +219,7 @@
     public void testMergeFrom() {
         ImageEntry image = new ImageEntry(new File("test2"));
-        List<ImageEntry> list1 = this.getOneImage();
+        List<ImageEntry> list1 = getOneImage();
         list1.add(image);
-        List<ImageEntry> list2 = this.getOneImage();
+        List<ImageEntry> list2 = getOneImage();
         list2.add(new ImageEntry(new File("test3")));
 
@@ -244,7 +244,7 @@
     public void testMergeFromSelectedImage() {
         ImageEntry image = new ImageEntry(new File("test2"));
-        List<ImageEntry> list1 = this.getOneImage();
+        List<ImageEntry> list1 = getOneImage();
         list1.add(image);
-        List<ImageEntry> list2 = this.getOneImage();
+        List<ImageEntry> list2 = getOneImage();
 
         ImageData data = new ImageData(list1);
@@ -259,5 +259,5 @@
     @Test
     public void testUpdatePosition() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
 
@@ -271,5 +271,5 @@
     @Test
     public void testUpdateDirection() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
 
@@ -283,5 +283,5 @@
     @Test
     public void testTriggerListenerOnUpdate() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
 
@@ -303,5 +303,5 @@
     @Test
     public void testManuallyTriggerUpdateListener() {
-        List<ImageEntry> list = this.getOneImage();
+        List<ImageEntry> list = getOneImage();
         ImageData data = new ImageData(list);
 
Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java	(revision 14602)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java	(revision 14603)
@@ -296,4 +296,5 @@
     }
 
+    @SuppressWarnings("fallthrough")
     private static AbstractTileSource getTileSource(ImageryInfo info)
             throws IOException, WMTSGetCapabilitiesException, WMSGetCapabilitiesException {