Changeset 31816 in osm for applications

Timestamp:

2015-12-12T15:47:40+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Fix Sonar issues that were newly introduced with last two commits

These were mainly missing header comments noting the license in the package-info.java and some minor issues.

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• actions/MapillaryExportAction.java (modified) (4 diffs)
• actions/MapillaryImportAction.java (modified) (4 diffs)
• actions/MapillaryImportIntoSequenceAction.java (modified) (2 diffs)
• actions/package-info.java (modified) (1 diff)
• cache/package-info.java (modified) (1 diff)
• gui/HyperlinkLabel.java (modified) (2 diffs)
• gui/package-info.java (modified) (1 diff)
• history/commands/package-info.java (modified) (1 diff)
• history/package-info.java (modified) (1 diff)
• io/download/package-info.java (modified) (1 diff)
• io/export/package-info.java (modified) (1 diff)
• io/package-info.java (modified) (1 diff)
• mode/package-info.java (modified) (1 diff)
• oauth/package-info.java (modified) (1 diff)
• package-info.java (modified) (1 diff)
• traffico/package-info.java (modified) (1 diff)
• utils/package-info.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java

@@ -61 +61 @@
     this.dialog = new MapillaryExportDialog(ok);
     pane.setMessage(this.dialog);
-    pane.setOptions(new JButton[] { ok, cancel });
+    pane.setOptions(new JButton[] {ok, cancel});
 
     JDialog dlg = pane.createDialog(Main.parent, tr("Export images"));
@@ -92 +92 @@
           .getData().getImages())
         if (image instanceof MapillaryImportedImage) {
-          images.add(((MapillaryImportedImage) image));
+          images.add((MapillaryImportedImage) image);
         }
       try {
@@ -114 +114 @@
   }
 
-  private class OKAction implements ActionListener {
+  private static class OKAction implements ActionListener {
     private final JOptionPane pane;
 
@@ -127 +127 @@
   }
 
-  private class CancelAction implements ActionListener {
+  private static class CancelAction implements ActionListener {
     private final JOptionPane pane;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java

@@ -58 +58 @@
     this.chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
     this.chooser.setAcceptAllFileFilterUsed(false);
-    this.chooser.addChoosableFileFilter(new FileNameExtensionFilter("images",
-        "jpg", "jpeg", "png"));
+    this.chooser.addChoosableFileFilter(new FileNameExtensionFilter("images", "jpg", "jpeg", "png"));
     this.chooser.setMultiSelectionEnabled(true);
     if (this.chooser.showOpenDialog(Main.parent) == JFileChooser.APPROVE_OPTION) {
@@ -73 +72 @@
             String extension = MapillaryUtils.getExtension(file.listFiles()[j]);
             try {
-              if (extension.equals("jpg") || extension.equals("jpeg"))
+              if ("jpg".equals(extension) || "jpeg".equals(extension))
                 images.add(MapillaryUtils.readJPG(file.listFiles()[j]));
-              else if (extension.equals("png"))
+              else if ("png".equals(extension))
                 images.add(MapillaryUtils.readPNG(file.listFiles()[j]));
             } catch (ImageReadException | IOException | NullPointerException e1) {
@@ -83 +82 @@
         } else {
           String extension = MapillaryUtils.getExtension(file);
-          if (extension.equals("jpg") || extension.equals("jpeg")) {
+          if ("jpg".equals(extension) || "jpeg".equals(extension)) {
             try {
               images.add(MapillaryUtils.readJPG(file));
@@ -91 +90 @@
               Main.error(ex);
             }
-          } else if (file.getPath().substring(file.getPath().length() - 4)
-              .equals(".png")) {
+          } else if (".png".equals(file.getPath().substring(file.getPath().length() - 4))) {
             images.add(MapillaryUtils.readPNG(file));
           }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java

@@ -81 +81 @@
             String extension = MapillaryUtils.getExtension(file.listFiles()[j]);
             try {
-              if (extension.equals("jpg") || extension.equals("jpeg"))
+              if ("jpg".equals(extension) || "jpeg".equals(extension))
                 MapillaryUtils.readJPG(file.listFiles()[j], true);
             } catch (ImageReadException | NullPointerException | IOException e) {
@@ -89 +89 @@
         } else {
           String extension = MapillaryUtils.getExtension(file);
-          if (extension.equals("jpg") || extension.equals("jpeg")) {
+          if ("jpg".equals(extension) || "jpeg".equals(extension)) {
             try {
               this.images.add(MapillaryUtils.readJPG(file, true));

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * Actions that are normally attached to a button or a menu item and are then executed

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * This package is all about caching resources downloaded from

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java

@@ -59 +59 @@
    * Sets a new URL, just pass the key of the image or null if there is none.
    *
-   * @param key
-   *          The key of the image that the hyperlink will point to.
-   * @throws MalformedURLException
+   * @param key The key of the image that the hyperlink will point to.
+   * @throws MalformedURLException when the key appended to the base URL forms a malformed URL
    */
   public void setURL(String key) throws MalformedURLException {
@@ -104 +103 @@
    *
    */
-  private class LinkPopUp extends JPopupMenu {
+  private static class LinkPopUp extends JPopupMenu {
 
     private static final long serialVersionUID = 1384054752970921552L;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * The GUI components that are special to the mapillary plugin.

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * The commands that the user can execute, which are recorded in the undo/redo-log.

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * This package deals with keeping a history of actions the user performed

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * Classes for downloading images, sequences and image metadata like traffic signs from <a href="https://mapillary.com">mapillary.com</a> .

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * Classes for exporting images that were downloaded from <a href="https://mapillary.com">mapillary.com</a> .

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * Classes for I/O operations like downloading images and their metadata and exporting them.

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * The different modes that the {@link org.openstreetmap.josm.plugins.mapillary.MapillaryLayer} can be in.

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * Everything related to signing users in and out of Mapillary.

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * The main package in which all core-code (so at the moment all code) resides.

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * Components for painting traffic signs with the help of the traffico icon font.

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/package-info.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 /**
  * Utility classes for simplifying recurring tasks throughout the project.