From 8dc1fe22e71edb846c142dabc718638035c51567 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Sun, 25 Nov 2018 16:22:05 +0300 Subject: [PATCH] cleanup --- .../highlighting/JavaReadWriteAccessDetector.java | 4 +++- .../src/com/intellij/openapi/editor/SelectionModel.java | 4 ++-- .../com/intellij/find/impl/livePreview/SearchResults.java | 6 +++--- .../psi/impl/source/tree/injected/SelectionModelWindow.java | 4 ++-- .../intellij/openapi/editor/impl/SelectionModelImpl.java | 4 ++-- .../editor/textarea/TextComponentSelectionModel.java | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java b/java/java-psi-impl/src/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java index bfac72c3d078..58f1e1f0e26f 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java @@ -26,7 +26,9 @@ import org.jetbrains.annotations.NotNull; public class JavaReadWriteAccessDetector extends ReadWriteAccessDetector { @Override public boolean isReadWriteAccessible(@NotNull final PsiElement element) { - return element instanceof PsiVariable && !(element instanceof ImplicitVariable) || element instanceof PsiClass || element instanceof PsiAnnotationMethod && !(element instanceof PsiCompiledElement); + return element instanceof PsiVariable && !(element instanceof ImplicitVariable) + || element instanceof PsiClass + || element instanceof PsiAnnotationMethod && !(element instanceof PsiCompiledElement); } @Override diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/SelectionModel.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/SelectionModel.java index 9ba331993598..de087a585ec0 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/SelectionModel.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/SelectionModel.java @@ -144,7 +144,7 @@ public interface SelectionModel { * * @param listener the listener instance. */ - void addSelectionListener(SelectionListener listener); + void addSelectionListener(@NotNull SelectionListener listener); /** * Adds a listener for receiving information about selection changes, which is removed when the given disposable is disposed. @@ -161,7 +161,7 @@ public interface SelectionModel { * * @param listener the listener instance. */ - void removeSelectionListener(SelectionListener listener); + void removeSelectionListener(@NotNull SelectionListener listener); /** * Selects the entire line of text at the caret position. diff --git a/platform/lang-impl/src/com/intellij/find/impl/livePreview/SearchResults.java b/platform/lang-impl/src/com/intellij/find/impl/livePreview/SearchResults.java index 6a32a1343f76..03b1aa571917 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/livePreview/SearchResults.java +++ b/platform/lang-impl/src/com/intellij/find/impl/livePreview/SearchResults.java @@ -141,11 +141,11 @@ public class SearchResults implements DocumentListener { void updateFinished(); } - public void addListener(SearchResultsListener srl) { + public void addListener(@NotNull SearchResultsListener srl) { myListeners.add(srl); } - public void removeListener(SearchResultsListener srl) { + public void removeListener(@NotNull SearchResultsListener srl) { myListeners.remove(srl); } @@ -329,7 +329,7 @@ public class SearchResults implements DocumentListener { updateCursor(oldCursorRange, next); updateExcluded(); notifyChanged(); - if (oldCursorRange == null || myCursor == null || !myCursor.equals(oldCursorRange)) { + if (myCursor == null || !myCursor.equals(oldCursorRange)) { if (toChangeSelection) { mySelectionManager.updateSelection(true, true); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/SelectionModelWindow.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/SelectionModelWindow.java index d51ecff421f0..c284e4b7595e 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/SelectionModelWindow.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/SelectionModelWindow.java @@ -109,12 +109,12 @@ class SelectionModelWindow implements SelectionModel { } @Override - public void addSelectionListener(final SelectionListener listener) { + public void addSelectionListener(@NotNull final SelectionListener listener) { myHostModel.addSelectionListener(listener); } @Override - public void removeSelectionListener(final SelectionListener listener) { + public void removeSelectionListener(@NotNull final SelectionListener listener) { myHostModel.removeSelectionListener(listener); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java index 85ee40685d1c..b969e2e9925b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java @@ -183,12 +183,12 @@ public class SelectionModelImpl implements SelectionModel { } @Override - public void addSelectionListener(SelectionListener listener) { + public void addSelectionListener(@NotNull SelectionListener listener) { mySelectionListeners.add(listener); } @Override - public void removeSelectionListener(SelectionListener listener) { + public void removeSelectionListener(@NotNull SelectionListener listener) { boolean success = mySelectionListeners.remove(listener); LOG.assertTrue(success); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSelectionModel.java b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSelectionModel.java index a4fa28a9f466..4eb515d8d7c7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSelectionModel.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSelectionModel.java @@ -136,12 +136,12 @@ public class TextComponentSelectionModel implements SelectionModel { } @Override - public void addSelectionListener(final SelectionListener listener) { + public void addSelectionListener(@NotNull final SelectionListener listener) { throw new UnsupportedOperationException("Not implemented"); } @Override - public void removeSelectionListener(final SelectionListener listener) { + public void removeSelectionListener(@NotNull final SelectionListener listener) { throw new UnsupportedOperationException("Not implemented"); }