Changeset 31972 in osm for applications/editors/josm/plugins/mapillary/src

Timestamp:

2016-01-11T16:17:06+01:00 (9 years ago)

Author:

floscher

Message:

Fix several code style issues

Location:

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

Files:

• MapillaryAbstractImage.java (modified) (2 diffs)
• MapillaryData.java (modified) (2 diffs)
• MapillaryLayer.java (modified) (1 diff)
• MapillaryPlugin.java (modified) (1 diff)
• gui/FinishedUploadDialog.java (modified) (1 diff)
• gui/MapillaryHistoryDialog.java (modified) (1 diff)
• gui/MapillaryMainDialog.java (modified) (1 diff)
• history/MapillaryRecordListener.java (modified) (1 diff)
• history/commands/CommandJoin.java (modified) (1 diff)
• history/commands/CommandUnjoin.java (modified) (1 diff)
• io/download/MapillaryDownloader.java (modified) (1 diff)
• mode/AbstractMode.java (modified) (1 diff)
• mode/SelectMode.java (modified) (1 diff)
• oauth/UploadUtils.java (modified) (2 diffs)
• traffico/TrafficoGlyph.java (modified) (2 diffs)
• utils/MapillaryUtils.java (modified) (4 diffs)
• utils/PluginState.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
 
 import org.openstreetmap.josm.Main;
@@ -118 +119 @@
   public String getDate(String format) {
     final Date date = new Date(getCapturedAt());
-
-    final SimpleDateFormat formatter = new SimpleDateFormat(format);
+    final SimpleDateFormat formatter = new SimpleDateFormat(format, Locale.UK);
     formatter.setTimeZone(Calendar.getInstance().getTimeZone());
     return formatter.format(date);

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

@@ -22 +22 @@
 public class MapillaryData {
 
-  private Set<MapillaryAbstractImage> images;
+  private final Set<MapillaryAbstractImage> images;
   /**
    * The image currently selected, this is the one being shown.
@@ -123 +123 @@
   public void addMultiSelectedImage(MapillaryAbstractImage image) {
     if (!this.multiSelectedImages.contains(image)) {
-      if (this.getSelectedImage() != null)
+      if (this.getSelectedImage() == null)
+        this.setSelectedImage(image);
+      else
         this.multiSelectedImages.add(image);
-      else
-        this.setSelectedImage(image);
     }
     if (Main.main != null)

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

@@ -357 +357 @@
       } else if (imageAbs instanceof MapillaryImportedImage) {
         MapillaryImportedImage image = (MapillaryImportedImage) imageAbs;
-        ImageIcon icon;
-        if (!this.data.getMultiSelectedImages().contains(image))
-          icon = MapillaryPlugin.MAP_ICON_IMPORTED;
-        else
-          icon = MapillaryPlugin.MAP_ICON_SELECTED;
+        ImageIcon icon = this.data.getMultiSelectedImages().contains(image)
+            ? MapillaryPlugin.MAP_ICON_SELECTED
+            : MapillaryPlugin.MAP_ICON_IMPORTED;
         draw(g, image, icon, p);
       }

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

@@ -273 +273 @@
    */
   public static ImageProvider getProvider(String s) {
-    if (Main.main == null)
+    if (Main.main == null) {
       return null;
-    else
-      return new ImageProvider(s);
+    }
+    return new ImageProvider(s);
   }
 }

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

@@ -34 +34 @@
   public FinishedUploadDialog() {
     this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-    JLabel text = new JLabel(tr("Uploaded {0} images", PluginState.imagesUploaded));
+    JLabel text = new JLabel(tr("Uploaded {0} images", PluginState.getImagesUploaded()));
     text.setAlignmentX(Component.CENTER_ALIGNMENT);
     this.add(text);

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

@@ -284 +284 @@
   private class UndoRedoSelectionListener implements TreeSelectionListener {
 
-    private JTree source;
+    private final JTree source;
 
     protected UndoRedoSelectionListener(JTree source) {

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

@@ -579 +579 @@
                 : new GridLayout(1, buttons.size()));
         this.buttonsPanel.add(buttonRowPanel);
-        for (SideButton button : buttons)
+        for (SideButton button : buttons) {
           buttonRowPanel.add(button);
+        }
       }
       panel.add(this.buttonsPanel, BorderLayout.NORTH);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecordListener.java

@@ -13 +13 @@
    * Fired when any command is undone or redone.
    */
-  public void recordChanged();
+  void recordChanged();
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandJoin.java

@@ -18 +18 @@
 public class CommandJoin extends MapillaryExecutableCommand {
 
-  private MapillaryAbstractImage a;
-  private MapillaryAbstractImage b;
+  private final MapillaryAbstractImage a;
+  private final MapillaryAbstractImage b;
 
   /**

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandUnjoin.java

@@ -18 +18 @@
 public class CommandUnjoin extends MapillaryExecutableCommand {
 
-  private MapillaryAbstractImage a;
-  private MapillaryAbstractImage b;
+  private final MapillaryAbstractImage a;
+  private final MapillaryAbstractImage b;
 
   /**

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

@@ -205 +205 @@
     for (Thread t : threads) {
       if (t.isAlive())
-        System.out.println(t);
+        Main.info(t+" is still alive!");
       t.interrupt();
     }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java

@@ -86 +86 @@
     private long lastDownload;
 
-    private boolean moved = false;
+    private boolean moved;
 
     @Override

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java

@@ -37 +37 @@
   private final MapillaryRecord record;
   private boolean nothingHighlighted;
-  private boolean imageHighlighted = false;
+  private boolean imageHighlighted;
 
   /**

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java

@@ -88 +88 @@
     @Override
     public void run() {
-      PluginState.imagesToUpload(this.images.size());
+      PluginState.addImagesToUpload(this.images.size());
       MapillaryUtils.updateHelpText();
       for (MapillaryAbstractImage img : this.images) {
@@ -194 +194 @@
     byte[] imageBytes = outputStream.toByteArray();
     new ExifRewriter().updateExifMetadataLossless(imageBytes, os, outputSet);
+    os.close();
     return tempFile;
   }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoGlyph.java

@@ -11 +11 @@
 
 public final class TrafficoGlyph {
+  private static Map<String, Character> glyphs;
+
   private TrafficoGlyph() {
     // private constructor to avoid instantiation
   }
-  private static Map<String, Character> glyphs;
 
   private static Map<String, Character> readGlyphsFromResources() {
@@ -25 +26 @@
       glyphs.put(name, glyphObject.getString(name).charAt(0));
     }
+    reader.close();
     return glyphs;
   }
 
-  public static Character getGlyph(String key) {
+  public static synchronized Character getGlyph(String key) {
     if (glyphs == null) {
       glyphs = readGlyphsFromResources();

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

@@ -125 +125 @@
    *                                  not one of the values mentioned above
    */
-  public static double degMinSecToDouble(RationalNumber[] degMinSec,
-                                         String ref) {
+  public static double degMinSecToDouble(RationalNumber[] degMinSec, String ref) {
     if (degMinSec == null || degMinSec.length != 3) {
       throw new IllegalArgumentException("Array's length must be 3.");
@@ -256 +255 @@
                       ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
       if (lat_ref == null || lat == null || lon == null || lon_ref == null) {
-        if (exceptionNoTags)
-          throw new IllegalArgumentException(
-                  "The image doesn't have the needed EXIF tags.");
-        else
-          return readNoTags(file);
+        if (exceptionNoTags) {
+          throw new IllegalArgumentException("The image doesn't have the needed EXIF tags.");
+        }
+        return readNoTags(file);
       }
       double latValue = 0;
@@ -273 +271 @@
       if (ca != null && ca.getValue() instanceof RationalNumber)
         caValue = ((RationalNumber) ca.getValue()).doubleValue();
-      if (datetimeOriginal != null)
-        return new MapillaryImportedImage(latValue, lonValue, caValue, file,
-                datetimeOriginal.getStringValue());
-      else
-        return new MapillaryImportedImage(latValue, lonValue, caValue, file);
+      if (datetimeOriginal != null) {
+        return new MapillaryImportedImage(latValue, lonValue, caValue, file, datetimeOriginal.getStringValue());
+      }
+      return new MapillaryImportedImage(latValue, lonValue, caValue, file);
     }
     throw new IllegalStateException("Invalid format.");
@@ -317 +314 @@
               .findEXIFValueWithExactMatch(
                       ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
-      if (datetimeOriginal == null)
-        return new MapillaryImportedImage(pos.lat(), pos.lon(), 0,
-                file);
-      else {
-        try {
-          return new MapillaryImportedImage(pos.lat(), pos.lon(), 0,
-                  file, datetimeOriginal.getStringValue());
-        } catch (ImageReadException e) {
-          Main.error(e);
-        }
+      if (datetimeOriginal == null) {
+        return new MapillaryImportedImage(pos.lat(), pos.lon(), 0, file);
+      }
+      try {
+        return new MapillaryImportedImage(pos.lat(), pos.lon(), 0, file, datetimeOriginal.getStringValue());
+      } catch (ImageReadException e) {
+        Main.error(e);
       }
     }

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

@@ -19 +19 @@
   private static int runningDownloads;
   /** Images that have to be uploaded. */
-  protected static int imagesToUpload;
+  private static int imagesToUpload;
   /** Images that have been uploaded. */
-  public static int imagesUploaded;
+  private static int imagesUploaded;
 
   private PluginState() {
@@ -68 +68 @@
    *          The amount of images that are going to be uploaded.
    */
-  public static void imagesToUpload(int amount) {
+  public static void addImagesToUpload(int amount) {
     if (imagesToUpload <= imagesUploaded) {
       imagesToUpload = 0;
@@ -74 +74 @@
     }
     imagesToUpload += amount;
+  }
+
+  public static int getImagesToUpload() {
+    return imagesToUpload;
+  }
+
+  public static int getImagesUploaded() {
+    return imagesUploaded;
   }