Context Navigation

data

Timestamp:

2009-11-18T18:50:38+01:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3963: Synchronize does not work

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

-              r2444
+              r2471
             if (mergeById(source))
                 return;
+            if (!source.isVisible())
                 // ignore it
+                return;
+            //if (!source.isVisible())
+            // ignore it
+            //    return;
         } else {
             // try to merge onto a primitive  which has no id assigned
 …
      * Tries to merge a primitive <code>source</code> into an existing primitive with the same id.
+     *
      * @param source  the other primitive which is to be merged onto a primitive in my primitives
+     * @param source  the source primitive which is to be merged into a target primitive
      * @return true, if this method was able to merge <code>source</code> into a target object; false, otherwise
      */

-              r2455
+              r2471
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
 /**
 …
  */
 public class User {
+    static private long uidCounter = 0;
+    static private AtomicLong uidCounter = new AtomicLong();
     /**
      * the map of known users
 …
     private static long getNextLocalUid() {
         synchronized(User.class) {
+            uidCounter--;
+            return uidCounter;
+            return uidCounter.decrementAndGet();
+        }
+    }
 …
+    }
+    /**
+     * clears the static map of user ids to user objects
+     *
+     */
+    public static void clearUserMap() {
+        userMap.clear();
+    }
     /**

Note: See TracChangeset for help on using the changeset viewer.