MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2019-04-10 15:14:51 +03:00
parent e556ac091d
commit ce8f0b3e84
7 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/listeners/impl/JavaRefactoringListenerManagerImpl.java
+2 -2
View File
@@ -31,12 +31,12 @@ public class JavaRefactoringListenerManagerImpl extends JavaRefactoringListenerM
private final List<MoveMemberListener> myMoveMemberListeners = ContainerUtil.createLockFreeCopyOnWriteList();
@Override
public void addMoveMembersListener(MoveMemberListener moveMembersListener) {
public void addMoveMembersListener(@NotNull MoveMemberListener moveMembersListener) {
myMoveMemberListeners.add(moveMembersListener);
}
@Override
public void removeMoveMembersListener(MoveMemberListener moveMembersListener) {
public void removeMoveMembersListener(@NotNull MoveMemberListener moveMembersListener) {
myMoveMemberListeners.remove(moveMembersListener);
}
java/openapi/src/com/intellij/refactoring/listeners/JavaRefactoringListenerManager.java
+4 -3
View File
@@ -15,8 +15,9 @@
*/
package com.intellij.refactoring.listeners;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
/**
* @author yole
@@ -26,13 +27,13 @@ public abstract class JavaRefactoringListenerManager {
* Registers a listener for moving member by pull up, push down and extract super class/interface refactorings.
* @param moveMembersListener listener to register
*/
public abstract void addMoveMembersListener(MoveMemberListener moveMembersListener);
public abstract void addMoveMembersListener(@NotNull MoveMemberListener moveMembersListener);
/**
* Unregisters a previously registered listener.
* @param moveMembersListener listener to unregister
*/
public abstract void removeMoveMembersListener(MoveMemberListener moveMembersListener);
public abstract void removeMoveMembersListener(@NotNull MoveMemberListener moveMembersListener);
public static JavaRefactoringListenerManager getInstance(Project project) {
return ServiceManager.getService(project, JavaRefactoringListenerManager.class);
platform/platform-api/src/com/intellij/ui/components/JBScrollBar.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.RegionPainter;
import com.intellij.util.ui.UIUtil;
import org.intellij.lang.annotations.JdkConstants;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -174,7 +175,7 @@ public class JBScrollBar extends JScrollBar implements TopComponent, Interpolabl
* @return {@code true} if glass pane can process the specified event, {@code false} otherwise
*/
@Override
public boolean canBePreprocessed(MouseEvent event) {
public boolean canBePreprocessed(@NotNull MouseEvent event) {
return JBScrollPane.canBePreprocessed(event, this);
}
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java
+1 -1
View File
@@ -243,7 +243,7 @@ public class JBScrollPane extends JScrollPane {
return vsbUI instanceof ButtonlessScrollBarUI && !((ButtonlessScrollBarUI)vsbUI).alwaysShowTrack();
}
public static boolean canBePreprocessed(MouseEvent e, JScrollBar bar) {
public static boolean canBePreprocessed(@NotNull MouseEvent e, @NotNull JScrollBar bar) {
if (e.getID() == MouseEvent.MOUSE_MOVED || e.getID() == MouseEvent.MOUSE_PRESSED) {
ScrollBarUI ui = bar.getUI();
if (ui instanceof BasicScrollBarUI) {
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
+1 -1
View File
@@ -1594,7 +1594,7 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui {
}
@Override
public boolean canBePreprocessed(MouseEvent e) {
public boolean canBePreprocessed(@NotNull MouseEvent e) {
return false;
}
}
platform/util/src/com/intellij/util/containers/DisposableWrapperList.java
+27 -27
View File
@@ -34,19 +34,19 @@ import java.util.function.Predicate;
* @param <E> the type of elements held in this list
*/
public class DisposableWrapperList<E> extends AbstractList<E> {
@NotNull private final List<DisposableWrapper<E>> myWrappedList = ContainerUtil.createLockFreeCopyOnWriteList();
@NotNull private final List<DisposableWrapper> myWrappedList = ContainerUtil.createLockFreeCopyOnWriteList();
public DisposableWrapperList() {
}
@Override
public boolean add(E element) {
return myWrappedList.add(new DisposableWrapper<>(element));
return myWrappedList.add(new DisposableWrapper(element));
}
@Override
public void add(int index, E element) {
myWrappedList.add(index, new DisposableWrapper<>(element));
myWrappedList.add(index, new DisposableWrapper(element));
}
/**
@@ -59,7 +59,7 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
*/
@NotNull
public Disposable add(E element, @NotNull Disposable parentDisposable) {
DisposableWrapper<E> disposableWrapper = createDisposableWrapper(element, parentDisposable);
DisposableWrapper disposableWrapper = createDisposableWrapper(element, parentDisposable);
myWrappedList.add(disposableWrapper);
return disposableWrapper;
}
@@ -75,7 +75,7 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
*/
@NotNull
public Disposable add(int index, E element, @NotNull Disposable parentDisposable) {
DisposableWrapper<E> disposableWrapper = createDisposableWrapper(element, parentDisposable);
DisposableWrapper disposableWrapper = createDisposableWrapper(element, parentDisposable);
myWrappedList.add(index, disposableWrapper);
return disposableWrapper;
}
@@ -83,13 +83,13 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
@Override
public boolean addAll(@NotNull Collection<? extends E> collection) {
Collection<DisposableWrapper<E>> disposableWrappers = wrapAll(collection);
Collection<DisposableWrapper> disposableWrappers = wrapAll(collection);
return myWrappedList.addAll(disposableWrappers);
}
@Override
public boolean addAll(int index, @NotNull Collection<? extends E> collection) {
Collection<DisposableWrapper<E>> disposableWrappers = wrapAll(collection);
Collection<DisposableWrapper> disposableWrappers = wrapAll(collection);
return myWrappedList.addAll(index, disposableWrappers);
}
@@ -114,7 +114,7 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
@Override
@Nullable
public E remove(int index) {
DisposableWrapper<E> removedWrapper = myWrappedList.remove(index);
DisposableWrapper removedWrapper = myWrappedList.remove(index);
return unwrapAndDispose(removedWrapper);
}
@@ -147,7 +147,7 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
@Override
public void clear() {
removeIf(element -> true);
removeIf(__ -> true);
}
@Override
@@ -206,29 +206,29 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
@Override
public E set(int index, E element) {
DisposableWrapper<E> replaced = myWrappedList.set(index, new DisposableWrapper<>(element));
DisposableWrapper replaced = myWrappedList.set(index, new DisposableWrapper(element));
return unwrapAndDispose(replaced);
}
@Override
public boolean contains(@Nullable Object obj) {
return obj != null && myWrappedList.contains(new DisposableWrapper<>(obj));
return obj != null && myWrappedList.contains(new DisposableWrapper((E)obj));
}
@Override
public boolean containsAll(@NotNull Collection<?> collection) {
Collection<DisposableWrapper<Object>> disposableWrappers = wrapAll(collection);
Collection<DisposableWrapper> disposableWrappers = wrapAll((Collection<? extends E>)collection);
return myWrappedList.containsAll(disposableWrappers);
}
@Override
public int indexOf(@Nullable Object obj) {
return obj == null ? -1 : myWrappedList.indexOf(new DisposableWrapper<>(obj));
return obj == null ? -1 : myWrappedList.indexOf(new DisposableWrapper((E)obj));
}
@Override
public int lastIndexOf(@Nullable Object obj) {
return obj == null ? -1 : myWrappedList.lastIndexOf(new DisposableWrapper<>(obj));
return obj == null ? -1 : myWrappedList.lastIndexOf(new DisposableWrapper((E)obj));
}
@Override
@@ -250,26 +250,26 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
}
@NotNull
private DisposableWrapper<E> createDisposableWrapper(E element, @NotNull Disposable parentDisposable) {
DisposableWrapper<E> disposableWrapper = new DisposableWrapper<>(element, true);
private DisposableWrapper createDisposableWrapper(E element, @NotNull Disposable parentDisposable) {
DisposableWrapper disposableWrapper = new DisposableWrapper(element, true);
Disposer.register(parentDisposable, disposableWrapper);
return disposableWrapper;
}
@NotNull
private <T> Collection<DisposableWrapper<T>> wrapAll(@NotNull Collection<? extends T> collection) {
private Collection<DisposableWrapper> wrapAll(@NotNull Collection<? extends E> collection) {
if (collection.isEmpty()) {
return Collections.emptyList();
}
List<DisposableWrapper<T>> result = new ArrayList<>(collection.size());
for (T obj : collection) {
result.add(new DisposableWrapper<>(obj));
List<DisposableWrapper> result = new ArrayList<>(collection.size());
for (E obj : collection) {
result.add(new DisposableWrapper(obj));
}
return result;
}
@Nullable
private E unwrapAndDispose(@Nullable DisposableWrapper<E> disposableWrapper) {
private E unwrapAndDispose(@Nullable DisposableWrapper disposableWrapper) {
if (disposableWrapper == null) {
return null;
}
@@ -278,16 +278,16 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
return unwrapped;
}
private class DisposableWrapper<T> extends AtomicBoolean implements Disposable {
private class DisposableWrapper extends AtomicBoolean implements Disposable {
@NotNull
private final T delegate;
private final E delegate;
private boolean removeFromContainer;
DisposableWrapper(@NotNull T obj) {
DisposableWrapper(@NotNull E obj) {
this(obj, false);
}
DisposableWrapper(@NotNull T delegate, boolean removeFromContainer) {
DisposableWrapper(@NotNull E delegate, boolean removeFromContainer) {
this.delegate = delegate;
this.removeFromContainer = removeFromContainer;
}
@@ -339,8 +339,8 @@ public class DisposableWrapperList<E> extends AbstractList<E> {
}
private class DisposableWrapperListIterator implements ListIterator<E> {
@NotNull private final ListIterator<DisposableWrapper<E>> myDelegate;
@Nullable private DisposableWrapper<E> myLastReturned;
@NotNull private final ListIterator<DisposableWrapper> myDelegate;
@Nullable private DisposableWrapper myLastReturned;
DisposableWrapperListIterator(int initialCursor) {
myDelegate = myWrappedList.listIterator(initialCursor);
platform/util/src/com/intellij/util/ui/UIUtil.java
+1
View File
@@ -3492,6 +3492,7 @@ public class UIUtil {
* @see SwingUtilities#getAncestorOfClass
*/
@Nullable
@Contract(pure = true)
public static <T> T getParentOfType(@NotNull Class<? extends T> type, Component component) {
while (component != null) {
if (type.isInstance(component)) {