From e28cf11cb47e5b39e9261e5c61c185eef6ba5eea Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 6 Apr 2016 17:23:03 +0200 Subject: [PATCH] =?UTF-8?q?cleanup=20=E2=80=94=20use=20ModuleRootListener?= =?UTF-8?q?=20directly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../builtInWebServer/WebServerPathToFileManager.kt | 4 ++-- .../intellij/openapi/roots/ModuleRootAdapter.java | 9 +-------- .../intellij/openapi/roots/ModuleRootListener.java | 13 ++++++++----- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/platform/built-in-server/src/org/jetbrains/builtInWebServer/WebServerPathToFileManager.kt b/platform/built-in-server/src/org/jetbrains/builtInWebServer/WebServerPathToFileManager.kt index 43c402102c95..9063d0037767 100644 --- a/platform/built-in-server/src/org/jetbrains/builtInWebServer/WebServerPathToFileManager.kt +++ b/platform/built-in-server/src/org/jetbrains/builtInWebServer/WebServerPathToFileManager.kt @@ -5,8 +5,8 @@ import com.intellij.ProjectTopics import com.intellij.openapi.application.Application import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project -import com.intellij.openapi.roots.ModuleRootAdapter import com.intellij.openapi.roots.ModuleRootEvent +import com.intellij.openapi.roots.ModuleRootListener import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileManager @@ -45,7 +45,7 @@ class WebServerPathToFileManager(application: Application, private val project: } } }) - project.messageBus.connect().subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootAdapter() { + project.messageBus.connect().subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootListener { override fun rootsChanged(event: ModuleRootEvent) { clearCache() } diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootAdapter.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootAdapter.java index b143b9b79212..573b871b7558 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootAdapter.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 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. @@ -19,11 +19,4 @@ package com.intellij.openapi.roots; * @author nik */ public abstract class ModuleRootAdapter implements ModuleRootListener { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - - @Override - public void rootsChanged(ModuleRootEvent event) { - } } diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootListener.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootListener.java index 9132dd6a5ddb..e17c1c0bba9b 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootListener.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 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. @@ -18,9 +18,12 @@ package com.intellij.openapi.roots; import java.util.EventListener; /** - * @author dsl + * @author dsl */ -public interface ModuleRootListener extends EventListener{ - void beforeRootsChange(ModuleRootEvent event); - void rootsChanged(ModuleRootEvent event); +public interface ModuleRootListener extends EventListener { + default void beforeRootsChange(ModuleRootEvent event) { + } + + default void rootsChanged(ModuleRootEvent event) { + } }