Changeset 32374 in osm

Timestamp:

2016-06-23T01:17:42+02:00 (8 years ago)

Author:

floscher

Message:

[mapillary] Fix some more minor code style issues

Among other things:

• Make class with only static methods a utility class
• remove public modifier from constructor of private class
• whitespace changes to make passages more readable

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/cache/CacheUtils.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtil.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryFilterDialog;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/CacheUtils.java

@@ -16 +16 @@
  *
  */
-public class CacheUtils {
+public final class CacheUtils {
 
   private static IgnoreDownload ignoreDownload = new IgnoreDownload();
@@ -28 +28 @@
     /** Both of them */
     BOTH;
+  }
+
+  private CacheUtils() {
+    // Private constructor to avoid instantiation
   }
 

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

@@ -255 +255 @@
   }
 
+  /**
+   * Destroys the unique instance of the class.
+   */
+  public static synchronized void destroyInstance() {
+    instance = null;
+  }
+
   private class DownloadCheckBoxAction extends AbstractAction {
 
     private static final long serialVersionUID = 4672634002899519496L;
 
-    public DownloadCheckBoxAction() {
+    DownloadCheckBoxAction() {
       putValue(NAME, tr("Downloaded images"));
     }
@@ -273 +280 @@
     private static final long serialVersionUID = -7417238601979689863L;
 
-    public UpdateAction() {
+    UpdateAction() {
       putValue(NAME, tr("Update"));
     }
@@ -289 +296 @@
     private static final long serialVersionUID = 1178261778165525040L;
 
-    public ResetAction() {
+    ResetAction() {
       putValue(NAME, tr("Reset"));
     }
@@ -303 +310 @@
     private static final long serialVersionUID = -2937440338019185723L;
 
-    public OnlySignsAction() {
+    OnlySignsAction() {
       putValue(NAME, tr("Only images with signs"));
     }
@@ -322 +329 @@
     private static final long serialVersionUID = 8706299665735930148L;
 
-    public SignChooserAction() {
+    SignChooserAction() {
       putValue(NAME, tr("Choose signs"));
     }
@@ -338 +345 @@
     }
   }
-
-  /**
-   * Destroys the unique instance of the class.
-   */
-  public static synchronized void destroyInstance() {
-    instance = null;
-  }
 }

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

@@ -36 +36 @@
   private static final long serialVersionUID = 3369727203329307716L;
 
-  private static final int DRAG_BUTTON = Main.pref.getInteger(
-      "mapillary.picture-drag-button", 3);
-  private static final int OPTION_BUTTON = Main.pref.getInteger(
-      "mapillary.picture-option-button", 2);
-  private static final int ZOOM_BUTTON = Main.pref.getInteger(
-      "mapillary.picture-zoom-button", 1);
+  private static final int DRAG_BUTTON = Main.pref.getInteger("mapillary.picture-drag-button", 3);
+  private static final int OPTION_BUTTON = Main.pref.getInteger("mapillary.picture-option-button", 2);
+  private static final int ZOOM_BUTTON = Main.pref.getInteger("mapillary.picture-zoom-button", 1);
 
   /** The image currently displayed */
@@ -61 +58 @@
   protected HyperlinkLabel hyperlink;
 
-  private class ImgDisplayMouseListener implements MouseListener,
-      MouseWheelListener, MouseMotionListener {
+  private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener {
     private boolean mouseIsDragging;
     private long lastTimeForMousePoint;
@@ -431 +427 @@
   private final Point comp2imgCoord(Rectangle visibleRect, int xComp, int yComp) {
     Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
-    return new Point(visibleRect.x + ((xComp - drawRect.x) * visibleRect.width)
-        / drawRect.width, visibleRect.y
-        + ((yComp - drawRect.y) * visibleRect.height) / drawRect.height);
+    return new Point(
+        visibleRect.x + ((xComp - drawRect.x) * visibleRect.width) / drawRect.width,
+        visibleRect.y + ((yComp - drawRect.y) * visibleRect.height) / drawRect.height
+    );
   }
 
   private static final Point getCenterImgCoord(Rectangle visibleRect) {
-    return new Point(visibleRect.x + visibleRect.width / 2, visibleRect.y
-        + visibleRect.height / 2);
+    return new Point(visibleRect.x + visibleRect.width / 2, visibleRect.y + visibleRect.height / 2);
   }
 
   private Rectangle calculateDrawImageRectangle(Rectangle visibleRect) {
-    return calculateDrawImageRectangle(visibleRect, new Rectangle(0, 0,
-        getSize().width, getSize().height));
+    return calculateDrawImageRectangle(visibleRect, new Rectangle(0, 0, getSize().width, getSize().height));
   }
 
@@ -482 +477 @@
     Rectangle visibleRect;
     synchronized (this) {
-      image = MapillaryImageDisplay.this.image;
-      visibleRect = MapillaryImageDisplay.this.visibleRect;
+      image = this.image;
+      visibleRect = this.visibleRect;
     }
     if (image == null)

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

@@ -575 +575 @@
       this.buttonsPanel = new JPanel(new GridLayout(1, 1));
       if (!buttons.isEmpty() && buttons.get(0) != null) {
-        final JPanel buttonRowPanel = new JPanel(Main.pref.getBoolean(
-                "dialog.align.left", false) ? new FlowLayout(FlowLayout.LEFT)
-                : new GridLayout(1, buttons.size()));
+        final JPanel buttonRowPanel = new JPanel(
+            Main.pref.getBoolean("dialog.align.left", false)
+            ? new FlowLayout(FlowLayout.LEFT)
+            : new GridLayout(1, buttons.size())
+        );
         this.buttonsPanel.add(buttonRowPanel);
         for (SideButton button : buttons) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java

@@ -184 +184 @@
   }
 
-  protected static void tooBigErrorDialog() {
+  private static void tooBigErrorDialog() {
     if (SwingUtilities.isEventDispatchThread()) {
       MapillaryLayer.getInstance().tempSemiautomatic = true;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtil.java

@@ -136 +136 @@
     private final byte[] magic = new byte[Math.max(JFIF_MAGIC.length, PNG_MAGIC.length)];
 
-    ImageFileFilter() { }
-
     @Override
     public synchronized boolean accept(File f) {

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java

@@ -17 +17 @@
 
 /**
- *
  * Utilities for tests.
- *
- * @author floscher
  */
 public final class TestUtil {
@@ -35 +32 @@
    * That is needed e.g. to use {@link MapillaryLayer#getInstance()}
    */
-  public static final synchronized void initPlugin() {
+  public static synchronized void initPlugin() {
     if (!isInitialized) {
       System.setProperty("josm.home", "test/data/preferences");