From 5d2088a0cf489ddb3f629d63c4cc6d129794a279 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Mon, 24 Oct 2016 18:00:04 +0300 Subject: [PATCH] [vcs-log] minor: move VcsLogStorage to data --- .../src/com/intellij/vcs/log/data/AbstractDataGetter.java | 1 - .../src/com/intellij/vcs/log/data/CommitDetailsGetter.java | 1 - .../impl/src/com/intellij/vcs/log/data/CompressedRefs.java | 1 - .../com/intellij/vcs/log/data/FakeVisiblePackBuilder.java | 1 - .../src/com/intellij/vcs/log/data/InMemoryStorage.java | 1 - .../src/com/intellij/vcs/log/data/MiniDetailsGetter.java | 3 --- .../src/com/intellij/vcs/log/data/TopCommitsCache.java | 1 - .../src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java | 2 -- .../src/com/intellij/vcs/log/{ => data}/VcsLogStorage.java | 7 +++++-- .../impl/src/com/intellij/vcs/log/impl/VcsLogManager.java | 2 +- 10 files changed, 6 insertions(+), 14 deletions(-) rename platform/vcs-log/impl/src/com/intellij/vcs/log/{ => data}/VcsLogStorage.java (92%) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/AbstractDataGetter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/AbstractDataGetter.java index f3f48da15c22..28e4891b5158 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/AbstractDataGetter.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/AbstractDataGetter.java @@ -16,7 +16,6 @@ import com.intellij.util.containers.MultiMap; import com.intellij.util.ui.UIUtil; import com.intellij.vcs.log.CommitId; import com.intellij.vcs.log.VcsLogProvider; -import com.intellij.vcs.log.VcsLogStorage; import com.intellij.vcs.log.VcsShortCommitDetails; import com.intellij.vcs.log.util.SequentialLimitedLifoExecutor; import gnu.trove.TIntHashSet; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/CommitDetailsGetter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/CommitDetailsGetter.java index 800400ebb46b..739de9449db2 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/CommitDetailsGetter.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/CommitDetailsGetter.java @@ -5,7 +5,6 @@ import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcs.log.VcsFullCommitDetails; import com.intellij.vcs.log.VcsLogProvider; -import com.intellij.vcs.log.VcsLogStorage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/CompressedRefs.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/CompressedRefs.java index f1c21dd3bedf..772579231019 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/CompressedRefs.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/CompressedRefs.java @@ -21,7 +21,6 @@ import com.intellij.openapi.util.Ref; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; -import com.intellij.vcs.log.VcsLogStorage; import com.intellij.vcs.log.VcsRef; import com.intellij.vcs.log.util.TroveUtil; import gnu.trove.TIntArrayList; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java index a65a50d23cc0..398bcc198d4d 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java @@ -18,7 +18,6 @@ package com.intellij.vcs.log.data; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.VcsLogFilterCollection; -import com.intellij.vcs.log.VcsLogStorage; import com.intellij.vcs.log.VcsLogProvider; import com.intellij.vcs.log.VcsRef; import com.intellij.vcs.log.graph.GraphColorManagerImpl; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/InMemoryStorage.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/InMemoryStorage.java index cb7e15bc0e83..207101645b1d 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/InMemoryStorage.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/InMemoryStorage.java @@ -20,7 +20,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.BiDirectionalEnumerator; import com.intellij.vcs.log.CommitId; import com.intellij.vcs.log.Hash; -import com.intellij.vcs.log.VcsLogStorage; import com.intellij.vcs.log.VcsRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/MiniDetailsGetter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/MiniDetailsGetter.java index a29ec97bf6c6..0d791f9aae57 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/MiniDetailsGetter.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/MiniDetailsGetter.java @@ -4,9 +4,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcs.log.VcsLogProvider; -import com.intellij.util.containers.ConcurrentIntObjectMap; -import com.intellij.vcs.log.VcsCommitMetadata; -import com.intellij.vcs.log.VcsLogStorage; import com.intellij.vcs.log.VcsShortCommitDetails; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java index 8c7e3c9150d3..967cfe90c8ce 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java @@ -20,7 +20,6 @@ import com.google.common.collect.PeekingIterator; import com.intellij.util.containers.ConcurrentIntObjectMap; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.VcsCommitMetadata; -import com.intellij.vcs.log.VcsLogStorage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java index 5606994c8755..dbb707d3d144 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java @@ -15,13 +15,11 @@ */ package com.intellij.vcs.log.data; -import com.intellij.openapi.Disposable; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/VcsLogStorage.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogStorage.java similarity index 92% rename from platform/vcs-log/impl/src/com/intellij/vcs/log/VcsLogStorage.java rename to platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogStorage.java index 01011e9d9f8b..190af9492104 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/VcsLogStorage.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogStorage.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. @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.vcs.log; +package com.intellij.vcs.log.data; import com.intellij.openapi.util.Condition; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.vcs.log.CommitId; +import com.intellij.vcs.log.Hash; +import com.intellij.vcs.log.VcsRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java index e3a941d7498b..84f4b4bbf5a9 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java @@ -33,7 +33,7 @@ import com.intellij.util.containers.MultiMap; import com.intellij.vcs.log.VcsLogFilter; import com.intellij.vcs.log.VcsLogProvider; import com.intellij.vcs.log.VcsLogRefresher; -import com.intellij.vcs.log.VcsLogStorage; +import com.intellij.vcs.log.data.VcsLogStorage; import com.intellij.vcs.log.data.VcsLogData; import com.intellij.vcs.log.data.VcsLogFiltererImpl; import com.intellij.vcs.log.data.VcsLogTabsProperties;