diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java index 2a3feb95cfe3..c98428fddc1b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java @@ -39,12 +39,14 @@ import com.intellij.psi.PsiExpression; import com.intellij.util.net.NetUtils; import com.sun.jdi.Value; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; import java.io.IOException; public class DebuggerUtilsImpl extends DebuggerUtilsEx{ private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerUtilsImpl"); + @NotNull public String getComponentName() { return "DebuggerUtils"; } diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java index a2adb38219eb..ba7116d49288 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java @@ -27,6 +27,7 @@ import com.intellij.openapi.util.WriteExternalException; import com.intellij.ui.classFilter.ClassFilter; import org.jdom.Element; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.HashMap; @@ -174,6 +175,7 @@ public class DebuggerSettings implements JDOMExternalizable, ApplicationComponen return null; } + @NotNull public String getComponentName() { return "DebuggerSettings"; } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditorState.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditorState.java index b82456858c9f..f8bb89f71ac2 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditorState.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditorState.java @@ -19,6 +19,7 @@ import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.util.*; import com.intellij.openapi.project.Project; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; /** * @author Eugene Zhuravlev @@ -47,6 +48,7 @@ public class ModuleEditorState implements ProjectComponent, JDOMExternalizable{ public void projectClosed() { } + @NotNull public String getComponentName() { return "ModuleEditorState"; } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleLevelConfigurablesEditorProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleLevelConfigurablesEditorProvider.java index 3573f612bacb..562e259ad8b1 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleLevelConfigurablesEditorProvider.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleLevelConfigurablesEditorProvider.java @@ -22,6 +22,7 @@ import com.intellij.openapi.module.ModuleConfigurationEditor; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.ModuleConfigurableEP; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ public class ModuleLevelConfigurablesEditorProvider implements ModuleConfigurati public void moduleAdded() { } + @NotNull public String getComponentName() { return "ModuleLevelConfigurablesEditorProvider"; } diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/OldModuleRootsKeeper.java b/java/java-impl/src/com/intellij/openapi/roots/impl/OldModuleRootsKeeper.java index 187ed0cc3b3f..4c85b660a9ea 100644 --- a/java/java-impl/src/com/intellij/openapi/roots/impl/OldModuleRootsKeeper.java +++ b/java/java-impl/src/com/intellij/openapi/roots/impl/OldModuleRootsKeeper.java @@ -21,8 +21,8 @@ import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.JDOMExternalizable; import com.intellij.openapi.util.WriteExternalException; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; -import java.util.Iterator; import java.util.List; /** @@ -39,6 +39,7 @@ public class OldModuleRootsKeeper implements ModuleComponent, JDOMExternalizable } + @NotNull public String getComponentName() { return "ModuleRootManager"; } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/Run.java b/java/java-tests/testSrc/com/intellij/refactoring/Run.java index 7911081a2934..52472b5f258f 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/Run.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/Run.java @@ -1,8 +1,7 @@ package com.intellij.refactoring; -import junit.textui.TestRunner; import junit.framework.TestSuite; -import com.intellij.TestAll; +import junit.textui.TestRunner; /** * @author dsl diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/VcsManagerPerModuleConfiguration.java b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/VcsManagerPerModuleConfiguration.java index f79e8a5fc9b5..15a325f4213a 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/VcsManagerPerModuleConfiguration.java +++ b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/VcsManagerPerModuleConfiguration.java @@ -26,6 +26,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.startup.StartupManager; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; /** * @author mike @@ -58,6 +59,7 @@ public class VcsManagerPerModuleConfiguration implements JDOMExternalizable, Mod public void initComponent() { } + @NotNull public String getComponentName() { return "VcsManagerConfiguration"; } diff --git a/platform/lang-impl/src/com/intellij/tools/ToolManager.java b/platform/lang-impl/src/com/intellij/tools/ToolManager.java index 81a6ec2bed45..fad5794f046b 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolManager.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolManager.java @@ -155,6 +155,7 @@ public class ToolManager implements ExportableApplicationComponent { } } + @NotNull public String getComponentName() { return "ToolManager"; } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java index fa0ee6ac5357..d57ff6899e8d 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java @@ -44,9 +44,7 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent public JComponent createCustomComponent(Presentation presentation) { JPanel panel=new JPanel(new GridBagLayout()); ComboBoxButton button = new ComboBoxButton(presentation); - panel.add(button, - new GridBagConstraints(0,0,1,1,1,1,GridBagConstraints.CENTER,GridBagConstraints.BOTH,new Insets(0,3,0,3),0,0) - ); + panel.add(button, new GridBagConstraints(0,0,1,1,1,1,GridBagConstraints.CENTER,GridBagConstraints.BOTH,new Insets(0,3,0,3),0,0)); return panel; } diff --git a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryListener.java b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryListener.java index 5f2e35ce2e97..3985caa368eb 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryListener.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryListener.java @@ -17,6 +17,9 @@ package com.intellij.openapi.editor.event; import java.util.EventListener; +/** + * @see {@link com.intellij.openapi.editor.EditorFactory#addEditorFactoryListener(com.intellij.openapi.editor.event.EditorFactoryListener)} + */ public interface EditorFactoryListener extends EventListener { void editorCreated(EditorFactoryEvent event); void editorReleased(EditorFactoryEvent event); diff --git a/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java b/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java index f84c59d4c0c4..99fce836ee07 100644 --- a/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java @@ -31,6 +31,7 @@ import com.intellij.openapi.options.ex.ProjectConfigurablesGroup; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.util.SystemInfo; +import org.jetbrains.annotations.NotNull; import java.io.File; @@ -38,6 +39,7 @@ import java.io.File; * @author max */ public class MacOSApplicationProvider implements ApplicationComponent { + @NotNull public String getComponentName() { return "MACOSApplicationProvider"; } diff --git a/platform/platform-impl/src/com/intellij/ide/TipOfTheDayManager.java b/platform/platform-impl/src/com/intellij/ide/TipOfTheDayManager.java index f6b4e4ba5dda..dbff4ad999e2 100644 --- a/platform/platform-impl/src/com/intellij/ide/TipOfTheDayManager.java +++ b/platform/platform-impl/src/com/intellij/ide/TipOfTheDayManager.java @@ -24,6 +24,7 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ProjectManagerAdapter; import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.wm.ToolWindowManager; +import org.jetbrains.annotations.NotNull; public class TipOfTheDayManager extends ProjectManagerAdapter implements ApplicationComponent { private boolean myDoNotShowThisTime = false; @@ -38,6 +39,7 @@ public class TipOfTheDayManager extends ProjectManagerAdapter implements Applica projectManager.addProjectManagerListener(this); } + @NotNull public String getComponentName() { return "TipOfTheDayManager"; } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java index babc5365212f..9587a1e127e9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java @@ -282,6 +282,7 @@ public final class TestWindowManager extends WindowManagerEx implements Applicat public void adjustContainerWindow(Component c, Dimension oldSize, Dimension newSize) { } + @NotNull public final String getComponentName() { return "TestWindowManager"; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java index 26709dfd7854..494855842cdd 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java @@ -29,6 +29,7 @@ import com.intellij.openapi.vcs.changes.committed.CommittedChangesCache; import com.intellij.openapi.vcs.ex.ProjectLevelVcsManagerEx; import org.jdom.Element; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; public class RestoreUpdateTree implements ProjectComponent, JDOMExternalizable { private final Project myProject; @@ -63,6 +64,7 @@ public class RestoreUpdateTree implements ProjectComponent, JDOMExternalizable { } + @NotNull public String getComponentName() { return "RestoreUpdateTree"; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsProjectComponent.java b/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsProjectComponent.java index 972c66111dd0..2950b17792b5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsProjectComponent.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsProjectComponent.java @@ -20,6 +20,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.project.Project; import com.siyeh.ig.telemetry.TelemetryToolWindow; +import org.jetbrains.annotations.NotNull; public class InspectionGadgetsProjectComponent implements ProjectComponent{ @@ -49,6 +50,7 @@ public class InspectionGadgetsProjectComponent implements ProjectComponent{ } } + @NotNull public String getComponentName(){ return "InspectionGadgetsProjectComponent"; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/AbstractConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/AbstractConfiguration.java index 99b5a1bcc65e..9a3a2faf8da9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/AbstractConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/AbstractConfiguration.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.JDOMExternalizable; import com.intellij.openapi.util.WriteExternalException; import org.jdom.Element; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; /** * author: lesya @@ -48,6 +49,7 @@ public class AbstractConfiguration implements JDOMExternalizable, ProjectCompone public void projectClosed() { } + @NotNull public String getComponentName() { return myName; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java index b807b713baaf..ae25c6dbdb62 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java @@ -72,6 +72,7 @@ public class CvsApplicationLevelConfiguration implements ApplicationComponent, J return ServiceManager.getService(CvsApplicationLevelConfiguration.class); } + @NotNull public String getComponentName() { return "CvsApplicationLevelConfiguration"; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java index 77f1367bd9d2..3726ebab2523 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java @@ -43,6 +43,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.AbstractVcsHelper; import com.intellij.openapi.vcs.vfs.VcsFileSystem; import com.intellij.openapi.vcs.vfs.VcsVirtualFile; +import org.jetbrains.annotations.NotNull; import org.netbeans.lib.cvsclient.command.KeywordSubstitution; import java.io.File; @@ -108,6 +109,7 @@ public class CvsServicesImpl extends CvsServices implements ApplicationComponent .getScrambledPasswordForCvsRoot(cvsRoot); } + @NotNull public String getComponentName() { return "CvsServices"; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java index 9d565f092739..dfb8f7596522 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java @@ -31,6 +31,7 @@ import com.intellij.openapi.vcs.annotate.AnnotationListener; import org.jdom.Attribute; import org.jdom.DataConversionException; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.dialogs.SvnAuthenticationProvider; import org.jetbrains.idea.svn.dialogs.SvnInteractiveAuthenticationProvider; import org.jetbrains.idea.svn.update.MergeRootInfo; @@ -359,6 +360,7 @@ public class SvnConfiguration implements ProjectComponent, JDOMExternalizable { public void projectClosed() { } + @NotNull public String getComponentName() { return "SvnConfiguration"; } diff --git a/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java index 6249e859d98a..72e0a1ed7218 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java @@ -36,6 +36,7 @@ import com.intellij.psi.impl.source.tree.FileElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.xml.*; import com.intellij.util.CharTable; +import org.jetbrains.annotations.NotNull; import java.util.Collections; @@ -219,6 +220,7 @@ public class XmlAspectImpl implements XmlAspect { public void disposeComponent() { } + @NotNull public String getComponentName() { return "XML POM aspect"; }