From 2e79811f04a4d1731819f7d183550a2eda10b5fb Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 1 Sep 2014 09:57:15 +0200 Subject: [PATCH] cleanup --- .../components/impl/stores/DirectoryBasedStorage.java | 1 - .../openapi/components/impl/stores/StorageUtil.java | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java index cda453be5cd2..ca8ac1e103c4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java @@ -301,7 +301,6 @@ public class DirectoryBasedStorage implements StateStorage, Disposable { filesToSave.add(file); } } - } }); diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java index f7b64bcd2f59..2f6a3460eb7a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java @@ -57,11 +57,12 @@ import java.util.Set; * @author mike */ public class StorageUtil { - private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.components.impl.stores.StorageUtil"); + private static final Logger LOG = Logger.getInstance(StorageUtil.class); private static final boolean DUMP_COMPONENT_STATES = SystemProperties.getBooleanProperty("idea.log.externally.changed.component.states", false); @SuppressWarnings("SpellCheckingInspection") private static final SimpleDateFormat LOG_DIR_FORMAT = new SimpleDateFormat("yyyyMMdd-HHmmss"); + private static final Pair NON_EXISTENT_FILE_DATA = Pair.create(null, SystemProperties.getLineSeparator()); private StorageUtil() { } @@ -182,9 +183,10 @@ public class StorageUtil { /** * @return pair.first - file contents (null if file does not exist), pair.second - file line separators */ + @NotNull private static Pair loadFile(@Nullable final VirtualFile file) throws IOException { if (file == null || !file.exists()) { - return Pair.create(null, SystemProperties.getLineSeparator()); + return NON_EXISTENT_FILE_DATA; } byte[] bytes = file.contentsToByteArray();