Index: trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (revision 10634) @@ -58,5 +58,5 @@ new ImageProvider(icon).setOptional(true).getInBackground((ImageResource result) -> { if (result != null) { - GuiHelper.runInEDT(() -> result.attachImageIcon(AddImageryLayerAction.this)); + GuiHelper.runInEDT(() -> result.attachImageIcon(this)); } }); Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 10634) @@ -362,5 +362,5 @@ */ public Iterable> getLinesIterable(final boolean[] trackVisibility) { - return () -> new LinesIterator(GpxData.this, trackVisibility); + return () -> new LinesIterator(this, trackVisibility); } Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 10634) @@ -632,5 +632,5 @@ public String formatAsHtmlUnorderedList(Collection primitives, int maxElements) { final Collection displayNames = Utils.transform(primitives, - (Function) x -> x.getDisplayName(DefaultNameFormatter.this)); + (Function) x -> x.getDisplayName(this)); return Utils.joinAsHtmlUnorderedList(Utils.limit(displayNames, maxElements, "...")); } Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 10634) @@ -143,5 +143,5 @@ content = new MotdContent().updateIfRequiredString(); contentInitialized = true; - ProxyPreference.removeProxyPreferenceListener(GettingStarted.this); + ProxyPreference.removeProxyPreferenceListener(this); } catch (IOException ex) { Main.warn(ex, tr("Failed to read MOTD. Exception was: {0}", ex.toString())); @@ -149,5 +149,5 @@ + "\n

(" + tr("Message of the day not available") + ")

"; // In case of MOTD not loaded because of proxy error, listen to preference changes to retry after update - ProxyPreference.addProxyPreferenceListener(GettingStarted.this); + ProxyPreference.addProxyPreferenceListener(this); } } Index: trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 10634) @@ -572,5 +572,5 @@ } - for (JComponent c : getMapNavigationComponents(MapView.this)) { + for (JComponent c : getMapNavigationComponents(this)) { add(c); } Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 10634) @@ -88,5 +88,5 @@ MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock(); try { - return !MapPaintStyles.getStyles().get(prim, getDist100Pixel(), NavigatableComponent.this).isEmpty(); + return !MapPaintStyles.getStyles().get(prim, getDist100Pixel(), this).isEmpty(); } finally { MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock(); Index: trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 10634) @@ -68,5 +68,5 @@ private final List buttons = new ArrayList<>(); - private final Timer timer = new Timer(100, evt -> ScrollViewport.this.scroll()); + private final Timer timer = new Timer(100, evt -> scroll()); private int scrollDirection = NO_SCROLL; Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 10634) @@ -113,5 +113,5 @@ Bookmark b = bookmarks.getSelectedValue(); if (b != null && gui != null) { - gui.boundingBoxChanged(b.getArea(), BookmarkSelection.this); + gui.boundingBoxChanged(b.getArea(), this); } }); Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 10634) @@ -92,9 +92,9 @@ }); getModel().addTableModelListener(e -> { - adjustColumnWidth(VersionTable.this, 0, 0); - adjustColumnWidth(VersionTable.this, 1, -8); - adjustColumnWidth(VersionTable.this, 2, -8); - adjustColumnWidth(VersionTable.this, 3, 0); - adjustColumnWidth(VersionTable.this, 4, 0); + adjustColumnWidth(this, 0, 0); + adjustColumnWidth(this, 1, -8); + adjustColumnWidth(this, 2, -8); + adjustColumnWidth(this, 3, 0); + adjustColumnWidth(this, 4, 0); }); } Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 10634) @@ -675,5 +675,5 @@ event.getMapView().addMouseListener(adapter); - MapView.addZoomChangeListener(AbstractTileSourceLayer.this); + MapView.addZoomChangeListener(this); if (this instanceof NativeScaleLayer) { Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 10634) @@ -75,5 +75,5 @@ return getTileSourceStatic(info, () -> { Main.debug("Attribution loaded, running loadAllErrorTiles"); - TMSLayer.this.loadAllErrorTiles(false); + this.loadAllErrorTiles(false); }); } Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 10634) @@ -434,5 +434,5 @@ if (selected.equals(data.get(i))) { currentPhoto = i; - ImageViewerDialog.showImage(GeoImageLayer.this, data.get(i)); + ImageViewerDialog.showImage(this, data.get(i)); break; } @@ -889,5 +889,5 @@ Main.getLayerManager().addActiveLayerChangeListener(e -> { - if (Main.getLayerManager().getActiveLayer() == GeoImageLayer.this) { + if (Main.getLayerManager().getActiveLayer() == this) { // only in select mode it is possible to click the images Main.map.selectSelectTool(false); Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (revision 10634) @@ -100,5 +100,5 @@ .setOptional(true) .getInBackground((ImageCallback) result -> { - synchronized (MapImage.this) { + synchronized (this) { if (result == null) { source.logWarning(tr("Failed to locate image ''{0}''", name)); Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 10634) @@ -1720,5 +1720,5 @@ tab.getTabPane().addChangeListener(e -> { if (tab.getTabPane().getSelectedComponent() == component) { - SourceEditor.this.initiallyLoadAvailableSources(); + initiallyLoadAvailableSources(); } }); Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 10634) @@ -90,5 +90,5 @@ if ((incomingData.startsWith("") || incomingData.startsWith("")) && (incomingData.endsWith("") || incomingData.endsWith(""))) { - GuiHelper.notifyUserHtmlError(AddWMSLayerPanel.this, title, message, incomingData); + GuiHelper.notifyUserHtmlError(this, title, message, incomingData); } else { if (ex3.getMessage() != null) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java (revision 10634) @@ -57,5 +57,5 @@ JColorChooser chooser = new JColorChooser(btnFadeColor.getBackground()); int answer = JOptionPane.showConfirmDialog( - CommonSettingsPanel.this, chooser, + this, chooser, tr("Choose a color for {0}", tr("imagery fade")), JOptionPane.OK_CANCEL_OPTION, Index: trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 10634) @@ -166,5 +166,5 @@ public void doBeginTask() { doInEDT(() -> { - Main.currentProgressMonitor = PleaseWaitProgressMonitor.this; + Main.currentProgressMonitor = this; if (GraphicsEnvironment.isHeadless()) { return; @@ -296,5 +296,5 @@ doInEDT(() -> { if (dialog != null) { - dialog.setInBackgroundPossible(PleaseWaitProgressMonitor.this.taskId != null && Main.isDisplayingMapView()); + dialog.setInBackgroundPossible(taskId != null && Main.isDisplayingMapView()); reset(); getDialog(); @@ -308,5 +308,5 @@ doInEDT(() -> { if (dialog != null) { - dialog.setInBackgroundPossible(PleaseWaitProgressMonitor.this.taskId != null && Main.isDisplayingMapView()); + dialog.setInBackgroundPossible(taskId != null && Main.isDisplayingMapView()); } }); Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (revision 10633) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (revision 10634) @@ -206,7 +206,7 @@ imgProv.getInBackground((ImageResourceCallback) result -> { if (result != null) { - GuiHelper.runInEDT(() -> result.attachImageIcon(TaggingPreset.this)); + GuiHelper.runInEDT(() -> result.attachImageIcon(this)); } else { - Main.warn(TaggingPreset.this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName); + Main.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName); } });