From 16002c2fe310784ec459c4d0ac5f2619e70f3f4d Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 21 Mar 2012 12:42:18 +0400 Subject: [PATCH] cleanup --- .../util/descriptors/impl/ConfigFileImpl.java | 4 ++-- .../roots/impl/ProjectRootManagerImpl.java | 4 ++-- .../pointers/VirtualFilePointerListener.java | 5 +++-- .../intellij/ui/components/JBOptionButton.java | 6 +----- .../intellij/ui/switcher/SwitchingSession.java | 6 +----- .../openapi/ui/playback/PlaybackRunner.java | 6 +----- .../ui/playback/util/EditorPlaybackCall.java | 6 +----- .../impl/VirtualFilePointerContainerImpl.java | 1 + .../util/ui/ChangesTrackingTableView.java | 6 +----- .../openapi/vfs/VirtualFilePointerTest.java | 17 +++++++++-------- .../BreakpointsConfigurationDialogFactory.java | 5 +---- .../project/MavenProjectsManagerWatcher.java | 4 ++-- 12 files changed, 25 insertions(+), 45 deletions(-) diff --git a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileImpl.java b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileImpl.java index a64cc6c8a313..b8a262df7993 100644 --- a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileImpl.java +++ b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileImpl.java @@ -33,11 +33,11 @@ public class ConfigFileImpl implements ConfigFile { final VirtualFilePointerManager pointerManager = VirtualFilePointerManager.getInstance(); myFilePointer = pointerManager.create(configuration.getUrl(), this, new VirtualFilePointerListener() { @Override - public void beforeValidityChanged(final VirtualFilePointer[] pointers) { + public void beforeValidityChanged(@NotNull final VirtualFilePointer[] pointers) { } @Override - public void validityChanged(final VirtualFilePointer[] pointers) { + public void validityChanged(@NotNull final VirtualFilePointer[] pointers) { myPsiFile = null; onChange(); } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java index a5ddbb3c7a6a..811aa5dce501 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java @@ -730,7 +730,7 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj } private class MyVirtualFilePointerListener implements VirtualFilePointerListener { - public void beforeValidityChanged(VirtualFilePointer[] pointers) { + public void beforeValidityChanged(@NotNull VirtualFilePointer[] pointers) { if (!myProject.isDisposed()) { if (myInsideRefresh == 0) { if (affectsRoots(pointers)) { @@ -747,7 +747,7 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj } } - public void validityChanged(VirtualFilePointer[] pointers) { + public void validityChanged(@NotNull VirtualFilePointer[] pointers) { if (!myProject.isDisposed()) { if (myInsideRefresh > 0) { clearScopesCaches(); diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointerListener.java b/platform/platform-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointerListener.java index 307889aa1a48..54086e008525 100644 --- a/platform/platform-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointerListener.java +++ b/platform/platform-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointerListener.java @@ -16,10 +16,11 @@ package com.intellij.openapi.vfs.pointers; import com.intellij.util.messages.Topic; +import org.jetbrains.annotations.NotNull; public interface VirtualFilePointerListener { Topic TOPIC = Topic.create("VirtualFilePointer", VirtualFilePointerListener.class); - void beforeValidityChanged(VirtualFilePointer[] pointers); - void validityChanged(VirtualFilePointer[] pointers); + void beforeValidityChanged(@NotNull VirtualFilePointer[] pointers); + void validityChanged(@NotNull VirtualFilePointer[] pointers); } diff --git a/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java b/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java index 6bf175f262c5..4acee12346c8 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java @@ -53,11 +53,7 @@ public class JBOptionButton extends JButton implements MouseMotionListener { private boolean myOkToProcessDefaultMnemonics = true; private IdeGlassPane myGlassPane; - private final Disposable myDisposable = new Disposable() { - @Override - public void dispose() { - } - }; + private final Disposable myDisposable = Disposer.newDisposable(); public JBOptionButton(Action action, Action[] options) { super(action); diff --git a/platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java b/platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java index 43472818b02c..0f5045843532 100644 --- a/platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java +++ b/platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java @@ -76,11 +76,7 @@ public class SwitchingSession implements KeyEventDispatcher, Disposable { }; private boolean myFadingAway; - private Disposable myPainterDisposable = new Disposable() { - @Override - public void dispose() { - } - }; + private Disposable myPainterDisposable = Disposer.newDisposable(); public SwitchingSession(SwitchManager mgr, SwitchProvider provider, KeyEvent e, @Nullable SwitchTarget preselected, boolean showSpots) { myManager = mgr; diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/PlaybackRunner.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/PlaybackRunner.java index 7a9cbb076fb2..bc25865c8866 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/PlaybackRunner.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/PlaybackRunner.java @@ -66,11 +66,7 @@ public class PlaybackRunner { private Map myRegistryValues = new HashMap(); - private Disposable myOnStop = new Disposable() { - @Override - public void dispose() { - } - }; + private Disposable myOnStop = Disposer.newDisposable(); public PlaybackRunner(String script, StatusCallback callback, final boolean useDirectActionCall, boolean stopOnAppDeactivation, boolean useTypingTargets) { myScript = script; diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/util/EditorPlaybackCall.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/util/EditorPlaybackCall.java index f981a98531a4..16f67a1df549 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/util/EditorPlaybackCall.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/util/EditorPlaybackCall.java @@ -66,11 +66,7 @@ public class EditorPlaybackCall { public static AsyncResult waitDaemonForFinish(final PlaybackContext context) { final AsyncResult result = new AsyncResult(); - final Disposable connection = new Disposable() { - @Override - public void dispose() { - } - }; + final Disposable connection = Disposer.newDisposable(); result.doWhenProcessed(new Runnable() { @Override public void run() { diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java index ae746ef980e3..2c4fe1c3ac34 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java @@ -272,6 +272,7 @@ public class VirtualFilePointerContainerImpl implements VirtualFilePointerContai return myVirtualFilePointerManager.duplicate(virtualFilePointer, myParent, myListener); } + @NonNls @Override public String toString() { return "VFPContainer: "+myList/*+"; parent:"+myParent*/; diff --git a/platform/platform-impl/src/com/intellij/util/ui/ChangesTrackingTableView.java b/platform/platform-impl/src/com/intellij/util/ui/ChangesTrackingTableView.java index 0b89e21798a6..d885ca83e60b 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/ChangesTrackingTableView.java +++ b/platform/platform-impl/src/com/intellij/util/ui/ChangesTrackingTableView.java @@ -43,11 +43,7 @@ public abstract class ChangesTrackingTableView extends TableView { public boolean editCellAt(final int row, final int column, EventObject e) { if (super.editCellAt(row, column, e)) { assert myEditorListenerDisposable == null; - myEditorListenerDisposable = new Disposable() { - @Override - public void dispose() { - } - }; + myEditorListenerDisposable = Disposer.newDisposable(); addChangeListener(getEditorComponent(), new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VirtualFilePointerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VirtualFilePointerTest.java index ec9f7b074671..fd28150311a2 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VirtualFilePointerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VirtualFilePointerTest.java @@ -34,6 +34,7 @@ import com.intellij.util.Processor; import com.intellij.util.ThrowableRunnable; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; @@ -56,7 +57,7 @@ public class VirtualFilePointerTest extends PlatformLangTestCase { private final ArrayList myLog = new ArrayList(); @Override - public void beforeValidityChanged(VirtualFilePointer[] pointers) { + public void beforeValidityChanged(@NotNull VirtualFilePointer[] pointers) { verifyPointersInCorrectState(pointers); myLog.add(buildMessage("before", pointers)); } @@ -74,7 +75,7 @@ public class VirtualFilePointerTest extends PlatformLangTestCase { } @Override - public void validityChanged(VirtualFilePointer[] pointers) { + public void validityChanged(@NotNull VirtualFilePointer[] pointers) { verifyPointersInCorrectState(pointers); myLog.add(buildMessage("after", pointers)); } @@ -240,12 +241,12 @@ public class VirtualFilePointerTest extends PlatformLangTestCase { final VirtualFilePointer[] pointersToWatch = new VirtualFilePointer[2]; final VirtualFilePointerListener listener = new VirtualFilePointerListener() { @Override - public void beforeValidityChanged(VirtualFilePointer[] pointers) { + public void beforeValidityChanged(@NotNull VirtualFilePointer[] pointers) { verifyPointersInCorrectState(pointersToWatch); } @Override - public void validityChanged(VirtualFilePointer[] pointers) { + public void validityChanged(@NotNull VirtualFilePointer[] pointers) { verifyPointersInCorrectState(pointersToWatch); } }; @@ -302,12 +303,12 @@ public class VirtualFilePointerTest extends PlatformLangTestCase { final VirtualFilePointer[] pointersToWatch = new VirtualFilePointer[1]; final VirtualFilePointerListener listener = new VirtualFilePointerListener() { @Override - public void beforeValidityChanged(VirtualFilePointer[] pointers) { + public void beforeValidityChanged(@NotNull VirtualFilePointer[] pointers) { verifyPointersInCorrectState(pointersToWatch); } @Override - public void validityChanged(VirtualFilePointer[] pointers) { + public void validityChanged(@NotNull VirtualFilePointer[] pointers) { verifyPointersInCorrectState(pointersToWatch); } }; @@ -442,11 +443,11 @@ public class VirtualFilePointerTest extends PlatformLangTestCase { Disposable disposable = Disposer.newDisposable(); final VirtualFilePointer pointer = myVirtualFilePointerManager.create(vFile[0], disposable, new VirtualFilePointerListener() { @Override - public void beforeValidityChanged(VirtualFilePointer[] pointers) { + public void beforeValidityChanged(@NotNull VirtualFilePointer[] pointers) { } @Override - public void validityChanged(VirtualFilePointer[] pointers) { + public void validityChanged(@NotNull VirtualFilePointer[] pointers) { } }); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsConfigurationDialogFactory.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsConfigurationDialogFactory.java index c8f51b89729d..934d92cc5fd0 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsConfigurationDialogFactory.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsConfigurationDialogFactory.java @@ -117,10 +117,7 @@ public class BreakpointsConfigurationDialogFactory { JComponent contentComponent = null; if (myPanels.size() > 1) { - final Disposable tabbedPaneDisposable = new Disposable() { - public void dispose() { - } - }; + final Disposable tabbedPaneDisposable = Disposer.newDisposable(); final TabbedPaneWrapper tabbedPane = new TabbedPaneWrapper(tabbedPaneDisposable); for (AbstractBreakpointPanel breakpointPanel : myPanels) { addPanel(breakpointPanel, tabbedPane); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java index 9544f8611188..254ca383b648 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java @@ -212,11 +212,11 @@ public class MavenProjectsManagerWatcher { mySettingsFilesPointers.add( VirtualFilePointerManager.getInstance().create(url, myChangedDocumentsQueue, new VirtualFilePointerListener() { @Override - public void beforeValidityChanged(VirtualFilePointer[] pointers) { + public void beforeValidityChanged(@NotNull VirtualFilePointer[] pointers) { } @Override - public void validityChanged(VirtualFilePointer[] pointers) { + public void validityChanged(@NotNull VirtualFilePointer[] pointers) { } })); }