From 4bca732a79e0f4cfa4c0dfc2a416bfb4a1f06811 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 30 Jun 2016 15:08:07 +0300 Subject: [PATCH] cleanup --- .../src/com/intellij/psi/impl/PsiManagerImpl.java | 2 +- .../intellij/psi/impl/file/impl/FileManagerImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java index b681be0366fc..0e4d18c6694e 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java @@ -56,7 +56,7 @@ public class PsiManagerImpl extends PsiManagerEx { private final List myTreeChangePreprocessors = ContainerUtil.createLockFreeCopyOnWriteList(); private final List myTreeChangeListeners = ContainerUtil.createLockFreeCopyOnWriteList(); - private boolean myTreeChangeEventIsFiring = false; + private boolean myTreeChangeEventIsFiring; private boolean myIsDisposed; diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java index a83b2a670d22..5809de171274 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java @@ -61,8 +61,8 @@ public class FileManagerImpl implements FileManager { private final ConcurrentMap myVFileToPsiDirMap = ContainerUtil.createConcurrentSoftValueMap(); private final ConcurrentMap myVFileToViewProviderMap = ContainerUtil.createConcurrentWeakValueMap(); - private boolean myInitialized = false; - private boolean myDisposed = false; + private boolean myInitialized; + private boolean myDisposed; private final FileDocumentManager myFileDocumentManager; private final MessageBusConnection myConnection; @@ -113,7 +113,7 @@ public class FileManagerImpl implements FileManager { }); } - public static void clearPsiCaches(FileViewProvider provider) { + public static void clearPsiCaches(@NotNull FileViewProvider provider) { if (provider instanceof SingleRootFileViewProvider) { for (PsiFile root : ((SingleRootFileViewProvider)provider).getCachedPsiFiles()) { if (root instanceof PsiFileImpl) { @@ -322,7 +322,7 @@ public class FileManagerImpl implements FileManager { } } - private boolean myProcessingFileTypesChange = false; + private boolean myProcessingFileTypesChange; private void handleFileTypesChange(@NotNull FileTypesChanged runnable) { if (myProcessingFileTypesChange) return; myProcessingFileTypesChange = true; @@ -347,7 +347,7 @@ public class FileManagerImpl implements FileManager { @TestOnly public void checkConsistency() { - HashMap fileToViewProvider = new HashMap(myVFileToViewProviderMap); + Map fileToViewProvider = new HashMap(myVFileToViewProviderMap); myVFileToViewProviderMap.clear(); for (VirtualFile vFile : fileToViewProvider.keySet()) { final FileViewProvider fileViewProvider = fileToViewProvider.get(vFile); @@ -586,7 +586,7 @@ public class FileManagerImpl implements FileManager { return true; } - private void markInvalidations(Map originalFileToPsiFileMap) { + private void markInvalidations(@NotNull Map originalFileToPsiFileMap) { DebugUtil.startPsiModification(null); try { for (Map.Entry entry : originalFileToPsiFileMap.entrySet()) {