diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java index 3ea15ce4fd46..67a72962613e 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java @@ -227,7 +227,7 @@ public class TodoView implements PersistentStateComponent, 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, 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 diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java index 3a2117f8413e..63d7d26e3890 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java @@ -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; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java index bc0b02f49c8d..bd3d2642b39b 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java @@ -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(); diff --git a/platform/lang-impl/src/com/intellij/util/indexing/LightDirectoryIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/LightDirectoryIndex.java index d6a828370c3a..576bbfaad694 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/LightDirectoryIndex.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/LightDirectoryIndex.java @@ -49,7 +49,7 @@ public final class LightDirectoryIndex { 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(); diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeListener.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeListener.java index 1592abde4823..13080ed49cb6 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeListener.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeListener.java @@ -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 { + } } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java index 1a5880f671ee..50fb2b3ac8dd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java @@ -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(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java index 669f652a7557..5e4cc3ccd02f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java @@ -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(); diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java index 44732ffdc3ec..b8244762af25 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java @@ -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; diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java index b0970d3046ad..8a9476325938 100644 --- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java +++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java @@ -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) {