Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java	(revision 31389)
@@ -24,5 +24,5 @@
 /**
  * GUI for exporting images.
- * 
+ *
  * @author nokutu
  *
@@ -38,13 +38,18 @@
   /** Button to export all images belonging to the selected {@link MapillaryImage} objects. */
   public JRadioButton selected;
-  /** Button to rewrite all imported images */
+  /** Button to rewrite all imported images. */
   public JRadioButton rewrite;
+  /** Group of button containing all the options. */
   public ButtonGroup group;
   private JButton choose;
   private JLabel path;
+  /** File chooser. */
   public JFileChooser chooser;
   protected String exportDirectory;
   private JButton ok;
 
+  /**
+   * Main constructor.
+   */
   public MapillaryExportDialog(JButton ok) {
     this.ok = ok;
@@ -120,4 +125,11 @@
   }
 
+  /**
+   * Enables/disables some parts of the panel depending if the rewrite button is
+   * active.
+   *
+   * @author nokutu
+   *
+   */
   public class RewriteButtonAction extends AbstractAction {
 
@@ -126,4 +138,10 @@
     private MapillaryExportDialog dlg;
 
+    /**
+     * Main constructor.
+     *
+     * @param dlg
+     *          Parent dialog.
+     */
     public RewriteButtonAction(MapillaryExportDialog dlg) {
       this.dlg = dlg;
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterChooseSigns.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterChooseSigns.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterChooseSigns.java	(revision 31389)
@@ -4,6 +4,4 @@
 
 import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.swing.JCheckBox;
@@ -13,24 +11,43 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-public class MapillaryFilterChooseSigns extends JPanel implements
-    ActionListener {
+/**
+ * UI to choose which signs must be displayed.
+ *
+ * @author nokutu
+ *
+ */
+public class MapillaryFilterChooseSigns extends JPanel {
 
-  public final JCheckBox maxspeed = new JCheckBox();
+  private static final long serialVersionUID = -3513805549022406720L;
+
+  /** Max speed signs */
+  public final JCheckBox maxSpeed = new JCheckBox();
+  /** Stop signs */
   public final JCheckBox stop = new JCheckBox();
+  /** Give way signs */
   public final JCheckBox giveWay = new JCheckBox();
+  /** Roundabout sings */
   public final JCheckBox roundabout = new JCheckBox();
+  /** Forbidden access or forbidden direction signs */
   public final JCheckBox access = new JCheckBox();
+  /** Intersection danger signs */
   public final JCheckBox intersection = new JCheckBox();
+  /** Mandatory direction signs */
   public final JCheckBox direction = new JCheckBox();
+  /** Uneven pavement signs */
   public final JCheckBox uneven = new JCheckBox();
+  /** No parking signs */
   public final JCheckBox noParking = new JCheckBox();
+  /** Forbidden overtaking signs */
   public final JCheckBox noOvertaking = new JCheckBox();
+  /** Pedestrian crossing signs */
   public final JCheckBox crossing = new JCheckBox();
+  /** Forbidden turn signs */
   public final JCheckBox noTurn = new JCheckBox();
 
   private static MapillaryFilterChooseSigns INSTANCE;
 
-  public MapillaryFilterChooseSigns() {
-    maxspeed.setSelected(true);
+  private MapillaryFilterChooseSigns() {
+    maxSpeed.setSelected(true);
     stop.setSelected(true);
     giveWay.setSelected(true);
@@ -50,5 +67,5 @@
     maxspeedLabel.setIcon(new ImageProvider("signs/speed.png").get());
     maxspeedPanel.add(maxspeedLabel);
-    maxspeedPanel.add(maxspeed);
+    maxspeedPanel.add(maxSpeed);
     this.add(maxspeedPanel);
 
@@ -148,4 +165,9 @@
   }
 
+  /**
+   * Return the unique instance of the class.
+   *
+   * @return THe unique instance of the class.
+   */
   public static MapillaryFilterChooseSigns getInstance() {
     if (INSTANCE == null)
@@ -153,10 +175,3 @@
     return INSTANCE;
   }
-
-  @Override
-  public void actionPerformed(ActionEvent arg0) {
-    // TODO Auto-generated method stub
-
-  }
-
 }
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java	(revision 31389)
@@ -32,5 +32,5 @@
 /**
  * ToggleDialog that lets you filter the images that are being shown.
- * 
+ *
  * @author nokutu
  * @see MapillaryFilterChooseSigns
@@ -40,5 +40,7 @@
     MapillaryDataListener {
 
-  public static MapillaryFilterDialog INSTANCE;
+  private static final long serialVersionUID = -4192029663670922103L;
+
+  private static MapillaryFilterDialog INSTANCE;
 
   private final static String[] TIME_LIST = { tr("All time"), tr("This year"),
@@ -50,16 +52,16 @@
   private final JPanel panel = new JPanel(new GridLayout(ROWS, COLUMNS));
 
-  public final JCheckBox imported = new JCheckBox("Imported images");
-  public final JCheckBox downloaded = new JCheckBox(
+  private final JCheckBox imported = new JCheckBox("Imported images");
+  private final JCheckBox downloaded = new JCheckBox(
       new downloadCheckBoxAction());
-  public final JCheckBox onlySigns = new JCheckBox(new OnlySignsAction());
-  public final JComboBox<String> time;
-  public final JTextField user;
-
-  public final SideButton updateButton = new SideButton(new UpdateAction());
-  public final SideButton resetButton = new SideButton(new ResetAction());
-  public final JButton signChooser = new JButton(new SignChooserAction());
-
-  public final MapillaryFilterChooseSigns signFilter = MapillaryFilterChooseSigns
+  private final JCheckBox onlySigns = new JCheckBox(new OnlySignsAction());
+  private final JComboBox<String> time;
+  private final JTextField user;
+
+  private final SideButton updateButton = new SideButton(new UpdateAction());
+  private final SideButton resetButton = new SideButton(new ResetAction());
+  private final JButton signChooser = new JButton(new SignChooserAction());
+
+  private final MapillaryFilterChooseSigns signFilter = MapillaryFilterChooseSigns
       .getInstance();
 
@@ -74,5 +76,5 @@
       "prohibitory_noturn" };
   /** The the {@link JCheckBox} where the respective tag should be searched */
-  private final JCheckBox[] SIGN_CHECKBOXES = { signFilter.maxspeed,
+  private final JCheckBox[] SIGN_CHECKBOXES = { signFilter.maxSpeed,
       signFilter.stop, signFilter.giveWay, signFilter.roundabout,
       signFilter.access, signFilter.access, signFilter.intersection,
@@ -81,5 +83,5 @@
       signFilter.crossing, signFilter.noTurn, signFilter.noTurn };
 
-  public MapillaryFilterDialog() {
+  private MapillaryFilterDialog() {
     super(tr("Mapillary filter"), "mapillaryfilter.png",
         tr("Open Mapillary filter dialog"), Shortcut.registerShortcut(
@@ -119,4 +121,9 @@
   }
 
+  /**
+   * Returns the unique instance of the class.
+   *
+   * @return THe unique instance of the class.
+   */
   public static MapillaryFilterDialog getInstance() {
     if (INSTANCE == null)
@@ -209,5 +216,5 @@
   /**
    * Checks if the image fulfills the sign conditions.
-   * 
+   *
    * @param img
    *          The {@link MapillaryAbstractImage} object that is going to be
@@ -243,4 +250,6 @@
   private class downloadCheckBoxAction extends AbstractAction {
 
+    private static final long serialVersionUID = 4672634002899519496L;
+
     public downloadCheckBoxAction() {
       putValue(NAME, tr("Downloaded images"));
@@ -254,4 +263,7 @@
 
   private class UpdateAction extends AbstractAction {
+
+    private static final long serialVersionUID = -7417238601979689863L;
+
     public UpdateAction() {
       putValue(NAME, tr("Update"));
@@ -265,4 +277,9 @@
 
   private class ResetAction extends AbstractAction {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1178261778165525040L;
+
     public ResetAction() {
       putValue(NAME, tr("Reset"));
@@ -276,4 +293,7 @@
 
   private class OnlySignsAction extends AbstractAction {
+
+    private static final long serialVersionUID = -2937440338019185723L;
+
     public OnlySignsAction() {
       putValue(NAME, tr("Only images with signs"));
@@ -288,9 +308,12 @@
   /**
    * Opens a new window where you can specifically filter signs.
-   * 
+   *
    * @author nokutu
    *
    */
   private class SignChooserAction extends AbstractAction {
+
+    private static final long serialVersionUID = 8706299665735930148L;
+
     public SignChooserAction() {
       putValue(NAME, tr("Choose signs"));
@@ -310,4 +333,7 @@
   }
 
+  /**
+   * Destroys the unique instance of the class.
+   */
   public static void destroyInstance() {
     MapillaryFilterDialog.INSTANCE = null;
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java	(revision 31389)
@@ -33,5 +33,5 @@
  * Toggle dialog that shows you the latest {@link MapillaryCommand} done and
  * allows the user to revert them.
- * 
+ *
  * @see MapillaryRecord
  * @see MapillaryCommand
@@ -42,5 +42,7 @@
     MapillaryRecordListener {
 
-  public static MapillaryHistoryDialog INSTANCE;
+  private static final long serialVersionUID = -3019715241209349372L;
+
+  private static MapillaryHistoryDialog INSTANCE;
 
   private final DefaultTreeModel undoTreeModel = new DefaultTreeModel(
@@ -57,5 +59,5 @@
   private SideButton redoButton;
 
-  public MapillaryHistoryDialog() {
+  private MapillaryHistoryDialog() {
     super(tr("Mapillary history"), "mapillaryhistory.png",
         tr("Open Mapillary history dialog"), Shortcut.registerShortcut(
@@ -92,4 +94,9 @@
   }
 
+  /**
+   * Returns the unique instance of the class.
+   *
+   * @return The unique instance of the class.
+   */
   public static MapillaryHistoryDialog getInstance() {
     if (INSTANCE == null)
@@ -141,4 +148,6 @@
   private class UndoAction extends AbstractAction {
 
+    private static final long serialVersionUID = -6435832206342007269L;
+
     public UndoAction() {
       putValue(NAME, tr("Undo"));
@@ -154,4 +163,7 @@
 
   private class RedoAction extends AbstractAction {
+
+    private static final long serialVersionUID = -2761935780353053512L;
+
     public RedoAction() {
       putValue(NAME, tr("Redo"));
@@ -167,4 +179,7 @@
 
   private static class MapillaryCellRenderer extends DefaultTreeCellRenderer {
+
+    private static final long serialVersionUID = -3129520241562296901L;
+
     @Override
     public Component getTreeCellRendererComponent(JTree tree, Object value,
@@ -177,4 +192,7 @@
   }
 
+  /**
+   * Destroys the unique instance of the class.
+   */
   public static void destroyInstance() {
     MapillaryHistoryDialog.INSTANCE = null;
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java	(revision 31389)
@@ -27,9 +27,11 @@
  * included in a {@link MapillaryMainDialog} object.
  *
- * @author Jorge
+ * @author nokutu
  * @see MapillaryImageDisplay
  * @see MapillaryMainDialog
  */
 public class MapillaryImageDisplay extends JComponent {
+
+  private static final long serialVersionUID = 3369727203329307716L;
 
   private static final int DRAG_BUTTON = Main.pref.getInteger(
@@ -55,5 +57,5 @@
   private Rectangle selectedRect = null;
 
-  public HyperlinkLabel hyperlink;
+  protected HyperlinkLabel hyperlink;
 
   private class ImgDisplayMouseListener implements MouseListener,
@@ -324,4 +326,7 @@
   }
 
+  /**
+   * Main constructor.
+   */
   public MapillaryImageDisplay() {
     ImgDisplayMouseListener mouseListener = new ImgDisplayMouseListener();
@@ -356,7 +361,7 @@
 
   /**
-   * Returns the picture that is being displayerd
+   * Returns the picture that is being displayed
    *
-   * @return
+   * @return The picture that is being displayed.
    */
   public BufferedImage getImage() {
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java	(revision 31389)
@@ -47,24 +47,28 @@
     ICachedLoaderListener, MapillaryDataListener {
 
-  public final static String BASE_TITLE = "Mapillary picture";
-
-  public static MapillaryMainDialog INSTANCE;
-
-  public volatile MapillaryAbstractImage image;
-
-  public final SideButton nextButton = new SideButton(new nextPictureAction());
-  public final SideButton previousButton = new SideButton(
+  private static final long serialVersionUID = 6856496736429480600L;
+
+  private final static String BASE_TITLE = "Mapillary picture";
+
+  private static MapillaryMainDialog INSTANCE;
+
+  private volatile MapillaryAbstractImage image;
+
+  private final SideButton nextButton = new SideButton(new nextPictureAction());
+  private final SideButton previousButton = new SideButton(
       new previousPictureAction());
+  /** Button used to jump to the image following the red line */
   public final SideButton redButton = new SideButton(new redAction());
+  /** Button used to jump to the image following the blue line */
   public final SideButton blueButton = new SideButton(new blueAction());
 
   private JPanel buttonsPanel;
 
-  public MapillaryImageDisplay mapillaryImageDisplay;
+  private MapillaryImageDisplay mapillaryImageDisplay;
 
   private MapillaryCache imageCache;
   private MapillaryCache thumbnailCache;
 
-  public MapillaryMainDialog() {
+  private MapillaryMainDialog() {
     super(tr(BASE_TITLE), "mapillary.png", tr("Open Mapillary window"),
         Shortcut.registerShortcut(tr("Mapillary dialog"),
@@ -105,4 +109,9 @@
   }
 
+  /**
+   * Returns the unique instance of the class.
+   *
+   * @return The unique instance of the class.
+   */
   public static MapillaryMainDialog getInstance() {
     if (INSTANCE == null)
@@ -111,4 +120,7 @@
   }
 
+  /**
+   * Destroys the unique instance of the class.
+   */
   public static void destroyInstance() {
     INSTANCE = null;
@@ -258,7 +270,7 @@
 
   /**
-   * Returns the MapillaryImage objects which is being shown.
-   *
-   * @return
+   * Returns the {@link MapillaryAbstractImage} object which is being shown.
+   *
+   * @return The {@link MapillaryAbstractImage} object which is being shown.
    */
   public synchronized MapillaryAbstractImage getImage() {
@@ -269,8 +281,11 @@
    * Action class form the next image button.
    *
-   * @author Jorge
+   * @author nokutu
    *
    */
   class nextPictureAction extends AbstractAction {
+
+    private static final long serialVersionUID = 3023827221453154340L;
+
     public nextPictureAction() {
       putValue(NAME, tr("Next picture"));
@@ -287,8 +302,11 @@
    * Action class for the previous image button.
    *
-   * @author Jorge
+   * @author nokutu
    *
    */
   class previousPictureAction extends AbstractAction {
+
+    private static final long serialVersionUID = -6420511632957956012L;
+
     public previousPictureAction() {
       putValue(NAME, tr("Previous picture"));
@@ -310,4 +328,7 @@
    */
   class redAction extends AbstractAction {
+
+    private static final long serialVersionUID = -6480229431481386376L;
+
     public redAction() {
       putValue(NAME, tr("Jump to red"));
@@ -331,4 +352,7 @@
    */
   class blueAction extends AbstractAction {
+
+    private static final long serialVersionUID = 6250690644594703314L;
+
     public blueAction() {
       putValue(NAME, tr("Jump to blue"));
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryOAuthUI.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryOAuthUI.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryOAuthUI.java	(revision 31389)
@@ -19,6 +19,8 @@
 public class MapillaryOAuthUI extends JPanel {
 
-  PortListener portListener;
-  JLabel text;
+  private static final long serialVersionUID = 5882019193626545915L;
+
+  private PortListener portListener;
+  private JLabel text;
 
   /**
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 31389)
@@ -19,4 +19,10 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
 
+/**
+ * Creates the preferences panel for the plugin.
+ *
+ * @author nokutu
+ *
+ */
 public class MapillaryPreferenceSetting implements SubPreferenceSetting {
 
@@ -79,5 +85,13 @@
   }
 
+  /**
+   * Opens the {@link MapillaryoAuthUI} window and lets the user log in.
+   *
+   * @author nokutu
+   *
+   */
   public class OAuthAction extends AbstractAction {
+
+    private static final long serialVersionUID = -3908477563072057344L;
 
     @Override
@@ -97,4 +111,7 @@
 
   private class LoginAction extends AbstractAction {
+
+    private static final long serialVersionUID = -7157028112711343289L;
+
     private JOptionPane pane;
 
@@ -111,4 +128,7 @@
 
   private class CancelAction extends AbstractAction {
+
+    private static final long serialVersionUID = 2329066472975953270L;
+
     private JOptionPane pane;
 
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java	(revision 31389)
@@ -12,13 +12,19 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryData;
 
+/**
+ * Superclass for all the mode of the {@link MapillaryLayer}
+ *
+ * @author nokutu
+ * @see MapillaryLayer
+ *
+ */
 public abstract class AbstractMode extends MouseAdapter {
 
   protected MapillaryData data = MapillaryData.getInstance();
-  
+
+  /**
+   * Cursor that should become active when this mode is activated.
+   */
   public int cursor = Cursor.DEFAULT_CURSOR;
-
-  public AbstractMode() {
-    super();
-  }
 
   protected MapillaryAbstractImage getClosest(Point clickPoint) {
@@ -30,5 +36,6 @@
       imagePoint.setLocation(imagePoint.getX(), imagePoint.getY());
       double dist = clickPoint.distanceSq(imagePoint);
-      if (minDistance > dist && clickPoint.distance(imagePoint) < snapDistance && image.isVisible()) {
+      if (minDistance > dist && clickPoint.distance(imagePoint) < snapDistance
+          && image.isVisible()) {
         minDistance = dist;
         closest = image;
@@ -38,6 +45,12 @@
   }
 
+  /**
+   * Paints whatever the mode needs.
+   *
+   * @param g
+   * @param mv
+   * @param box
+   */
   public abstract void paint(Graphics2D g, MapView mv, Bounds box);
 
-
 }
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java	(revision 31389)
@@ -16,9 +16,18 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillarySequence;
 
+/**
+ * In this mode the user can join pictures to make sequences or unjoin them.
+ *
+ * @author nokutu
+ *
+ */
 public class JoinMode extends AbstractMode {
 
-  public MapillaryImportedImage lastClick;
-  public MouseEvent lastPos;
-  
+  private MapillaryImportedImage lastClick;
+  private MouseEvent lastPos;
+
+  /**
+   * Main constructor.
+   */
   public JoinMode() {
     cursor = Cursor.CROSSHAIR_CURSOR;
@@ -29,12 +38,16 @@
     if (data.getHighlighted() == null)
       return;
-    if (lastClick == null && data.getHighlighted() instanceof MapillaryImportedImage) {
+    if (lastClick == null
+        && data.getHighlighted() instanceof MapillaryImportedImage) {
       lastClick = (MapillaryImportedImage) data.getHighlighted();
-    } else if (lastClick != null && data.getHighlighted() instanceof MapillaryImportedImage) {
-      if (((data.getHighlighted().previous() == null && lastClick.next() == null) || (data.getHighlighted().next() == null && lastClick
-          .previous() == null))
-          && (data.getHighlighted().getSequence() != lastClick.getSequence() || lastClick.getSequence() == null)) {
+    } else if (lastClick != null
+        && data.getHighlighted() instanceof MapillaryImportedImage) {
+      if (((data.getHighlighted().previous() == null && lastClick.next() == null) || (data
+          .getHighlighted().next() == null && lastClick.previous() == null))
+          && (data.getHighlighted().getSequence() != lastClick.getSequence() || lastClick
+              .getSequence() == null)) {
         join(lastClick, (MapillaryImportedImage) data.getHighlighted());
-      } else if (lastClick.next() == data.getHighlighted() || lastClick.previous() == data.getHighlighted())
+      } else if (lastClick.next() == data.getHighlighted()
+          || lastClick.previous() == data.getHighlighted())
         unjoin(lastClick, (MapillaryImportedImage) data.getHighlighted());
       lastClick = null;
@@ -93,8 +106,12 @@
     }
 
-    ArrayList<MapillaryAbstractImage> firstHalf = new ArrayList<>(img1.getSequence().getImages()
+    ArrayList<MapillaryAbstractImage> firstHalf = new ArrayList<>(img1
+        .getSequence().getImages()
         .subList(0, img1.getSequence().getImages().indexOf(img2)));
-    ArrayList<MapillaryAbstractImage> secondHalf = new ArrayList<>(img1.getSequence().getImages()
-        .subList(img1.getSequence().getImages().indexOf(img2), img1.getSequence().getImages().size()));
+    ArrayList<MapillaryAbstractImage> secondHalf = new ArrayList<>(img1
+        .getSequence()
+        .getImages()
+        .subList(img1.getSequence().getImages().indexOf(img2),
+            img1.getSequence().getImages().size()));
 
     MapillarySequence seq1 = new MapillarySequence();
@@ -110,5 +127,5 @@
     }
   }
-  
+
   @Override
   public String toString() {
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java	(revision 31388)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java	(revision 31389)
@@ -38,4 +38,7 @@
   private boolean imageHighlighted = false;
 
+  /**
+   * Main constructor.
+   */
   public SelectMode() {
     record = MapillaryRecord.getInstance();