Minor: remove DocumentAdapter usage

This commit is contained in:
Nikolay Krasko
2019-01-28 17:59:39 +03:00
parent b8bbe10086
commit c89bee624a
5 changed files with 18 additions and 15 deletions
@@ -22,8 +22,8 @@ import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.EditorFactory; 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.DocumentEvent;
import com.intellij.openapi.editor.event.DocumentListener;
import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.updateSettings.impl.UpdateChecker; import com.intellij.openapi.updateSettings.impl.UpdateChecker;
import com.intellij.openapi.vfs.VirtualFile; 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); LOG.debug("Excluding Kotlin plugin updates using old API", throwable);
UpdateChecker.getDisabledToUpdatePlugins().add("org.jetbrains.kotlin"); UpdateChecker.getDisabledToUpdatePlugins().add("org.jetbrains.kotlin");
} }
EditorFactory.getInstance().getEventMulticaster().addDocumentListener(new DocumentAdapter() { EditorFactory.getInstance().getEventMulticaster().addDocumentListener(new DocumentListener() {
@Override @Override
public void documentChanged(DocumentEvent e) { public void documentChanged(@NotNull DocumentEvent e) {
VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(e.getDocument()); VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(e.getDocument());
if (virtualFile != null && virtualFile.getFileType() == KotlinFileType.INSTANCE) { if (virtualFile != null && virtualFile.getFileType() == KotlinFileType.INSTANCE) {
KotlinPluginUpdater.Companion.getInstance().kotlinFileEdited(virtualFile); KotlinPluginUpdater.Companion.getInstance().kotlinFileEdited(virtualFile);
@@ -10,8 +10,8 @@ import com.intellij.codeInspection.*
import com.intellij.codeInspection.reference.RefEntity import com.intellij.codeInspection.reference.RefEntity
import com.intellij.codeInspection.reference.RefFile import com.intellij.codeInspection.reference.RefFile
import com.intellij.codeInspection.reference.RefPackage 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.DocumentEvent
import com.intellij.openapi.editor.event.DocumentListener
import com.intellij.openapi.ui.LabeledComponent import com.intellij.openapi.ui.LabeledComponent
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.JavaPsiFacade import com.intellij.psi.JavaPsiFacade
@@ -132,7 +132,7 @@ class NamingConventionInspectionSettings(
val regexField = EditorTextField(settings.namePattern, null, RegExpFileType.INSTANCE).apply { val regexField = EditorTextField(settings.namePattern, null, RegExpFileType.INSTANCE).apply {
setOneLineMode(true) setOneLineMode(true)
} }
regexField.document.addDocumentListener(object : DocumentAdapter() { regexField.document.addDocumentListener(object : DocumentListener {
override fun documentChanged(e: DocumentEvent) { override fun documentChanged(e: DocumentEvent) {
settings.namePattern = regexField.text settings.namePattern = regexField.text
} }
@@ -387,6 +387,8 @@ class PackageNameInspection : BaseGlobalInspection() {
} }
} }
// Serialized setting
@Suppress("MemberVisibilityCanBePrivate")
var namePattern: String = DEFAULT_PACKAGE_NAME_PATTERN var namePattern: String = DEFAULT_PACKAGE_NAME_PATTERN
private val namingSettings = NamingConventionInspectionSettings( private val namingSettings = NamingConventionInspectionSettings(
@@ -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.EditorColorsManager
import com.intellij.openapi.editor.colors.EditorFontType 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.DocumentEvent
import com.intellij.openapi.editor.event.DocumentListener
import com.intellij.openapi.options.ConfigurationException import com.intellij.openapi.options.ConfigurationException
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.Messages
@@ -226,7 +226,7 @@ class KotlinChangeSignatureDialog(
if (editor != null) { if (editor != null) {
editor.addDocumentListener( editor.addDocumentListener(
object : DocumentAdapter() { object : DocumentListener {
override fun documentChanged(e: DocumentEvent) { override fun documentChanged(e: DocumentEvent) {
fireDocumentChanged(e, columnFinal) fireDocumentChanged(e, columnFinal)
} }
@@ -20,8 +20,8 @@ import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.ide.util.ClassFilter; import com.intellij.ide.util.ClassFilter;
import com.intellij.ide.util.TreeClassChooser; import com.intellij.ide.util.TreeClassChooser;
import com.intellij.ide.util.TreeJavaClassChooserDialog; 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.DocumentEvent;
import com.intellij.openapi.editor.event.DocumentListener;
import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaPsiFacade; 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.KotlinMemberSelectionPanel;
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionTable; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionTable;
import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.*; 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.idea.refactoring.ui.KotlinTypeReferenceEditorComboWithBrowseButton;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
@@ -60,6 +59,8 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.List; import java.util.List;
import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource;
public class MoveKotlinNestedClassesDialog extends RefactoringDialog { public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
private static final String RECENTS_KEY = MoveKotlinNestedClassesDialog.class.getName() + ".RECENTS_KEY"; private static final String RECENTS_KEY = MoveKotlinNestedClassesDialog.class.getName() + ".RECENTS_KEY";
private final KtClassOrObject originalClass; private final KtClassOrObject originalClass;
@@ -175,9 +176,9 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
); );
} }
targetClassChooser.getChildComponent().getDocument().addDocumentListener( targetClassChooser.getChildComponent().getDocument().addDocumentListener(
new DocumentAdapter() { new DocumentListener() {
@Override @Override
public void documentChanged(DocumentEvent e) { public void documentChanged(@NotNull DocumentEvent e) {
PsiClass aClass = JavaPsiFacade PsiClass aClass = JavaPsiFacade
.getInstance(myProject) .getInstance(myProject)
.findClass(targetClassChooser.getText(), GlobalSearchScope.projectScope(myProject)); .findClass(targetClassChooser.getText(), GlobalSearchScope.projectScope(myProject));
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui;
import com.intellij.ide.util.DirectoryChooser; import com.intellij.ide.util.DirectoryChooser;
import com.intellij.openapi.editor.Document; 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.DocumentEvent;
import com.intellij.openapi.editor.event.DocumentListener;
import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
@@ -75,8 +75,8 @@ import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.io.File; import java.io.File;
import java.util.*;
import java.util.List; import java.util.List;
import java.util.*;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource; import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource;
@@ -418,9 +418,9 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
ReferenceEditorComboWithBrowseButton packageChooser = ReferenceEditorComboWithBrowseButton packageChooser =
new PackageNameReferenceEditorCombo("", myProject, RECENTS_KEY, RefactoringBundle.message("choose.destination.package")); new PackageNameReferenceEditorCombo("", myProject, RECENTS_KEY, RefactoringBundle.message("choose.destination.package"));
Document document = packageChooser.getChildComponent().getDocument(); Document document = packageChooser.getChildComponent().getDocument();
document.addDocumentListener(new DocumentAdapter() { document.addDocumentListener(new DocumentListener() {
@Override @Override
public void documentChanged(DocumentEvent e) { public void documentChanged(@NotNull DocumentEvent e) {
validateButtons(); validateButtons();
} }
}); });