Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 10761)
+++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 10762)
@@ -200,5 +200,5 @@
private static IDiskCacheAttributes getDiskCacheAttributes(int maxDiskObjects, String cachePath, String cacheName) {
IDiskCacheAttributes ret;
- removeStaleFiles(cachePath + File.separator + cacheName, (USE_BLOCK_CACHE.get() ? "_INDEX_v2" : "_BLOCK_v2"));
+ removeStaleFiles(cachePath + File.separator + cacheName, USE_BLOCK_CACHE.get() ? "_INDEX_v2" : "_BLOCK_v2");
cacheName = cacheName + (USE_BLOCK_CACHE.get() ? "_BLOCK_v2" : "_INDEX_v2");
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 10761)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 10762)
@@ -597,5 +597,5 @@
String values = normalizedTags.getValues(key)
.stream()
- .map(x -> ((x == null || x.isEmpty()) ? tr("missing") : x))
+ .map(x -> (x == null || x.isEmpty()) ? tr("missing") : x)
.collect(Collectors.joining(tr(", ")));
return tr("{0} ({1})", key, values);
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java (revision 10761)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java (revision 10762)
@@ -83,6 +83,6 @@
LayerListModel tableModel = (LayerListModel) ((JTable) support.getComponent()).getModel();
- LayerTransferable.Data layers = ((LayerTransferable.Data) support.getTransferable()
- .getTransferData(LayerTransferable.LAYER_DATA));
+ LayerTransferable.Data layers = (LayerTransferable.Data) support.getTransferable()
+ .getTransferData(LayerTransferable.LAYER_DATA);
int dropLocation;