From 19c80a72c735de6195f462caacaae1a4e60bd364 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 5 Aug 2014 14:18:06 +0200 Subject: [PATCH] post review: rename to WebServerRootsProvider --- .../builtInWebServer/ArtifactProjectRootsProvider.java | 2 +- .../builtInWebServer/ProjectRootsProviderImpl.java | 2 +- .../jetbrains/builtInWebServer/WebServerPathHandler.java | 2 +- .../builtInWebServer/WebServerPathToFileManager.java | 8 ++++---- ...jectRootsProvider.java => WebServerRootsProvider.java} | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) rename xml/impl/src/org/jetbrains/builtInWebServer/{ProjectRootsProvider.java => WebServerRootsProvider.java} (85%) diff --git a/java/compiler/impl/src/org/jetbrains/builtInWebServer/ArtifactProjectRootsProvider.java b/java/compiler/impl/src/org/jetbrains/builtInWebServer/ArtifactProjectRootsProvider.java index c8d253141180..9200b0404ef9 100644 --- a/java/compiler/impl/src/org/jetbrains/builtInWebServer/ArtifactProjectRootsProvider.java +++ b/java/compiler/impl/src/org/jetbrains/builtInWebServer/ArtifactProjectRootsProvider.java @@ -10,7 +10,7 @@ import com.intellij.util.PairFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -final class ArtifactProjectRootsProvider extends ProjectRootsProvider.PrefixlessProjectRootsProvider { +final class ArtifactProjectRootsProvider extends WebServerRootsProvider.PrefixlessProjectRootsProvider { @Nullable @Override public Pair> resolve(@NotNull String path, @NotNull Project project, @NotNull PairFunction resolver) { diff --git a/xml/impl/src/org/jetbrains/builtInWebServer/ProjectRootsProviderImpl.java b/xml/impl/src/org/jetbrains/builtInWebServer/ProjectRootsProviderImpl.java index 1f0a9ad07294..c48737e1118d 100644 --- a/xml/impl/src/org/jetbrains/builtInWebServer/ProjectRootsProviderImpl.java +++ b/xml/impl/src/org/jetbrains/builtInWebServer/ProjectRootsProviderImpl.java @@ -18,7 +18,7 @@ import com.intellij.util.PlatformUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -final class ProjectRootsProviderImpl extends ProjectRootsProvider { +final class ProjectRootsProviderImpl extends WebServerRootsProvider { @Nullable @Override public Pair> resolve(@NotNull String path, @NotNull Project project) { diff --git a/xml/impl/src/org/jetbrains/builtInWebServer/WebServerPathHandler.java b/xml/impl/src/org/jetbrains/builtInWebServer/WebServerPathHandler.java index 778f4a373706..807c3b31b49a 100644 --- a/xml/impl/src/org/jetbrains/builtInWebServer/WebServerPathHandler.java +++ b/xml/impl/src/org/jetbrains/builtInWebServer/WebServerPathHandler.java @@ -28,7 +28,7 @@ import java.net.URI; /** * By default {@link WebServerPathToFileManager} will be used to map request to file. - * If file physically exists in the file system, you must use {@link org.jetbrains.builtInWebServer.ProjectRootsProvider}. + * If file physically exists in the file system, you must use {@link WebServerRootsProvider}. * * Consider to extend {@link WebServerPathHandlerAdapter} instead of implement low-level {@link #process(String, com.intellij.openapi.project.Project, io.netty.handler.codec.http.FullHttpRequest, io.netty.channel.Channel, String, String, boolean)} */ diff --git a/xml/impl/src/org/jetbrains/builtInWebServer/WebServerPathToFileManager.java b/xml/impl/src/org/jetbrains/builtInWebServer/WebServerPathToFileManager.java index 1679f14836bc..5e63581b460e 100644 --- a/xml/impl/src/org/jetbrains/builtInWebServer/WebServerPathToFileManager.java +++ b/xml/impl/src/org/jetbrains/builtInWebServer/WebServerPathToFileManager.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** - * Implement {@link org.jetbrains.builtInWebServer.ProjectRootsProvider} to add your provider + * Implement {@link WebServerRootsProvider} to add your provider */ public class WebServerPathToFileManager { private static final PairFunction RELATIVE_PATH_RESOLVER = new PairFunction() { @@ -60,7 +60,7 @@ public class WebServerPathToFileManager { for (VFileEvent event : events) { if (event instanceof VFileContentChangeEvent) { VirtualFile file = ((VFileContentChangeEvent)event).getFile(); - for (ProjectRootsProvider rootsProvider : ProjectRootsProvider.EP_NAME.getExtensions()) { + for (WebServerRootsProvider rootsProvider : WebServerRootsProvider.EP_NAME.getExtensions()) { if (rootsProvider.isClearCacheOnFileContentChanged(file)) { clearCache(); break; @@ -119,7 +119,7 @@ public class WebServerPathToFileManager { public Pair getRoot(@NotNull VirtualFile child) { Pair result = fileToRoot.getIfPresent(child); if (result == null) { - for (ProjectRootsProvider rootsProvider : ProjectRootsProvider.EP_NAME.getExtensions()) { + for (WebServerRootsProvider rootsProvider : WebServerRootsProvider.EP_NAME.getExtensions()) { result = rootsProvider.getRoot(child, project); if (result != null) { fileToRoot.put(child, result); @@ -132,7 +132,7 @@ public class WebServerPathToFileManager { @Nullable VirtualFile findByRelativePath(@NotNull Project project, @NotNull String path) { - for (ProjectRootsProvider rootsProvider : ProjectRootsProvider.EP_NAME.getExtensions()) { + for (WebServerRootsProvider rootsProvider : WebServerRootsProvider.EP_NAME.getExtensions()) { Pair> result = rootsProvider.resolve(path, project); if (result != null) { fileToRoot.put(result.first, result.second); diff --git a/xml/impl/src/org/jetbrains/builtInWebServer/ProjectRootsProvider.java b/xml/impl/src/org/jetbrains/builtInWebServer/WebServerRootsProvider.java similarity index 85% rename from xml/impl/src/org/jetbrains/builtInWebServer/ProjectRootsProvider.java rename to xml/impl/src/org/jetbrains/builtInWebServer/WebServerRootsProvider.java index 3828bf99ba51..1641d3f1f4a7 100644 --- a/xml/impl/src/org/jetbrains/builtInWebServer/ProjectRootsProvider.java +++ b/xml/impl/src/org/jetbrains/builtInWebServer/WebServerRootsProvider.java @@ -8,8 +8,8 @@ import com.intellij.util.PairFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public abstract class ProjectRootsProvider { - static final ExtensionPointName EP_NAME = ExtensionPointName.create("org.jetbrains.webServerProjectRootsProvider"); +public abstract class WebServerRootsProvider { + static final ExtensionPointName EP_NAME = ExtensionPointName.create("org.jetbrains.webServerProjectRootsProvider"); @Nullable /** @@ -24,7 +24,7 @@ public abstract class ProjectRootsProvider { return false; } - public abstract static class PrefixlessProjectRootsProvider extends ProjectRootsProvider { + public abstract static class PrefixlessProjectRootsProvider extends WebServerRootsProvider { @Nullable @Override public final Pair> resolve(@NotNull String path, @NotNull Project project) {