From 6df730032a847f450e5bd3f60793dc56fce37afe Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Mon, 3 Jun 2024 10:35:48 +0200 Subject: [PATCH] [jps model] API cleanup: move internal class TimingLog to impl package GitOrigin-RevId: 99943719329b6087f0ff5f03d827599ff634ea15 --- .../src/org/jetbrains/jps/cmdline/BuildSession.java | 2 +- .../org/jetbrains/jps/incremental/IncProjectBuilder.java | 2 +- .../jps/model/serialization/JpsComponentLoader.java | 2 +- .../model/serialization/JpsProjectConfigurationLoading.java | 2 +- .../jetbrains/jps/model/serialization/JpsProjectLoader.java | 2 +- .../jps/{ => model/serialization/impl}/TimingLog.java | 6 ++---- 6 files changed, 7 insertions(+), 9 deletions(-) rename jps/model-serialization/src/org/jetbrains/jps/{ => model/serialization/impl}/TimingLog.java (69%) diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java index bd08771f1d8c..5433a400ccb3 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.TimingLog; +import org.jetbrains.jps.model.serialization.impl.TimingLog; import org.jetbrains.jps.api.*; import org.jetbrains.jps.builders.*; import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java index 8c3bb343ddc2..30f5212b6d5c 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.ModuleChunk; -import org.jetbrains.jps.TimingLog; +import org.jetbrains.jps.model.serialization.impl.TimingLog; import org.jetbrains.jps.api.BuildParametersKeys; import org.jetbrains.jps.api.CanceledStatus; import org.jetbrains.jps.api.GlobalOptions; diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsComponentLoader.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsComponentLoader.java index 67b2ff08d54d..fe81f6a4918e 100644 --- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsComponentLoader.java +++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsComponentLoader.java @@ -10,7 +10,7 @@ import org.jdom.JDOMException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.TimingLog; +import org.jetbrains.jps.model.serialization.impl.TimingLog; import org.jetbrains.jps.model.JpsElement; import java.io.IOException; diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectConfigurationLoading.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectConfigurationLoading.java index 7eac9bfc2640..0c71d02f1790 100644 --- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectConfigurationLoading.java +++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectConfigurationLoading.java @@ -9,7 +9,7 @@ import org.jdom.Element; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.TimingLog; +import org.jetbrains.jps.model.serialization.impl.TimingLog; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.artifact.JpsArtifactSerializer; import org.jetbrains.jps.model.serialization.impl.JpsProjectSerializationDataExtensionImpl; diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java index 757a2db48c48..3807b1504c5e 100644 --- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java +++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java @@ -11,7 +11,7 @@ import org.jdom.Element; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.TimingLog; +import org.jetbrains.jps.model.serialization.impl.TimingLog; import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.JpsElement; import org.jetbrains.jps.model.JpsElementFactory; diff --git a/jps/model-serialization/src/org/jetbrains/jps/TimingLog.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/impl/TimingLog.java similarity index 69% rename from jps/model-serialization/src/org/jetbrains/jps/TimingLog.java rename to jps/model-serialization/src/org/jetbrains/jps/model/serialization/impl/TimingLog.java index 40d4af18af36..c8d753350f1f 100644 --- a/jps/model-serialization/src/org/jetbrains/jps/TimingLog.java +++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/impl/TimingLog.java @@ -1,13 +1,11 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.jps; +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package org.jetbrains.jps.model.serialization.impl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.EmptyRunnable; -import org.jetbrains.annotations.ApiStatus; import java.util.concurrent.TimeUnit; -@ApiStatus.Internal public final class TimingLog { public static final Logger LOG = Logger.getInstance(TimingLog.class);