From 1a39f68b3bf76af38f6ebb821f0dfdbdab5a0950 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Thu, 23 Jun 2016 22:23:07 +0300 Subject: [PATCH] [vcs-log] minor: change singature so that all PersistentUtil methods had the same parameters order: storageId, logKind, version --- .../src/com/intellij/vcs/log/data/VcsLogHashMapImpl.java | 2 +- .../src/com/intellij/vcs/log/util/PersistentUtil.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogHashMapImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogHashMapImpl.java index 11150717944b..f931874b5f1e 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogHashMapImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogHashMapImpl.java @@ -96,7 +96,7 @@ public class VcsLogHashMapImpl implements Disposable, VcsLogHashMap { // cleanup old root storages, to remove after 2016.3 release PersistentUtil - .cleanupOldStorageFile(project.getName() + "." + project.getBaseDir().getPath().hashCode(), ROOT_STORAGE_KIND, ROOTS_STORAGE_VERSION); + .cleanupOldStorageFile(ROOT_STORAGE_KIND, project.getName() + "." + project.getBaseDir().getPath().hashCode(), ROOTS_STORAGE_VERSION); Disposer.register(parent, this); } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/PersistentUtil.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/PersistentUtil.java index 321605b4c639..06f859dafe45 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/PersistentUtil.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/PersistentUtil.java @@ -45,7 +45,7 @@ public class PersistentUtil { } @NotNull - private static File getStorageFile(@NotNull String logId, @NotNull String storageKind, int version) { + private static File getStorageFile(@NotNull String storageKind, @NotNull String logId, int version) { File subdir = new File(LOG_CACHE, storageKind); String safeLogId = PathUtilRt.suggestFileName(logId, true, true); final File mapFile = new File(subdir, safeLogId + "." + version); @@ -55,8 +55,8 @@ public class PersistentUtil { return mapFile; } - public static void cleanupOldStorageFile(@NotNull String logId, @NotNull String storageKind, int version) { - IOUtil.deleteAllFilesStartingWith(getStorageFile(logId, storageKind, version)); + public static void cleanupOldStorageFile(@NotNull String storageKind, @NotNull String logId, int version) { + IOUtil.deleteAllFilesStartingWith(getStorageFile(storageKind, logId, version)); } @NotNull @@ -64,7 +64,7 @@ public class PersistentUtil { @NotNull String storageKind, @NotNull String logId, int version) throws IOException { - File storageFile = getStorageFile(logId, storageKind, version); + File storageFile = getStorageFile(storageKind, logId, version); return IOUtil.openCleanOrResetBroken(() -> new PersistentEnumerator<>(storageFile, keyDescriptor, Page.PAGE_SIZE), storageFile); }