Changeset 10634 in josm for trunk/src

Timestamp:

2016-07-25T09:15:56+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - pmd:UselessQualifiedThis - Useless qualified this usage in the same class

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• data/gpx/GpxData.java (modified) (1 diff)
• gui/DefaultNameFormatter.java (modified) (1 diff)
• gui/GettingStarted.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/ScrollViewport.java (modified) (1 diff)
• gui/download/BookmarkSelection.java (modified) (1 diff)
• gui/history/VersionTable.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• gui/layer/TMSLayer.java (modified) (1 diff)
• gui/layer/geoimage/GeoImageLayer.java (modified) (2 diffs)
• gui/mappaint/styleelement/MapImage.java (modified) (1 diff)
• gui/preferences/SourceEditor.java (modified) (1 diff)
• gui/preferences/imagery/AddWMSLayerPanel.java (modified) (1 diff)
• gui/preferences/imagery/CommonSettingsPanel.java (modified) (1 diff)
• gui/progress/PleaseWaitProgressMonitor.java (modified) (3 diffs)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -58 +58 @@
             new ImageProvider(icon).setOptional(true).getInBackground((ImageResource result) -> {
                 if (result != null) {
-                    GuiHelper.runInEDT(() -> result.attachImageIcon(AddImageryLayerAction.this));
+                    GuiHelper.runInEDT(() -> result.attachImageIcon(this));
                 }
             });

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -362 +362 @@
      */
     public Iterable<Collection<WayPoint>> getLinesIterable(final boolean[] trackVisibility) {
-        return () -> new LinesIterator(GpxData.this, trackVisibility);
+        return () -> new LinesIterator(this, trackVisibility);
     }
 

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -632 +632 @@
     public String formatAsHtmlUnorderedList(Collection<? extends OsmPrimitive> primitives, int maxElements) {
         final Collection<String> displayNames = Utils.transform(primitives,
-                (Function<OsmPrimitive, String>) x -> x.getDisplayName(DefaultNameFormatter.this));
+                (Function<OsmPrimitive, String>) x -> x.getDisplayName(this));
         return Utils.joinAsHtmlUnorderedList(Utils.limit(displayNames, maxElements, "..."));
     }

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -143 +143 @@
                     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 +149 @@
                             + "</h1>\n<h2 align=\"center\">(" + tr("Message of the day not available") + ")</h2></html>";
                     // 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);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -572 +572 @@
         }
 
-        for (JComponent c : getMapNavigationComponents(MapView.this)) {
+        for (JComponent c : getMapNavigationComponents(this)) {
             add(c);
         }

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -88 +88 @@
         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();

trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java

@@ -68 +68 @@
     private final List<JButton> 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;

trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -113 +113 @@
             Bookmark b = bookmarks.getSelectedValue();
             if (b != null && gui != null) {
-                gui.boundingBoxChanged(b.getArea(), BookmarkSelection.this);
+                gui.boundingBoxChanged(b.getArea(), this);
             }
         });

trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

@@ -92 +92 @@
         });
         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);
         });
     }

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -675 +675 @@
 
         event.getMapView().addMouseListener(adapter);
-        MapView.addZoomChangeListener(AbstractTileSourceLayer.this);
+        MapView.addZoomChangeListener(this);
 
         if (this instanceof NativeScaleLayer) {

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -75 +75 @@
         return getTileSourceStatic(info, () -> {
             Main.debug("Attribution loaded, running loadAllErrorTiles");
-            TMSLayer.this.loadAllErrorTiles(false);
+            this.loadAllErrorTiles(false);
         });
     }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -434 +434 @@
                     if (selected.equals(data.get(i))) {
                         currentPhoto = i;
-                        ImageViewerDialog.showImage(GeoImageLayer.this, data.get(i));
+                        ImageViewerDialog.showImage(this, data.get(i));
                         break;
                     }
@@ -889 +889 @@
 
         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);

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java

@@ -100 +100 @@
                 .setOptional(true)
                 .getInBackground((ImageCallback) result -> {
-                    synchronized (MapImage.this) {
+                    synchronized (this) {
                         if (result == null) {
                             source.logWarning(tr("Failed to locate image ''{0}''", name));

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -1720 +1720 @@
         tab.getTabPane().addChangeListener(e -> {
             if (tab.getTabPane().getSelectedComponent() == component) {
-                SourceEditor.this.initiallyLoadAvailableSources();
+                initiallyLoadAvailableSources();
             }
         });

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -90 +90 @@
                 if ((incomingData.startsWith("<html>") || incomingData.startsWith("<HTML>"))
                   && (incomingData.endsWith("</html>") || incomingData.endsWith("</HTML>"))) {
-                    GuiHelper.notifyUserHtmlError(AddWMSLayerPanel.this, title, message, incomingData);
+                    GuiHelper.notifyUserHtmlError(this, title, message, incomingData);
                 } else {
                     if (ex3.getMessage() != null) {

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java

@@ -57 +57 @@
             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,

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -166 +166 @@
     public void doBeginTask() {
         doInEDT(() -> {
-            Main.currentProgressMonitor = PleaseWaitProgressMonitor.this;
+            Main.currentProgressMonitor = this;
             if (GraphicsEnvironment.isHeadless()) {
                 return;
@@ -296 +296 @@
         doInEDT(() -> {
             if (dialog != null) {
-                dialog.setInBackgroundPossible(PleaseWaitProgressMonitor.this.taskId != null && Main.isDisplayingMapView());
+                dialog.setInBackgroundPossible(taskId != null && Main.isDisplayingMapView());
                 reset();
                 getDialog();
@@ -308 +308 @@
         doInEDT(() -> {
             if (dialog != null) {
-                dialog.setInBackgroundPossible(PleaseWaitProgressMonitor.this.taskId != null && Main.isDisplayingMapView());
+                dialog.setInBackgroundPossible(taskId != null && Main.isDisplayingMapView());
             }
         });

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -206 +206 @@
         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);
             }
         });