diff --git a/.idea/modules.xml b/.idea/modules.xml index 75835a3c5d85..3550b0e7bf3a 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -317,6 +317,8 @@ + + diff --git a/BUILD.bazel b/BUILD.bazel index 8a4ed00052b3..a032be0b4dcf 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -234,6 +234,8 @@ java_library( "//plugins/search-everywhere-ml/ranking/yaml:searchEverywhereMl-ranking-yaml", "//plugins/search-everywhere-ml/typos:searchEverywhereMl-typos", "//plugins/grazie", + "//plugins/compilation-charts:compilation-charts", + "//plugins/compilation-charts/jps-plugin:compilation-charts-jps", "//plugins/compose:compose-ide-plugin", "//plugins/compose/intellij.compose.ide.plugin.k1:ide-plugin-k1", "//plugins/compose/intellij.compose.ide.plugin.k2:ide-plugin-k2", diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt index 017390f5de38..437fd2ee2937 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt @@ -208,6 +208,9 @@ object CommunityRepositoryModules { pluginAuto(listOf("intellij.performanceTesting.ui")), githubPlugin("intellij.vcs.github.community", productCode = "IC"), gitlabPlugin("intellij.vcs.gitlab.community", productCode = "IC"), + pluginAuto(listOf("intellij.compilation.charts")) { spec -> + spec.withModule("intellij.compilation.charts.jps") + }, ) val CONTRIB_REPOSITORY_PLUGINS: List = java.util.List.of( diff --git a/plugins/compilation-charts/BUILD.bazel b/plugins/compilation-charts/BUILD.bazel new file mode 100644 index 000000000000..00d2915b82e9 --- /dev/null +++ b/plugins/compilation-charts/BUILD.bazel @@ -0,0 +1,39 @@ +### auto-generated section `build intellij.compilation.charts` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "compilation-charts_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "compilation-charts", + module_name = "intellij.compilation.charts", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), + deps = [ + "@community//java/compiler/impl:java-compiler-impl", + "@community//jps/jps-builders:build", + "@community//platform/extensions", + "@community//platform/ide-core-impl", + "@community//platform/core-api:core", + "@community//platform/lang-api:lang", + "@community//platform/lang-impl", + "@lib//:jackson", + "@lib//:jackson-databind", + "@lib//:jackson-module-kotlin", + "@lib//:rd-core", + "@lib//:rd-swing", + "@lib//:kotlinx-coroutines-core", + "@community//platform/rd-platform-community:rd-community", + "@lib//:kotlinx-collections-immutable", + "@community//platform/core-ui", + "@community//platform/platform-api:ide", + "@community//platform/util/concurrency", + "@community//java/idea-ui:ui", + "@community//platform/platform-impl:ide-impl", + ], + runtime_deps = [":compilation-charts_resources"] +) +### auto-generated section `build intellij.compilation.charts` end \ No newline at end of file diff --git a/java/compiler/charts/intellij.java.compiler.charts.iml b/plugins/compilation-charts/intellij.compilation.charts.iml similarity index 100% rename from java/compiler/charts/intellij.java.compiler.charts.iml rename to plugins/compilation-charts/intellij.compilation.charts.iml diff --git a/plugins/compilation-charts/jps-plugin/BUILD.bazel b/plugins/compilation-charts/jps-plugin/BUILD.bazel new file mode 100644 index 000000000000..ac544c4da6ad --- /dev/null +++ b/plugins/compilation-charts/jps-plugin/BUILD.bazel @@ -0,0 +1,24 @@ +### auto-generated section `build intellij.compilation.charts.jps` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "compilation-charts-jps_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "compilation-charts-jps", + module_name = "intellij.compilation.charts.jps", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), + kotlinc_opts = "@community//:k11", + deps = [ + "@community//jps/jps-builders:build", + "@community//platform/util", + "@lib//:gson", + "@community//jps/model-api:model", + ], + runtime_deps = [":compilation-charts-jps_resources"] +) +### auto-generated section `build intellij.compilation.charts.jps` end \ No newline at end of file diff --git a/java/compiler/charts/jps-plugin/intellij.java.compiler.charts.jps.iml b/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml similarity index 100% rename from java/compiler/charts/jps-plugin/intellij.java.compiler.charts.jps.iml rename to plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml diff --git a/java/compiler/charts/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/plugins/compilation-charts/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService similarity index 67% rename from java/compiler/charts/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService rename to plugins/compilation-charts/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService index ff7ca6987646..d5f9deaf39db 100644 --- a/java/compiler/charts/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService +++ b/plugins/compilation-charts/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService @@ -1,2 +1,2 @@ # Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -com.intellij.java.compiler.charts.jps.ChartsBuilderService \ No newline at end of file +com.intellij.compilation.charts.jps.ChartsBuilderService \ No newline at end of file diff --git a/java/compiler/charts/jps-plugin/resources/messages/CompilationChartsJpsBundle.properties b/plugins/compilation-charts/jps-plugin/resources/messages/CompilationChartsJpsBundle.properties similarity index 100% rename from java/compiler/charts/jps-plugin/resources/messages/CompilationChartsJpsBundle.properties rename to plugins/compilation-charts/jps-plugin/resources/messages/CompilationChartsJpsBundle.properties diff --git a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/ChartsBuilderService.java b/plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/ChartsBuilderService.java similarity index 98% rename from java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/ChartsBuilderService.java rename to plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/ChartsBuilderService.java index 5b1d6416ca92..a8eb468a211e 100644 --- a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/ChartsBuilderService.java +++ b/plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/ChartsBuilderService.java @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.jps; +package com.intellij.compilation.charts.jps; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.NlsSafe; diff --git a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompilationChartsJpsBundle.java b/plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompilationChartsJpsBundle.java similarity index 96% rename from java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompilationChartsJpsBundle.java rename to plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompilationChartsJpsBundle.java index 0a133ad8fe4c..f4a85aab5d83 100644 --- a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompilationChartsJpsBundle.java +++ b/plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompilationChartsJpsBundle.java @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.jps; +package com.intellij.compilation.charts.jps; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; diff --git a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompilationStatusBuilderMessage.java b/plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompilationStatusBuilderMessage.java similarity index 73% rename from java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompilationStatusBuilderMessage.java rename to plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompilationStatusBuilderMessage.java index a4c6c5fda117..7171e44e7e6b 100644 --- a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompilationStatusBuilderMessage.java +++ b/plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompilationStatusBuilderMessage.java @@ -1,9 +1,9 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.jps; +package com.intellij.compilation.charts.jps; import org.jetbrains.jps.incremental.messages.CustomBuilderMessage; -import static com.intellij.java.compiler.charts.jps.ChartsBuilderService.COMPILATION_STATUS_BUILDER_ID; +import static com.intellij.compilation.charts.jps.ChartsBuilderService.COMPILATION_STATUS_BUILDER_ID; public class CompilationStatusBuilderMessage extends CustomBuilderMessage { public CompilationStatusBuilderMessage(String messageType) { diff --git a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompileStatisticBuilderMessage.java b/plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompileStatisticBuilderMessage.java similarity index 95% rename from java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompileStatisticBuilderMessage.java rename to plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompileStatisticBuilderMessage.java index ca58a3138ed5..a42bd9ac0b1f 100644 --- a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompileStatisticBuilderMessage.java +++ b/plugins/compilation-charts/jps-plugin/src/com/intellij/compilation/charts/jps/CompileStatisticBuilderMessage.java @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.jps; +package com.intellij.compilation.charts.jps; import com.google.gson.Gson; import com.intellij.util.containers.ContainerUtil; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Set; import java.util.function.Supplier; -import static com.intellij.java.compiler.charts.jps.ChartsBuilderService.COMPILATION_STATISTIC_BUILDER_ID; +import static com.intellij.compilation.charts.jps.ChartsBuilderService.COMPILATION_STATISTIC_BUILDER_ID; public final class CompileStatisticBuilderMessage extends CustomBuilderMessage { private static final Gson JSON = new Gson(); diff --git a/plugins/compilation-charts/plugin-content.yaml b/plugins/compilation-charts/plugin-content.yaml new file mode 100644 index 000000000000..97cc0fac0c0e --- /dev/null +++ b/plugins/compilation-charts/plugin-content.yaml @@ -0,0 +1,6 @@ +- name: lib/compilation-charts-jps.jar + modules: + - name: intellij.compilation.charts.jps +- name: lib/compilation-charts.jar + modules: + - name: intellij.compilation.charts \ No newline at end of file diff --git a/plugins/compilation-charts/resources/META-INF/plugin.xml b/plugins/compilation-charts/resources/META-INF/plugin.xml new file mode 100644 index 000000000000..cf0dbd34176a --- /dev/null +++ b/plugins/compilation-charts/resources/META-INF/plugin.xml @@ -0,0 +1,56 @@ + + intellij.compilation.charts + Compilation Charts + JetBrains + Build Tools + + + messages.CompilationChartsBundle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/compilation-charts/resources/META-INF/pluginIcon.svg b/plugins/compilation-charts/resources/META-INF/pluginIcon.svg new file mode 100644 index 000000000000..d2a411f79d3f --- /dev/null +++ b/plugins/compilation-charts/resources/META-INF/pluginIcon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/plugins/compilation-charts/resources/META-INF/pluginIcon_dark.svg b/plugins/compilation-charts/resources/META-INF/pluginIcon_dark.svg new file mode 100644 index 000000000000..e419b5197576 --- /dev/null +++ b/plugins/compilation-charts/resources/META-INF/pluginIcon_dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/java/compiler/charts/resources/intellij.java.compiler.charts.xml b/plugins/compilation-charts/resources/intellij.compilation.charts.xml similarity index 67% rename from java/compiler/charts/resources/intellij.java.compiler.charts.xml rename to plugins/compilation-charts/resources/intellij.compilation.charts.xml index f8518664e5f8..0306ae1a86dd 100644 --- a/java/compiler/charts/resources/intellij.java.compiler.charts.xml +++ b/plugins/compilation-charts/resources/intellij.compilation.charts.xml @@ -1,34 +1,34 @@ - + - - - + + + - + - - - - diff --git a/java/compiler/charts/resources/messages/CompilationChartsBundle.properties b/plugins/compilation-charts/resources/messages/CompilationChartsBundle.properties similarity index 100% rename from java/compiler/charts/resources/messages/CompilationChartsBundle.properties rename to plugins/compilation-charts/resources/messages/CompilationChartsBundle.properties diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationCharts.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationCharts.java similarity index 79% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationCharts.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationCharts.java index 1e8036601ba1..d3b3a1d0feef 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationCharts.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationCharts.java @@ -1,11 +1,11 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts; +package com.intellij.compilation.charts; -import com.intellij.java.compiler.charts.events.ChartEvent; +import com.intellij.compilation.charts.events.ChartEvent; import com.intellij.openapi.Disposable; import org.jetbrains.annotations.NotNull; -import javax.swing.*; +import javax.swing.JComponent; import java.util.Collection; public interface CompilationCharts extends Disposable { diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationChartsBundle.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationChartsBundle.java similarity index 94% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationChartsBundle.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationChartsBundle.java index 76e7f4463cfd..cea0540b9c81 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationChartsBundle.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationChartsBundle.java @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts; +package com.intellij.compilation.charts; import com.intellij.DynamicBundle; import org.jetbrains.annotations.Nls; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationChartsFactory.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationChartsFactory.java similarity index 91% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationChartsFactory.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationChartsFactory.java index fef3fc512cf2..54ce9e660a03 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/CompilationChartsFactory.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/CompilationChartsFactory.java @@ -1,7 +1,7 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts; +package com.intellij.compilation.charts; -import com.intellij.java.compiler.charts.events.StatisticChartEvent; +import com.intellij.compilation.charts.events.StatisticChartEvent; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/ChartEvent.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/ChartEvent.java similarity index 87% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/events/ChartEvent.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/events/ChartEvent.java index 70c387d7b8ea..bba822f2a1a9 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/ChartEvent.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/ChartEvent.java @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.events; +package com.intellij.compilation.charts.events; import org.jetbrains.annotations.NotNull; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/CpuStatisticChartEvent.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/CpuStatisticChartEvent.java similarity index 89% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/events/CpuStatisticChartEvent.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/events/CpuStatisticChartEvent.java index 3a690776b922..08da99252998 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/CpuStatisticChartEvent.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/CpuStatisticChartEvent.java @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.events; +package com.intellij.compilation.charts.events; import org.jetbrains.annotations.NotNull; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/MemoryStatisticChartEvent.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/MemoryStatisticChartEvent.java similarity index 89% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/events/MemoryStatisticChartEvent.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/events/MemoryStatisticChartEvent.java index b6c524195b76..19c9c9d6a82e 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/MemoryStatisticChartEvent.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/MemoryStatisticChartEvent.java @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.events; +package com.intellij.compilation.charts.events; import org.jetbrains.annotations.NotNull; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleChartEvent.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleChartEvent.java similarity index 88% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleChartEvent.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleChartEvent.java index a224b0db7225..d45d309a4035 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleChartEvent.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleChartEvent.java @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.events; +package com.intellij.compilation.charts.events; import com.intellij.openapi.util.NlsContexts; import org.jetbrains.annotations.NotNull; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleFinishChartEvent.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleFinishChartEvent.java similarity index 91% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleFinishChartEvent.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleFinishChartEvent.java index b5ee40267af7..31b4e8c4bef3 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleFinishChartEvent.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleFinishChartEvent.java @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.events; +package com.intellij.compilation.charts.events; import org.jetbrains.annotations.NotNull; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleStartChartEvent.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleStartChartEvent.java similarity index 91% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleStartChartEvent.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleStartChartEvent.java index 922863fec6a9..59ce7597effa 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/ModuleStartChartEvent.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/ModuleStartChartEvent.java @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.events; +package com.intellij.compilation.charts.events; import org.jetbrains.annotations.NotNull; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/StatisticChartEvent.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/StatisticChartEvent.java similarity index 85% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/events/StatisticChartEvent.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/events/StatisticChartEvent.java index 340a3ad1e2d3..23e8772a7d30 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/events/StatisticChartEvent.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/events/StatisticChartEvent.java @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.events; +package com.intellij.compilation.charts.events; import org.jetbrains.annotations.NotNull; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsFactoryImpl.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsFactoryImpl.java similarity index 82% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsFactoryImpl.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsFactoryImpl.java index 43ab2e02599f..cd70b7f0a4bc 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsFactoryImpl.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsFactoryImpl.java @@ -1,9 +1,9 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.impl; +package com.intellij.compilation.charts.impl; -import com.intellij.java.compiler.charts.CompilationCharts; -import com.intellij.java.compiler.charts.CompilationChartsFactory; -import com.intellij.java.compiler.charts.events.StatisticChartEvent; +import com.intellij.compilation.charts.CompilationCharts; +import com.intellij.compilation.charts.CompilationChartsFactory; +import com.intellij.compilation.charts.events.StatisticChartEvent; import com.intellij.openapi.Disposable; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.Nls; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsImpl.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsImpl.kt similarity index 91% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsImpl.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsImpl.kt index b3c5954826f3..9e4dffbd355b 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsImpl.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsImpl.kt @@ -1,12 +1,16 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.impl +package com.intellij.compilation.charts.impl -import com.intellij.java.compiler.charts.CompilationCharts -import com.intellij.java.compiler.charts.events.* -import com.intellij.java.compiler.charts.impl.CompilationChartsViewModel.Filter -import com.intellij.java.compiler.charts.ui.CompilationChartsTopic -import com.intellij.java.compiler.charts.ui.CompilationChartsTopic.* -import com.intellij.java.compiler.charts.ui.CompilationChartsView +import com.intellij.compilation.charts.CompilationCharts +import com.intellij.compilation.charts.events.ChartEvent +import com.intellij.compilation.charts.events.ModuleChartEvent +import com.intellij.compilation.charts.events.ModuleFinishChartEvent +import com.intellij.compilation.charts.events.ModuleStartChartEvent +import com.intellij.compilation.charts.events.StatisticChartEvent +import com.intellij.compilation.charts.impl.CompilationChartsViewModel.Filter +import com.intellij.compilation.charts.ui.CompilationChartsTopic +import com.intellij.compilation.charts.ui.CompilationChartsTopic.* +import com.intellij.compilation.charts.ui.CompilationChartsView import com.intellij.openapi.Disposable import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsViewModel.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsViewModel.kt similarity index 90% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsViewModel.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsViewModel.kt index 0ec52495d8a5..8cef519f5a59 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/impl/CompilationChartsViewModel.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/impl/CompilationChartsViewModel.kt @@ -1,7 +1,7 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.impl +package com.intellij.compilation.charts.impl -import com.intellij.java.compiler.charts.ui.CompilationChartsTopic +import com.intellij.compilation.charts.ui.CompilationChartsTopic import com.intellij.openapi.Disposable import com.intellij.openapi.project.Project import java.util.function.Predicate diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/impl/EventDeclaration.java b/plugins/compilation-charts/src/com/intellij/compilation/charts/impl/EventDeclaration.java similarity index 82% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/impl/EventDeclaration.java rename to plugins/compilation-charts/src/com/intellij/compilation/charts/impl/EventDeclaration.java index 085bb67a4543..7dc20ccd5e30 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/impl/EventDeclaration.java +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/impl/EventDeclaration.java @@ -1,9 +1,9 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.impl; +package com.intellij.compilation.charts.impl; -import com.intellij.java.compiler.charts.CompilationChartsFactory.EventColor; -import com.intellij.java.compiler.charts.CompilationChartsFactory.EventLayout; -import com.intellij.java.compiler.charts.events.StatisticChartEvent; +import com.intellij.compilation.charts.CompilationChartsFactory.EventColor; +import com.intellij.compilation.charts.CompilationChartsFactory.EventLayout; +import com.intellij.compilation.charts.events.StatisticChartEvent; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsBuildEvent.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsBuildEvent.kt similarity index 87% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsBuildEvent.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsBuildEvent.kt index 44d93e37b3e0..37f1fdab715d 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsBuildEvent.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsBuildEvent.kt @@ -1,21 +1,22 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.jps +package com.intellij.compilation.charts.jps import com.intellij.build.BuildViewManager import com.intellij.build.events.BuildEventPresentationData import com.intellij.build.events.PresentableBuildEvent import com.intellij.build.events.impl.AbstractBuildEvent +import com.intellij.compilation.charts.CompilationCharts +import com.intellij.compilation.charts.CompilationChartsBundle import com.intellij.execution.ui.ExecutionConsole import com.intellij.icons.AllIcons -import com.intellij.java.compiler.charts.CompilationCharts -import com.intellij.java.compiler.charts.CompilationChartsBundle import com.intellij.openapi.actionSystem.ActionGroup import javax.swing.Icon import javax.swing.JComponent internal class CompilationChartsBuildEvent(val view: BuildViewManager, val buildId: Any, - val chart: CompilationCharts) : + val chart: CompilationCharts +) : AbstractBuildEvent(Any(), buildId, System.currentTimeMillis(), CompilationChartsBundle.message("charts.tab.name")), PresentableBuildEvent { diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsBuildParametersProvider.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsBuildParametersProvider.kt similarity index 92% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsBuildParametersProvider.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsBuildParametersProvider.kt index 206955dcd267..e6ee2a317639 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsBuildParametersProvider.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsBuildParametersProvider.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.jps +package com.intellij.compilation.charts.jps import com.intellij.compiler.server.BuildProcessParametersProvider import com.intellij.openapi.util.registry.Registry diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsProjectActivity.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsProjectActivity.kt similarity index 91% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsProjectActivity.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsProjectActivity.kt index 68bffc40389f..0c31c47b99bf 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsProjectActivity.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/jps/CompilationChartsProjectActivity.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.jps +package com.intellij.compilation.charts.jps import com.fasterxml.jackson.core.JsonFactory import com.fasterxml.jackson.core.JsonProcessingException @@ -11,15 +11,15 @@ import com.intellij.build.BuildViewManager import com.intellij.build.events.BuildEvent import com.intellij.build.events.FinishBuildEvent import com.intellij.build.events.StartBuildEvent +import com.intellij.compilation.charts.CompilationChartsBundle +import com.intellij.compilation.charts.CompilationChartsFactory +import com.intellij.compilation.charts.CompilationChartsFactory.EventLayout +import com.intellij.compilation.charts.events.CpuStatisticChartEvent +import com.intellij.compilation.charts.events.MemoryStatisticChartEvent +import com.intellij.compilation.charts.events.ModuleFinishChartEvent +import com.intellij.compilation.charts.events.ModuleStartChartEvent +import com.intellij.compilation.charts.ui.Colors import com.intellij.compiler.server.CustomBuilderMessageHandler -import com.intellij.java.compiler.charts.CompilationChartsBundle -import com.intellij.java.compiler.charts.CompilationChartsFactory -import com.intellij.java.compiler.charts.CompilationChartsFactory.EventLayout -import com.intellij.java.compiler.charts.events.CpuStatisticChartEvent -import com.intellij.java.compiler.charts.events.MemoryStatisticChartEvent -import com.intellij.java.compiler.charts.events.ModuleFinishChartEvent -import com.intellij.java.compiler.charts.events.ModuleStartChartEvent -import com.intellij.java.compiler.charts.ui.Colors import com.intellij.openapi.Disposable import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.project.Project @@ -27,7 +27,9 @@ import com.intellij.openapi.startup.ProjectActivity import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.registry.Registry import com.intellij.util.messages.MessageBusConnection -import java.util.* +import java.util.ArrayDeque +import java.util.Queue +import java.util.UUID import java.util.concurrent.atomic.AtomicReference class CompilationChartsProjectActivity : ProjectActivity { diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/jps/messages.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/jps/messages.kt similarity index 95% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/jps/messages.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/jps/messages.kt index f58e00f2103e..20f33ff0c5dd 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/jps/messages.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/jps/messages.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.jps +package com.intellij.compilation.charts.jps interface TargetEvent { val name: String diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/ActionPanel.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/ActionPanel.kt similarity index 94% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/ActionPanel.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/ActionPanel.kt index e01b0d2d7360..f5629c8cc5ad 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/ActionPanel.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/ActionPanel.kt @@ -1,10 +1,16 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui +import com.intellij.compilation.charts.CompilationChartsBundle +import com.intellij.compilation.charts.impl.CompilationChartsViewModel import com.intellij.icons.AllIcons -import com.intellij.java.compiler.charts.CompilationChartsBundle -import com.intellij.java.compiler.charts.impl.CompilationChartsViewModel -import com.intellij.openapi.actionSystem.* +import com.intellij.openapi.actionSystem.ActionManager +import com.intellij.openapi.actionSystem.ActionUpdateThread +import com.intellij.openapi.actionSystem.AnActionEvent +import com.intellij.openapi.actionSystem.DefaultActionGroup +import com.intellij.openapi.actionSystem.IdeActions +import com.intellij.openapi.actionSystem.Presentation +import com.intellij.openapi.actionSystem.Separator import com.intellij.openapi.actionSystem.ex.CustomComponentAction import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.project.Project diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/AutoScrollingType.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/AutoScrollingType.kt similarity index 91% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/AutoScrollingType.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/AutoScrollingType.kt index b4d7350170f6..19452b28497f 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/AutoScrollingType.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/AutoScrollingType.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui class AutoScrollingType { private var type: Type = Type.YES diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/ChartGraphics.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/ChartGraphics.kt similarity index 95% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/ChartGraphics.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/ChartGraphics.kt index 1f58443db557..b6a87044e232 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/ChartGraphics.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/ChartGraphics.kt @@ -1,9 +1,15 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui import com.intellij.ide.ui.UISettings.Companion.setupAntialiasing import com.intellij.util.JBHiDPIScaledImage -import java.awt.* +import java.awt.Color +import java.awt.Font +import java.awt.FontMetrics +import java.awt.Graphics2D +import java.awt.RenderingHints +import java.awt.Shape +import java.awt.Stroke import java.awt.geom.AffineTransform import java.awt.geom.Line2D import java.awt.geom.Path2D diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsDiagramsComponent.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsDiagramsComponent.kt similarity index 94% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsDiagramsComponent.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsDiagramsComponent.kt index 05c67e63e519..46ce2304c81d 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsDiagramsComponent.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsDiagramsComponent.kt @@ -1,11 +1,11 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui +import com.intellij.compilation.charts.impl.CompilationChartsImpl.FilterImpl +import com.intellij.compilation.charts.impl.CompilationChartsViewModel +import com.intellij.compilation.charts.impl.CompilationChartsViewModel.Filter +import com.intellij.compilation.charts.impl.EventDeclaration import com.intellij.ide.ui.UISettings -import com.intellij.java.compiler.charts.impl.CompilationChartsImpl.FilterImpl -import com.intellij.java.compiler.charts.impl.CompilationChartsViewModel -import com.intellij.java.compiler.charts.impl.CompilationChartsViewModel.Filter -import com.intellij.java.compiler.charts.impl.EventDeclaration import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.editor.colors.EditorColorsListener import com.intellij.openapi.editor.colors.EditorColorsManager @@ -15,7 +15,11 @@ import com.intellij.ui.components.JBPanelWithEmptyText import com.intellij.ui.components.Magnificator import com.intellij.util.concurrency.AppExecutorUtil import com.intellij.util.ui.UIUtil -import java.awt.* +import java.awt.BorderLayout +import java.awt.Dimension +import java.awt.Graphics +import java.awt.Graphics2D +import java.awt.Point import java.awt.geom.Rectangle2D import java.awt.image.BufferedImage import java.util.concurrent.atomic.AtomicBoolean diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsHint.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsHint.kt similarity index 95% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsHint.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsHint.kt index 0bb8f22c4686..f113280a55a2 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsHint.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsHint.kt @@ -1,8 +1,8 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui -import com.intellij.java.compiler.charts.CompilationChartsBundle -import com.intellij.java.compiler.charts.ui.CompilationChartsAction.Position.* +import com.intellij.compilation.charts.CompilationChartsBundle +import com.intellij.compilation.charts.ui.CompilationChartsAction.Position.* import com.intellij.openapi.Disposable import com.intellij.openapi.project.Project import com.intellij.openapi.ui.popup.Balloon diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsTopic.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsTopic.kt similarity index 64% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsTopic.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsTopic.kt index e5daf802a538..23c956416ca3 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsTopic.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsTopic.kt @@ -1,10 +1,10 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui -import com.intellij.java.compiler.charts.events.ModuleChartEvent -import com.intellij.java.compiler.charts.events.StatisticChartEvent -import com.intellij.java.compiler.charts.impl.CompilationChartsViewModel.Filter -import com.intellij.java.compiler.charts.impl.ModuleKey +import com.intellij.compilation.charts.events.ModuleChartEvent +import com.intellij.compilation.charts.events.StatisticChartEvent +import com.intellij.compilation.charts.impl.CompilationChartsViewModel.Filter +import com.intellij.compilation.charts.impl.ModuleKey import com.jetbrains.rd.util.reactive.IViewableList import com.jetbrains.rd.util.reactive.IViewableMap import kotlinx.collections.immutable.PersistentList diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsView.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsView.kt similarity index 94% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsView.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsView.kt index 53aafb7a16bc..c2ead96e0ed9 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsView.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsView.kt @@ -1,8 +1,8 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui -import com.intellij.java.compiler.charts.impl.CompilationChartsViewModel -import com.intellij.java.compiler.charts.ui.CompilationChartsTopic.* +import com.intellij.compilation.charts.impl.CompilationChartsViewModel +import com.intellij.compilation.charts.ui.CompilationChartsTopic.* import com.intellij.openapi.actionSystem.DataKey import com.intellij.openapi.actionSystem.DataSink import com.intellij.openapi.actionSystem.UiDataProvider diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsViewport.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsViewport.kt similarity index 98% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsViewport.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsViewport.kt index 6918af5ff311..c96a8fcd1a8f 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/CompilationChartsViewport.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/CompilationChartsViewport.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui import com.intellij.openapi.util.registry.Registry import com.intellij.ui.components.JBViewport diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/RightAdhesionScrollBarListener.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/RightAdhesionScrollBarListener.kt similarity index 98% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/RightAdhesionScrollBarListener.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/RightAdhesionScrollBarListener.kt index 9b7c41843768..8ba932873e6d 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/RightAdhesionScrollBarListener.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/RightAdhesionScrollBarListener.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui import com.intellij.util.concurrency.AppExecutorUtil import java.awt.Point diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/UIModel.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/UIModel.kt similarity index 81% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/UIModel.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/UIModel.kt index f95f98d33c0c..47c6f9ad75e8 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/UIModel.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/UIModel.kt @@ -1,13 +1,14 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui -import com.intellij.java.compiler.charts.events.ModuleChartEvent -import com.intellij.java.compiler.charts.events.ModuleFinishChartEvent -import com.intellij.java.compiler.charts.events.ModuleStartChartEvent -import com.intellij.java.compiler.charts.events.StatisticChartEvent -import com.intellij.java.compiler.charts.impl.ChartModule -import com.intellij.java.compiler.charts.impl.ModuleKey -import java.util.* +import com.intellij.compilation.charts.events.ModuleChartEvent +import com.intellij.compilation.charts.events.ModuleFinishChartEvent +import com.intellij.compilation.charts.events.ModuleStartChartEvent +import com.intellij.compilation.charts.events.StatisticChartEvent +import com.intellij.compilation.charts.impl.ChartModule +import com.intellij.compilation.charts.impl.ModuleKey +import java.util.NavigableSet +import java.util.TreeSet import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicInteger diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/Zoom.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/Zoom.kt similarity index 97% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/Zoom.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/Zoom.kt index 09b3c6b5b423..4894daaf7c0c 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/Zoom.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/Zoom.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui import java.awt.Point import java.util.concurrent.TimeUnit diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/actions.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/actions.kt similarity index 90% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/actions.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/actions.kt index 790099e48007..41fcb1c91327 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/actions.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/actions.kt @@ -1,9 +1,17 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui -import com.intellij.java.compiler.charts.CompilationChartsBundle -import com.intellij.java.compiler.charts.impl.ModuleKey -import com.intellij.openapi.actionSystem.* +import com.intellij.compilation.charts.CompilationChartsBundle +import com.intellij.compilation.charts.impl.ModuleKey +import com.intellij.openapi.actionSystem.ActionManager +import com.intellij.openapi.actionSystem.ActionPlaces +import com.intellij.openapi.actionSystem.ActionUiKind +import com.intellij.openapi.actionSystem.AnActionEvent +import com.intellij.openapi.actionSystem.CommonDataKeys +import com.intellij.openapi.actionSystem.DataContext +import com.intellij.openapi.actionSystem.DataKey +import com.intellij.openapi.actionSystem.LangDataKeys +import com.intellij.openapi.actionSystem.PlatformCoreDataKeys import com.intellij.openapi.fileEditor.OpenFileDescriptor import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.options.ShowSettingsUtil diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/charts-dsl.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/charts-dsl.kt similarity index 96% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/charts-dsl.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/charts-dsl.kt index 044df5df618d..0ffe8630afdc 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/charts-dsl.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/charts-dsl.kt @@ -1,9 +1,9 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui -import com.intellij.java.compiler.charts.events.StatisticChartEvent -import com.intellij.java.compiler.charts.impl.CompilationChartsViewModel -import com.intellij.java.compiler.charts.impl.ModuleKey +import com.intellij.compilation.charts.events.StatisticChartEvent +import com.intellij.compilation.charts.impl.CompilationChartsViewModel +import com.intellij.compilation.charts.impl.ModuleKey import com.intellij.ui.JBColor import com.intellij.util.ui.UIUtil.FontSize import java.awt.Color @@ -12,7 +12,7 @@ import java.awt.event.MouseAdapter import java.awt.event.MouseEvent import java.awt.event.MouseMotionListener import java.awt.geom.Rectangle2D -import java.util.* +import java.util.Objects import java.util.concurrent.ConcurrentHashMap import kotlin.math.abs import kotlin.math.max diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/components.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/components.kt similarity index 96% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/components.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/components.kt index 93f547d6eaba..57bc20b22d86 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/components.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/components.kt @@ -1,13 +1,13 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui +import com.intellij.compilation.charts.events.StatisticChartEvent +import com.intellij.compilation.charts.impl.ChartModule +import com.intellij.compilation.charts.impl.ModuleKey +import com.intellij.compilation.charts.ui.Colors.FILTERED_ALPHA +import com.intellij.compilation.charts.ui.Colors.NO_ALPHA +import com.intellij.compilation.charts.ui.Settings.Block.MIN_SIZE import com.intellij.ide.nls.NlsMessages -import com.intellij.java.compiler.charts.events.StatisticChartEvent -import com.intellij.java.compiler.charts.impl.ChartModule -import com.intellij.java.compiler.charts.impl.ModuleKey -import com.intellij.java.compiler.charts.ui.Colors.FILTERED_ALPHA -import com.intellij.java.compiler.charts.ui.Colors.NO_ALPHA -import com.intellij.java.compiler.charts.ui.Settings.Block.MIN_SIZE import com.intellij.openapi.util.text.Formats import com.intellij.ui.JBColor import com.intellij.util.ui.UIUtil @@ -16,7 +16,8 @@ import java.awt.Color import java.awt.geom.Line2D import java.awt.geom.Path2D import java.awt.geom.Rectangle2D -import java.util.* +import java.util.NavigableSet +import java.util.TreeSet import java.util.concurrent.TimeUnit import java.util.function.BiFunction import kotlin.math.max diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/constants.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/constants.kt similarity index 98% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/constants.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/constants.kt index 9a93ce191d17..8e3d5a775a4f 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/constants.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/constants.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui import com.intellij.icons.AllIcons import com.intellij.ui.JBColor diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/dataset.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/dataset.kt similarity index 77% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/dataset.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/dataset.kt index 7c8d15c994dc..4705a7a98bb1 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/dataset.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/dataset.kt @@ -1,12 +1,13 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui -import com.intellij.java.compiler.charts.events.StatisticChartEvent -import com.intellij.java.compiler.charts.impl.ChartModule -import com.intellij.java.compiler.charts.impl.CompilationChartsImpl.FilterImpl -import com.intellij.java.compiler.charts.impl.CompilationChartsViewModel.Filter -import com.intellij.java.compiler.charts.impl.ModuleKey -import java.util.* +import com.intellij.compilation.charts.events.StatisticChartEvent +import com.intellij.compilation.charts.impl.ChartModule +import com.intellij.compilation.charts.impl.CompilationChartsImpl.FilterImpl +import com.intellij.compilation.charts.impl.CompilationChartsViewModel.Filter +import com.intellij.compilation.charts.impl.ModuleKey +import java.util.NavigableSet +import java.util.TreeSet import kotlin.math.max import kotlin.math.min diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/functions.kt b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/functions.kt similarity index 98% rename from java/compiler/charts/src/com/intellij/java/compiler/charts/ui/functions.kt rename to plugins/compilation-charts/src/com/intellij/compilation/charts/ui/functions.kt index fd36310312c3..2dbf8a317a29 100644 --- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/functions.kt +++ b/plugins/compilation-charts/src/com/intellij/compilation/charts/ui/functions.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.java.compiler.charts.ui +package com.intellij.compilation.charts.ui import com.intellij.ui.ColorUtil import com.intellij.util.JBHiDPIScaledImage