Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java	(revision 12057)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java	(revision 12058)
@@ -29,5 +29,5 @@
      * @since 12048
      */
-    public interface SelectionChangeEvent {
+    interface SelectionChangeEvent {
         /**
          * Gets the previous selection
Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 12057)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 12058)
@@ -1245,5 +1245,6 @@
         beginUpdate();
         try {
-            Collection<OsmPrimitive> toCleanUp = getPrimitives(primitive -> primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew()));
+            Collection<OsmPrimitive> toCleanUp = getPrimitives(
+                    primitive -> primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew()));
             if (!toCleanUp.isEmpty()) {
                 clearSelection(toCleanUp.stream().map(OsmPrimitive::getPrimitiveId));
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 12057)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 12058)
@@ -143,6 +143,6 @@
          */
         private static long floatToFixed(double number, int totalBits, int afterDecimalBits) {
-            long value = (long) (number * (1l << afterDecimalBits));
-            long highestBitMask = 1l << totalBits - 1;
+            long value = (long) (number * (1L << afterDecimalBits));
+            long highestBitMask = 1L << totalBits - 1;
             long valueMask = highestBitMask - 1;
             long signBit = number < 0 ? 0 : highestBitMask;
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 12057)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 12058)
@@ -330,5 +330,5 @@
     }
 
-    private final class EmptyFillRow extends AbstractMergePanel.MergeRow {
+    private static final class EmptyFillRow extends AbstractMergePanel.MergeRow {
         @Override
         protected JComponent merged() {
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java	(revision 12057)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java	(revision 12058)
@@ -115,9 +115,5 @@
             KeyedItem ki = (KeyedItem) item;
             if (ki.key != null && ki.getValues() != null) {
-                try {
-                    PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
-                } catch (NullPointerException e) {
-                    Main.error(e, p + ": Unable to cache " + ki);
-                }
+                PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
             }
         } else if (item instanceof Roles) {