Index: /trunk/scripts/SyncEditorLayerIndex.java
===================================================================
--- /trunk/scripts/SyncEditorLayerIndex.java	(revision 15850)
+++ /trunk/scripts/SyncEditorLayerIndex.java	(revision 15851)
@@ -251,6 +251,5 @@
                 if (res.matches()) {
                     String s = res.group(2);
-                    if(s.endsWith("..."))
-                    {
+                    if (s.endsWith("...")) {
                         s = s.substring(0, s.length() - 3);
                         if ("Ignore".equals(res.group(1))) {
@@ -259,7 +258,5 @@
                             skipStart.put(s, "darkgoldenrod");
                         }
-                    }
-                    else
-                    {
+                    } else {
                         if ("Ignore".equals(res.group(1))) {
                             skip.put(s, "green");
@@ -294,5 +291,5 @@
         return null;
     }
-    
+
     void myprintln(String s) {
         String color;
Index: /trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java	(revision 15850)
+++ /trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java	(revision 15851)
@@ -45,5 +45,5 @@
 
     /**
-     * <code>TargetLayerDialogResult</code> returned by {@link #askTargetLayer(List, String, boolean)}
+     * <code>TargetLayerDialogResult</code> returned by {@link #askTargetLayer}
      * containing the selectedTargetLayer and whether the checkbox is ticked
      * @param <T> type of layer
Index: /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 15850)
+++ /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 15851)
@@ -204,5 +204,5 @@
     }
 
-    private NavigableSet<Integer> getNumericValues() {
+    private synchronized NavigableSet<Integer> getNumericValues() {
         DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
         if (ds == null) {