Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9074)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9075)
@@ -1825,5 +1825,5 @@
                         r.osm,
                         paintSettings,
-                        StyledMapRenderer.this,
+                        this,
                         (r.flags & FLAG_SELECTED) != 0,
                         (r.flags & FLAG_OUTERMEMBER_OF_SELECTED) != 0,
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 9074)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 9075)
@@ -175,5 +175,5 @@
     private void alertNoPrimitivesTo(Collection<HistoryOsmPrimitive> primitives, String title, String helpTopic) {
         HelpAwareOptionPane.showOptionDialog(
-                ChangesetContentPanel.this,
+                this,
                 trn("<html>The selected object is not available in the current<br>"
                         + "edit layer ''{0}''.</html>",
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 9074)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 9075)
@@ -66,5 +66,5 @@
      */
     protected Dialog getParentDialog() {
-        Component c = RelationTree.this;
+        Component c = this;
         while (c != null && !(c instanceof Dialog)) {
             c = c.getParent();
Index: trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 9074)
+++ trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 9075)
@@ -154,5 +154,5 @@
         Bounds b = OsmUrlToBounds.parse(tfOsmUrl.getText());
         if (b == null) return false;
-        gui.boundingBoxChanged(b, BoundingBoxSelection.this);
+        gui.boundingBoxChanged(b, this);
         updateBboxFields(b);
         updateUrl(b);
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 9074)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 9075)
@@ -602,7 +602,7 @@
 
         synchronized (this) {
-            file = ImageDisplay.this.file;
-            image = ImageDisplay.this.image;
-            visibleRect = ImageDisplay.this.visibleRect;
+            file = this.file;
+            image = this.image;
+            visibleRect = this.visibleRect;
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java	(revision 9074)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java	(revision 9075)
@@ -149,5 +149,5 @@
         };
         int ret = HelpAwareOptionPane.showOptionDialog(
-                AdvancedOAuthPropertiesPanel.this,
+                this,
                 tr(
                         "<html>JOSM is about to reset the OAuth settings to default values.<br>"
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 9074)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 9075)
@@ -339,5 +339,5 @@
             if (clazz.isInstance(setting)) {
                 final SubPreferenceSetting sub = (SubPreferenceSetting) setting;
-                final TabPreferenceSetting tab = sub.getTabPreferenceSetting(PreferenceTabbedPane.this);
+                final TabPreferenceSetting tab = sub.getTabPreferenceSetting(this);
                 selectTabBy(new TabIdentifier() {
                     @Override
