From c89bee624a6aad9e9507d4cb19f2aa2566f2db88 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 28 Jan 2019 17:59:39 +0300 Subject: [PATCH] Minor: remove DocumentAdapter usage --- .../jetbrains/kotlin/idea/PluginStartupComponent.java | 6 +++--- .../idea/inspections/NamingConventionInspections.kt | 6 ++++-- .../changeSignature/ui/KotlinChangeSignatureDialog.kt | 4 ++-- .../ui/MoveKotlinNestedClassesDialog.java | 9 +++++---- .../ui/MoveKotlinTopLevelDeclarationsDialog.java | 8 ++++---- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java index f5a647bbad1..13104711fae 100644 --- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java @@ -22,8 +22,8 @@ import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.EditorFactory; -import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; +import com.intellij.openapi.editor.event.DocumentListener; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.updateSettings.impl.UpdateChecker; import com.intellij.openapi.vfs.VirtualFile; @@ -68,9 +68,9 @@ public class PluginStartupComponent implements ApplicationComponent { LOG.debug("Excluding Kotlin plugin updates using old API", throwable); UpdateChecker.getDisabledToUpdatePlugins().add("org.jetbrains.kotlin"); } - EditorFactory.getInstance().getEventMulticaster().addDocumentListener(new DocumentAdapter() { + EditorFactory.getInstance().getEventMulticaster().addDocumentListener(new DocumentListener() { @Override - public void documentChanged(DocumentEvent e) { + public void documentChanged(@NotNull DocumentEvent e) { VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(e.getDocument()); if (virtualFile != null && virtualFile.getFileType() == KotlinFileType.INSTANCE) { KotlinPluginUpdater.Companion.getInstance().kotlinFileEdited(virtualFile); diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt index 5ba20d9b53e..f4630b68cc2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt @@ -10,8 +10,8 @@ import com.intellij.codeInspection.* import com.intellij.codeInspection.reference.RefEntity import com.intellij.codeInspection.reference.RefFile import com.intellij.codeInspection.reference.RefPackage -import com.intellij.openapi.editor.event.DocumentAdapter import com.intellij.openapi.editor.event.DocumentEvent +import com.intellij.openapi.editor.event.DocumentListener import com.intellij.openapi.ui.LabeledComponent import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.JavaPsiFacade @@ -132,7 +132,7 @@ class NamingConventionInspectionSettings( val regexField = EditorTextField(settings.namePattern, null, RegExpFileType.INSTANCE).apply { setOneLineMode(true) } - regexField.document.addDocumentListener(object : DocumentAdapter() { + regexField.document.addDocumentListener(object : DocumentListener { override fun documentChanged(e: DocumentEvent) { settings.namePattern = regexField.text } @@ -387,6 +387,8 @@ class PackageNameInspection : BaseGlobalInspection() { } } + // Serialized setting + @Suppress("MemberVisibilityCanBePrivate") var namePattern: String = DEFAULT_PACKAGE_NAME_PATTERN private val namingSettings = NamingConventionInspectionSettings( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt index b14df1925f0..59767462b08 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui import com.intellij.openapi.editor.colors.EditorColorsManager import com.intellij.openapi.editor.colors.EditorFontType -import com.intellij.openapi.editor.event.DocumentAdapter import com.intellij.openapi.editor.event.DocumentEvent +import com.intellij.openapi.editor.event.DocumentListener import com.intellij.openapi.options.ConfigurationException import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages @@ -226,7 +226,7 @@ class KotlinChangeSignatureDialog( if (editor != null) { editor.addDocumentListener( - object : DocumentAdapter() { + object : DocumentListener { override fun documentChanged(e: DocumentEvent) { fireDocumentChanged(e, columnFinal) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java index 63e02bbc47f..516797e2e8c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java @@ -20,8 +20,8 @@ import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.ide.util.ClassFilter; import com.intellij.ide.util.TreeClassChooser; import com.intellij.ide.util.TreeJavaClassChooserDialog; -import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; +import com.intellij.openapi.editor.event.DocumentListener; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; @@ -49,7 +49,6 @@ import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionPanel; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionTable; import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.*; -import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource; import org.jetbrains.kotlin.idea.refactoring.ui.KotlinTypeReferenceEditorComboWithBrowseButton; import org.jetbrains.kotlin.psi.*; @@ -60,6 +59,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; +import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource; + public class MoveKotlinNestedClassesDialog extends RefactoringDialog { private static final String RECENTS_KEY = MoveKotlinNestedClassesDialog.class.getName() + ".RECENTS_KEY"; private final KtClassOrObject originalClass; @@ -175,9 +176,9 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog { ); } targetClassChooser.getChildComponent().getDocument().addDocumentListener( - new DocumentAdapter() { + new DocumentListener() { @Override - public void documentChanged(DocumentEvent e) { + public void documentChanged(@NotNull DocumentEvent e) { PsiClass aClass = JavaPsiFacade .getInstance(myProject) .findClass(targetClassChooser.getText(), GlobalSearchScope.projectScope(myProject)); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index eed38549b01..e1a67344dd1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui; import com.intellij.ide.util.DirectoryChooser; import com.intellij.openapi.editor.Document; -import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; +import com.intellij.openapi.editor.event.DocumentListener; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; @@ -75,8 +75,8 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; -import java.util.*; import java.util.List; +import java.util.*; import static java.util.Collections.emptyList; import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource; @@ -418,9 +418,9 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { ReferenceEditorComboWithBrowseButton packageChooser = new PackageNameReferenceEditorCombo("", myProject, RECENTS_KEY, RefactoringBundle.message("choose.destination.package")); Document document = packageChooser.getChildComponent().getDocument(); - document.addDocumentListener(new DocumentAdapter() { + document.addDocumentListener(new DocumentListener() { @Override - public void documentChanged(DocumentEvent e) { + public void documentChanged(@NotNull DocumentEvent e) { validateButtons(); } });