NotNull, cleanup

diff --git a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorEventMulticaster.java b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorEventMulticaster.java
index d87fd78cdfc69491e6dad94909d68df1d6b4337f..8a5f52a770fd36098106eed5a6e7c565e67a2842 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorEventMulticaster.java
+++ b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorEventMulticaster.java
@@ -16,6 +16,7 @@
 package com.intellij.openapi.editor.event;
 
 import com.intellij.openapi.Disposable;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Allows to attach listeners which receive notifications about changes in any currently open
@@ -24,25 +25,25 @@ import com.intellij.openapi.Disposable;
  * @see com.intellij.openapi.editor.EditorFactory#getEventMulticaster() 
  */
 public interface EditorEventMulticaster {
-  void addDocumentListener(DocumentListener listener);
-  void addDocumentListener(DocumentListener listener, Disposable parentDisposable);
-  void removeDocumentListener(DocumentListener listener);
+  void addDocumentListener(@NotNull DocumentListener listener);
+  void addDocumentListener(@NotNull DocumentListener listener, @NotNull Disposable parentDisposable);
+  void removeDocumentListener(@NotNull DocumentListener listener);
 
-  void addEditorMouseListener(EditorMouseListener listener);
-  void addEditorMouseListener(EditorMouseListener listener, Disposable parentDisposable);
-  void removeEditorMouseListener(EditorMouseListener listener);
+  void addEditorMouseListener(@NotNull EditorMouseListener listener);
+  void addEditorMouseListener(@NotNull EditorMouseListener listener, @NotNull Disposable parentDisposable);
+  void removeEditorMouseListener(@NotNull EditorMouseListener listener);
 
-  void addEditorMouseMotionListener(EditorMouseMotionListener listener);
-  void addEditorMouseMotionListener(EditorMouseMotionListener listener, Disposable parentDisposable);
-  void removeEditorMouseMotionListener(EditorMouseMotionListener listener);
+  void addEditorMouseMotionListener(@NotNull EditorMouseMotionListener listener);
+  void addEditorMouseMotionListener(@NotNull EditorMouseMotionListener listener, @NotNull Disposable parentDisposable);
+  void removeEditorMouseMotionListener(@NotNull EditorMouseMotionListener listener);
 
-  void addCaretListener(CaretListener listener);
-  void addCaretListener(CaretListener listener, Disposable parentDisposable);
-  void removeCaretListener(CaretListener listener);
+  void addCaretListener(@NotNull CaretListener listener);
+  void addCaretListener(@NotNull CaretListener listener, @NotNull Disposable parentDisposable);
+  void removeCaretListener(@NotNull CaretListener listener);
 
-  void addSelectionListener(SelectionListener listener);
-  void removeSelectionListener(SelectionListener listener);
+  void addSelectionListener(@NotNull SelectionListener listener);
+  void removeSelectionListener(@NotNull SelectionListener listener);
 
-  void addVisibleAreaListener(VisibleAreaListener listener);
-  void removeVisibleAreaListener(VisibleAreaListener listener);
+  void addVisibleAreaListener(@NotNull VisibleAreaListener listener);
+  void removeVisibleAreaListener(@NotNull VisibleAreaListener listener);
 }

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
index 53d4bc087fe9049d601e59746ddca2278fa97fc4..207e13b12773204e4c0b689a643937f8a5dbd200 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
@@ -43,12 +43,11 @@ import com.intellij.util.text.CharArrayUtil;
 
 import java.awt.*;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener, Disposable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.CaretModelImpl");
   private final EditorImpl myEditor;
-  private final CopyOnWriteArrayList<CaretListener> myCaretListeners = ContainerUtil.createEmptyCOWList();
+  private final List<CaretListener> myCaretListeners = ContainerUtil.createEmptyCOWList();
   private LogicalPosition myLogicalCaret;
   private VerticalInfo myCaretInfo;
   private VisualPosition myVisibleCaret;
@@ -385,7 +384,7 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
     int lineHeight = myEditor.getLineHeight();
     Rectangle visibleArea = myEditor.getScrollingModel().getVisibleArea();
     final EditorGutterComponentEx gutter = myEditor.getGutterComponentEx();
-    final EditorComponentImpl content = (EditorComponentImpl)myEditor.getContentComponent();
+    final EditorComponentImpl content = myEditor.getContentComponent();
 
     int updateWidth = myEditor.getScrollPane().getHorizontalScrollBar().getValue() + visibleArea.width;
     if (Math.abs(myCaretInfo.y - oldCaretInfo.y) <= 2 * lineHeight) {

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/event/EditorEventMulticasterImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/event/EditorEventMulticasterImpl.java
index 48d8126849c0f1ff777039579372bc334f0396b5..7e4ce756bba16cafcd1c9555ab6d04c3eab6587e 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/event/EditorEventMulticasterImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/event/EditorEventMulticasterImpl.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.editor.event.*;
 import com.intellij.openapi.editor.ex.*;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.util.EventDispatcher;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
 import java.beans.PropertyChangeListener;
@@ -57,11 +58,11 @@ public class EditorEventMulticasterImpl implements EditorEventMulticasterEx {
     editor.addFocusListener(myFocusChangeListenerMulticaster.getMulticaster());
   }
 
-  public void addDocumentListener(DocumentListener listener) {
+  public void addDocumentListener(@NotNull DocumentListener listener) {
     myDocumentMulticaster.addListener(listener);
   }
 
-  public void addDocumentListener(final DocumentListener listener, Disposable parentDisposable) {
+  public void addDocumentListener(@NotNull final DocumentListener listener, @NotNull Disposable parentDisposable) {
     addDocumentListener(listener);
     Disposer.register(parentDisposable, new Disposable() {
       public void dispose() {
@@ -70,15 +71,15 @@ public class EditorEventMulticasterImpl implements EditorEventMulticasterEx {
     });
   }
 
-  public void removeDocumentListener(DocumentListener listener) {
+  public void removeDocumentListener(@NotNull DocumentListener listener) {
     myDocumentMulticaster.removeListener(listener);
   }
 
-  public void addEditorMouseListener(EditorMouseListener listener) {
+  public void addEditorMouseListener(@NotNull EditorMouseListener listener) {
     myEditorMouseMulticaster.addListener(listener);
   }
 
-  public void addEditorMouseListener(final EditorMouseListener listener, final Disposable parentDisposable) {
+  public void addEditorMouseListener(@NotNull final EditorMouseListener listener, @NotNull final Disposable parentDisposable) {
     addEditorMouseListener(listener);
     Disposer.register(parentDisposable, new Disposable() {
       public void dispose() {
@@ -87,15 +88,15 @@ public class EditorEventMulticasterImpl implements EditorEventMulticasterEx {
     });
   }
 
-  public void removeEditorMouseListener(EditorMouseListener listener) {
+  public void removeEditorMouseListener(@NotNull EditorMouseListener listener) {
     myEditorMouseMulticaster.removeListener(listener);
   }
 
-  public void addEditorMouseMotionListener(EditorMouseMotionListener listener) {
+  public void addEditorMouseMotionListener(@NotNull EditorMouseMotionListener listener) {
     myEditorMouseMotionMulticaster.addListener(listener);
   }
 
-  public void addEditorMouseMotionListener(final EditorMouseMotionListener listener, final Disposable parentDisposable) {
+  public void addEditorMouseMotionListener(@NotNull final EditorMouseMotionListener listener, @NotNull final Disposable parentDisposable) {
     addEditorMouseMotionListener(listener);
     Disposer.register(parentDisposable, new Disposable() {
       public void dispose() {
@@ -104,15 +105,15 @@ public class EditorEventMulticasterImpl implements EditorEventMulticasterEx {
     });
   }
 
-  public void removeEditorMouseMotionListener(EditorMouseMotionListener listener) {
+  public void removeEditorMouseMotionListener(@NotNull EditorMouseMotionListener listener) {
     myEditorMouseMotionMulticaster.removeListener(listener);
   }
 
-  public void addCaretListener(CaretListener listener) {
+  public void addCaretListener(@NotNull CaretListener listener) {
     myCaretMulticaster.addListener(listener);
   }
 
-  public void addCaretListener(final CaretListener listener, final Disposable parentDisposable) {
+  public void addCaretListener(@NotNull final CaretListener listener, @NotNull final Disposable parentDisposable) {
     addCaretListener(listener);
     Disposer.register(parentDisposable, new Disposable() {
       public void dispose() {
@@ -121,15 +122,15 @@ public class EditorEventMulticasterImpl implements EditorEventMulticasterEx {
     });
   }
 
-  public void removeCaretListener(CaretListener listener) {
+  public void removeCaretListener(@NotNull CaretListener listener) {
     myCaretMulticaster.removeListener(listener);
   }
 
-  public void addSelectionListener(SelectionListener listener) {
+  public void addSelectionListener(@NotNull SelectionListener listener) {
     mySelectionMulticaster.addListener(listener);
   }
 
-  public void removeSelectionListener(SelectionListener listener) {
+  public void removeSelectionListener(@NotNull SelectionListener listener) {
     mySelectionMulticaster.removeListener(listener);
   }
 
@@ -141,11 +142,11 @@ public class EditorEventMulticasterImpl implements EditorEventMulticasterEx {
     myErrorStripeMulticaster.removeListener(listener);
   }
 
-  public void addVisibleAreaListener(VisibleAreaListener listener) {
+  public void addVisibleAreaListener(@NotNull VisibleAreaListener listener) {
     myVisibleAreaMulticaster.addListener(listener);
   }
 
-  public void removeVisibleAreaListener(VisibleAreaListener listener) {
+  public void removeVisibleAreaListener(@NotNull VisibleAreaListener listener) {
     myVisibleAreaMulticaster.removeListener(listener);
   }
 
@@ -176,17 +177,17 @@ public class EditorEventMulticasterImpl implements EditorEventMulticasterEx {
   @TestOnly
   public Map<Class, List> getListeners() {
     Map<Class, List> myCopy = new LinkedHashMap<Class, List>();
-    myCopy.put(DocumentListener.class, new ArrayList(myDocumentMulticaster.getListeners()));
-    myCopy.put(EditReadOnlyListener.class, new ArrayList(myEditReadOnlyMulticaster.getListeners()));
-
-    myCopy.put(EditorMouseListener.class, new ArrayList(myEditorMouseMulticaster.getListeners()));
-    myCopy.put(EditorMouseMotionListener.class, new ArrayList(myEditorMouseMotionMulticaster.getListeners()));
-    myCopy.put(ErrorStripeListener.class, new ArrayList(myErrorStripeMulticaster.getListeners()));
-    myCopy.put(CaretListener.class, new ArrayList(myCaretMulticaster.getListeners()));
-    myCopy.put(SelectionListener.class, new ArrayList(mySelectionMulticaster.getListeners()));
-    myCopy.put(VisibleAreaListener.class, new ArrayList(myVisibleAreaMulticaster.getListeners()));
-    myCopy.put(PropertyChangeListener.class, new ArrayList(myPropertyChangeMulticaster.getListeners()));
-    myCopy.put(FocusChangeListener.class, new ArrayList(myFocusChangeListenerMulticaster.getListeners()));
+    myCopy.put(DocumentListener.class, new ArrayList<DocumentListener>(myDocumentMulticaster.getListeners()));
+    myCopy.put(EditReadOnlyListener.class, new ArrayList<EditReadOnlyListener>(myEditReadOnlyMulticaster.getListeners()));
+
+    myCopy.put(EditorMouseListener.class, new ArrayList<EditorMouseListener>(myEditorMouseMulticaster.getListeners()));
+    myCopy.put(EditorMouseMotionListener.class, new ArrayList<EditorMouseMotionListener>(myEditorMouseMotionMulticaster.getListeners()));
+    myCopy.put(ErrorStripeListener.class, new ArrayList<ErrorStripeListener>(myErrorStripeMulticaster.getListeners()));
+    myCopy.put(CaretListener.class, new ArrayList<CaretListener>(myCaretMulticaster.getListeners()));
+    myCopy.put(SelectionListener.class, new ArrayList<SelectionListener>(mySelectionMulticaster.getListeners()));
+    myCopy.put(VisibleAreaListener.class, new ArrayList<VisibleAreaListener>(myVisibleAreaMulticaster.getListeners()));
+    myCopy.put(PropertyChangeListener.class, new ArrayList<PropertyChangeListener>(myPropertyChangeMulticaster.getListeners()));
+    myCopy.put(FocusChangeListener.class, new ArrayList<FocusChangeListener>(myFocusChangeListenerMulticaster.getListeners()));
     return myCopy;
   }
 }

diff --git a/platform/testFramework/src/com/intellij/mock/MockEditorEventMulticaster.java b/platform/testFramework/src/com/intellij/mock/MockEditorEventMulticaster.java
index 6a7c2c7b134653f8228b806b4751aeb6e71e22b1..297d270e81e8bd7967fb78f193efb11f66106638 100644 (file)
--- a/platform/testFramework/src/com/intellij/mock/MockEditorEventMulticaster.java
+++ b/platform/testFramework/src/com/intellij/mock/MockEditorEventMulticaster.java
@@ -17,57 +17,58 @@ package com.intellij.mock;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.editor.event.*;
+import org.jetbrains.annotations.NotNull;
 
 public class MockEditorEventMulticaster implements EditorEventMulticaster {
   public MockEditorEventMulticaster() {
   }
 
-  public void addDocumentListener(DocumentListener listener) {
+  public void addDocumentListener(@NotNull DocumentListener listener) {
   }
 
-  public void addDocumentListener(DocumentListener listener, Disposable parentDisposable) {
+  public void addDocumentListener(@NotNull DocumentListener listener, @NotNull Disposable parentDisposable) {
       }
 
-  public void removeDocumentListener(DocumentListener listener) {
+  public void removeDocumentListener(@NotNull DocumentListener listener) {
   }
 
-  public void addEditorMouseListener(EditorMouseListener listener) {
+  public void addEditorMouseListener(@NotNull EditorMouseListener listener) {
   }
 
-  public void addEditorMouseListener(final EditorMouseListener listener, final Disposable parentDisposable) {
+  public void addEditorMouseListener(@NotNull final EditorMouseListener listener, @NotNull final Disposable parentDisposable) {
   }
 
-  public void removeEditorMouseListener(EditorMouseListener listener) {
+  public void removeEditorMouseListener(@NotNull EditorMouseListener listener) {
   }
 
-  public void addEditorMouseMotionListener(EditorMouseMotionListener listener) {
+  public void addEditorMouseMotionListener(@NotNull EditorMouseMotionListener listener) {
   }
 
-  public void addEditorMouseMotionListener(EditorMouseMotionListener listener, Disposable parentDisposable) {
+  public void addEditorMouseMotionListener(@NotNull EditorMouseMotionListener listener, @NotNull Disposable parentDisposable) {
   }
 
-  public void removeEditorMouseMotionListener(EditorMouseMotionListener listener) {
+  public void removeEditorMouseMotionListener(@NotNull EditorMouseMotionListener listener) {
   }
 
-  public void addCaretListener(CaretListener listener) {
+  public void addCaretListener(@NotNull CaretListener listener) {
   }
 
-  public void addCaretListener(CaretListener listener, Disposable parentDisposable) {
+  public void addCaretListener(@NotNull CaretListener listener, @NotNull Disposable parentDisposable) {
   }
 
-  public void removeCaretListener(CaretListener listener) {
+  public void removeCaretListener(@NotNull CaretListener listener) {
   }
 
-  public void addSelectionListener(SelectionListener listener) {
+  public void addSelectionListener(@NotNull SelectionListener listener) {
   }
 
-  public void removeSelectionListener(SelectionListener listener) {
+  public void removeSelectionListener(@NotNull SelectionListener listener) {
   }
 
-  public void addVisibleAreaListener(VisibleAreaListener listener) {
+  public void addVisibleAreaListener(@NotNull VisibleAreaListener listener) {
   }
 
-  public void removeVisibleAreaListener(VisibleAreaListener listener) {
+  public void removeVisibleAreaListener(@NotNull VisibleAreaListener listener) {
   }
 
 }