- Removed dead code in AnnotationModel.cleanup because mapLock can't be

null.
- Added new javadoc to IAnnotationMap.getLockObject()
- added assert.isLegal check to AnnotationMAp.setLockObject()

Author: mehmet-karaman

bundles/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationMap.java

@@ -21,6 +21,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.core.runtime.Assert;
+
 import org.eclipse.jface.text.Position;
 
 
@@ -56,6 +58,7 @@ public AnnotationMap(int capacity) {
 
 	@Override
 	public synchronized void setLockObject(Object lockObject) {
+		Assert.isLegal(fLockObject == null || fLockObject == lockObject, "Lock was already set"); //$NON-NLS-1$
 		fLockObject= lockObject;
 	}
 

bundles/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationModel.java

@@ -661,23 +661,12 @@ private void cleanup(boolean fireModelChanged, boolean forkNotification) {
 			IAnnotationMap annotations= getAnnotationMap();
 			Object mapLock = annotations.getLockObject();
 
-			if (mapLock == null) {
-				Iterator<Annotation> e= annotations.keySetIterator();
-				while (e.hasNext()) {
-					Annotation a= e.next();
-					Position p= annotations.get(a);
+			synchronized (mapLock) {
+				annotations.forEach((a, p) -> {
 					if (p == null || p.isDeleted()) {
 						deleted.add(a);
 					}
-				}
-			} else {
-				synchronized (mapLock) {
-					annotations.forEach((a, p) -> {
-						if (p == null || p.isDeleted()) {
-							deleted.add(a);
-						}
-					});
-				}
+				});
 			}
 
 			if (fireModelChanged && forkNotification) {

bundles/org.eclipse.text/src/org/eclipse/jface/text/source/IAnnotationMap.java

@@ -79,4 +79,12 @@ public interface IAnnotationMap extends Map<Annotation, Position>, ISynchronizab
 	 */
 	@Override
 	Collection<Position> values();
+	
+	/**
+	 * {@inheritDoc}
+	 * Implementers of this interface should <b>never</b> return null. 
+	 * @return <b>never</b> returns null 
+	 */
+	@Override
+	Object getLockObject();
 }