Index: src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 6087)
+++ src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(working copy)
@@ -293,7 +293,7 @@
      */
     @Override
     public Date getTimestamp() {
-        return new Date(timestamp * 1000l);
+        return new Date(timestamp * 1000L);
     }
 
     @Override
Index: src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 6087)
+++ src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(working copy)
@@ -864,7 +864,7 @@
 
             // Find day difference
             final int dayOffset = (int)Math.round(diffInH / 24); // days
-            double tmz = diff - dayOffset*24*60*60l;  // seconds
+            double tmz = diff - dayOffset*24*60*60L;  // seconds
 
             // In hours, rounded to two decimal places
             tmz = (double)Math.round(tmz*100/(60*60)) / 100;
@@ -1044,7 +1044,7 @@
 
             // Find day difference
             int dayOffset = (int)Math.round(diffInH / 24); // days
-            double tz = diff - dayOffset*24*60*60l;  // seconds
+            double tz = diff - dayOffset*24*60*60L;  // seconds
 
             // In hours, rounded to two decimal places
             tz = (double)Math.round(tz*100/(60*60)) / 100;
Index: src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 6087)
+++ src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(working copy)
@@ -155,7 +155,7 @@
     private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener {
 
         boolean mouseIsDragging = false;
-        long lastTimeForMousePoint = 0l;
+        long lastTimeForMousePoint = 0L;
         Point mousePointInImg = null;
 
         /** Zoom in and out, trying to preserve the point of the image that was under the mouse cursor
Index: src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
===================================================================
--- src/org/openstreetmap/josm/gui/mappaint/StyleSource.java	(revision 6087)
+++ src/org/openstreetmap/josm/gui/mappaint/StyleSource.java	(working copy)
@@ -25,7 +25,7 @@
     public File zipIcons;
 
     private ImageIcon imageIcon;
-    private long lastMTime = 0l;
+    private long lastMTime = 0L;
 
     /******
      * The following fields is additional information found in the header
Index: src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 6087)
+++ src/org/openstreetmap/josm/io/MirroredInputStream.java	(working copy)
@@ -32,7 +32,7 @@
     InputStream fs = null;
     File file = null;
 
-    public final static long DEFAULT_MAXTIME = -1l;
+    public final static long DEFAULT_MAXTIME = -1L;
 
     public MirroredInputStream(String name) throws IOException {
         this(name, null, DEFAULT_MAXTIME);
Index: src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
===================================================================
--- src/org/openstreetmap/josm/io/OsmChangesetContentParser.java	(revision 6087)
+++ src/org/openstreetmap/josm/io/OsmChangesetContentParser.java	(working copy)
@@ -75,7 +75,7 @@
             if (v == null) {
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
-            Long l = 0l;
+            Long l = 0L;
             try {
                 l = Long.parseLong(v);
             } catch(NumberFormatException e) {
Index: src/org/openstreetmap/josm/io/OsmHistoryReader.java
===================================================================
--- src/org/openstreetmap/josm/io/OsmHistoryReader.java	(revision 6087)
+++ src/org/openstreetmap/josm/io/OsmHistoryReader.java	(working copy)
@@ -71,7 +71,7 @@
             if (v == null) {
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
-            Long l = 0l;
+            Long l = 0L;
             try {
                 l = Long.parseLong(v);
             } catch(NumberFormatException e) {
Index: src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6087)
+++ src/org/openstreetmap/josm/plugins/PluginHandler.java	(working copy)
@@ -280,7 +280,7 @@
             long tim = System.currentTimeMillis();
             long last = Main.pref.getLong("pluginmanager.lastupdate", 0);
             Integer maxTime = Main.pref.getInteger("pluginmanager.time-based-update.interval", DEFAULT_TIME_BASED_UPDATE_INTERVAL);
-            long d = (tim - last) / (24 * 60 * 60 * 1000l);
+            long d = (tim - last) / (24 * 60 * 60 * 1000L);
             if ((last <= 0) || (maxTime <= 0)) {
                 Main.pref.put("pluginmanager.lastupdate", Long.toString(tim));
             } else if (d > maxTime) {