deprecate FileTypeListener.Adapter

This commit is contained in:
Vladimir Krivosheev
2016-08-01 14:36:35 +02:00
parent 83a0365a14
commit 7317555c6d
9 changed files with 24 additions and 19 deletions
@@ -227,7 +227,7 @@ public class TodoView implements PersistentStateComponent<TodoView.State>, Dispo
updateFilters();
}
catch (ProcessCanceledException e) {
DumbService.getInstance(myProject).smartInvokeLater(() -> _updateFilters(), ModalityState.NON_MODAL);
DumbService.getInstance(myProject).smartInvokeLater(this::_updateFilters, ModalityState.NON_MODAL);
}
}
@@ -238,7 +238,7 @@ public class TodoView implements PersistentStateComponent<TodoView.State>, Dispo
}
}
private final class MyFileTypeListener extends FileTypeListener.Adapter {
private final class MyFileTypeListener implements FileTypeListener {
@Override
public void fileTypesChanged(@NotNull FileTypeEvent e) {
// this invokeLater guaranties that this code will be invoked after
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
}
protected void subscribeToFileChanges() {
myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() {
myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener() {
@Override
public void fileTypesChanged(@NotNull FileTypeEvent event) {
myRootIndex = null;
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ public class PsiVFSListener extends VirtualFileAdapter {
StartupManager.getInstance(project).registerPreStartupActivity(() -> {
myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new MyModuleRootListener());
myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() {
myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener() {
@Override
public void fileTypesChanged(@NotNull FileTypeEvent e) {
myFileManager.processFileTypesChanged();
@@ -49,7 +49,7 @@ public final class LightDirectoryIndex<T> {
myInitializer = initializer;
resetIndex();
MessageBusConnection connection = ApplicationManager.getApplication().getMessageBus().connect(parentDisposable);
connection.subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() {
connection.subscribe(FileTypeManager.TOPIC, new FileTypeListener() {
@Override
public void fileTypesChanged(@NotNull FileTypeEvent event) {
resetIndex();
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,11 +20,16 @@ import org.jetbrains.annotations.NotNull;
import java.util.EventListener;
public interface FileTypeListener extends EventListener {
class Adapter implements FileTypeListener {
@Override public void beforeFileTypesChanged(@NotNull FileTypeEvent event) { }
@Override public void fileTypesChanged(@NotNull FileTypeEvent event) { }
default void beforeFileTypesChanged(@NotNull FileTypeEvent event) {
}
void beforeFileTypesChanged(@NotNull FileTypeEvent event);
void fileTypesChanged(@NotNull FileTypeEvent event);
default void fileTypesChanged(@NotNull FileTypeEvent event) {
}
/**
* @deprecated Use {@link FileTypeListener}
*/
@Deprecated
class Adapter implements FileTypeListener {
}
}
@@ -1837,7 +1837,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
/**
* Gets events from FileTypeManager and updates icons on tabs
*/
private final class MyFileTypeListener extends FileTypeListener.Adapter {
private final class MyFileTypeListener implements FileTypeListener {
@Override
public void fileTypesChanged(@NotNull final FileTypeEvent event) {
assertDispatchThread();
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -309,7 +309,7 @@ class TextEditorComponent extends JBLoadingPanel implements DataProvider {
* Listen changes of file types. When type of the file changes we need
* to also change highlighter.
*/
private final class MyFileTypeListener extends FileTypeListener.Adapter {
private final class MyFileTypeListener implements FileTypeListener {
@Override
public void fileTypesChanged(@NotNull final FileTypeEvent event) {
assertThread();
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ public class FileTypeUtil {
public FileTypeUtil(MessageBus bus) {
createMappings();
bus.connect().subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() {
bus.connect().subscribe(FileTypeManager.TOPIC, new FileTypeListener() {
@Override
public void fileTypesChanged(@NotNull FileTypeEvent event) {
types = null;
@@ -80,7 +80,7 @@ public class BreadcrumbsInitializingActivity implements StartupActivity, DumbAwa
}
}
private static class MyFileTypeListener extends FileTypeListener.Adapter {
private static class MyFileTypeListener implements FileTypeListener {
private final Project myProject;
public MyFileTypeListener(@NotNull Project project) {