Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 6089)
+++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 6090)
@@ -294,5 +294,5 @@
     @Override
     public Date getTimestamp() {
-        return new Date(timestamp * 1000l);
+        return new Date(timestamp * 1000L);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 6089)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 6090)
@@ -865,5 +865,5 @@
             // 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
@@ -1045,5 +1045,5 @@
             // 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
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 6089)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 6090)
@@ -156,5 +156,5 @@
 
         boolean mouseIsDragging = false;
-        long lastTimeForMousePoint = 0l;
+        long lastTimeForMousePoint = 0L;
         Point mousePointInImg = null;
 
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java	(revision 6089)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java	(revision 6090)
@@ -26,5 +26,5 @@
 
     private ImageIcon imageIcon;
-    private long lastMTime = 0l;
+    private long lastMTime = 0L;
 
     /******
Index: trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 6089)
+++ trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 6090)
@@ -33,5 +33,5 @@
     File file = null;
 
-    public final static long DEFAULT_MAXTIME = -1l;
+    public final static long DEFAULT_MAXTIME = -1L;
 
     public MirroredInputStream(String name) throws IOException {
Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java	(revision 6089)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java	(revision 6090)
@@ -76,5 +76,5 @@
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
-            Long l = 0l;
+            Long l = 0L;
             try {
                 l = Long.parseLong(v);
Index: trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java	(revision 6089)
+++ trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java	(revision 6090)
@@ -72,5 +72,5 @@
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
-            Long l = 0l;
+            Long l = 0L;
             try {
                 l = Long.parseLong(v);
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6089)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6090)
@@ -281,5 +281,5 @@
             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));