From 8248670085eba04064d0fba0672addef9038c17e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 25 Feb 2014 13:30:04 +0400 Subject: [PATCH] notnull --- .../src/com/intellij/psi/PsiManager.java | 4 +-- .../com/intellij/psi/impl/PsiManagerImpl.java | 28 +++++++++---------- .../psi/impl/file/impl/FileManagerImpl.java | 23 ++++++++------- .../src/com/intellij/mock/MockPsiManager.java | 4 +-- 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/platform/core-api/src/com/intellij/psi/PsiManager.java b/platform/core-api/src/com/intellij/psi/PsiManager.java index 2ed2c9c1e8ab..0df4b80daf25 100644 --- a/platform/core-api/src/com/intellij/psi/PsiManager.java +++ b/platform/core-api/src/com/intellij/psi/PsiManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -100,7 +100,7 @@ public abstract class PsiManager extends UserDataHolderBase { * @param listener the listener instance. * @param parentDisposable object, after whose disposing the listener should be removed */ - public abstract void addPsiTreeChangeListener(@NotNull PsiTreeChangeListener listener, Disposable parentDisposable); + public abstract void addPsiTreeChangeListener(@NotNull PsiTreeChangeListener listener, @NotNull Disposable parentDisposable); /** * Removes a listener for receiving notifications about all changes in the PSI tree of the project. 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 09a046c04729..a25c3d52eddf 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -143,7 +143,7 @@ public class PsiManagerImpl extends PsiManagerEx { } @TestOnly - public void setAssertOnFileLoadingFilter(@NotNull VirtualFileFilter filter, Disposable parentDisposable) { + public void setAssertOnFileLoadingFilter(@NotNull VirtualFileFilter filter, @NotNull Disposable parentDisposable) { // Find something to ensure there's no changed files waiting to be processed in repository indices. myAssertOnFileLoadingFilter = filter; Disposer.register(parentDisposable, new Disposable() { @@ -237,7 +237,7 @@ public class PsiManagerImpl extends PsiManagerEx { } @Override - public void addPsiTreeChangeListener(@NotNull final PsiTreeChangeListener listener, Disposable parentDisposable) { + public void addPsiTreeChangeListener(@NotNull final PsiTreeChangeListener listener, @NotNull Disposable parentDisposable) { addPsiTreeChangeListener(listener); Disposer.register(parentDisposable, new Disposable() { @Override @@ -290,7 +290,7 @@ public class PsiManagerImpl extends PsiManagerEx { fireEvent(event); } - public void beforeChildrenChange(PsiTreeChangeEventImpl event) { + public void beforeChildrenChange(@NotNull PsiTreeChangeEventImpl event) { beforeChange(true); event.setCode(PsiTreeChangeEventImpl.PsiEventType.BEFORE_CHILDREN_CHANGE); if (LOG.isDebugEnabled()) { @@ -299,7 +299,7 @@ public class PsiManagerImpl extends PsiManagerEx { fireEvent(event); } - public void beforeChildMovement(PsiTreeChangeEventImpl event) { + public void beforeChildMovement(@NotNull PsiTreeChangeEventImpl event) { beforeChange(true); event.setCode(PsiTreeChangeEventImpl.PsiEventType.BEFORE_CHILD_MOVEMENT); if (LOG.isDebugEnabled()) { @@ -312,7 +312,7 @@ public class PsiManagerImpl extends PsiManagerEx { fireEvent(event); } - public void beforePropertyChange(PsiTreeChangeEventImpl event) { + public void beforePropertyChange(@NotNull PsiTreeChangeEventImpl event) { beforeChange(true); event.setCode(PsiTreeChangeEventImpl.PsiEventType.BEFORE_PROPERTY_CHANGE); if (LOG.isDebugEnabled()) { @@ -325,7 +325,7 @@ public class PsiManagerImpl extends PsiManagerEx { fireEvent(event); } - public void childAdded(PsiTreeChangeEventImpl event) { + public void childAdded(@NotNull PsiTreeChangeEventImpl event) { event.setCode(PsiTreeChangeEventImpl.PsiEventType.CHILD_ADDED); if (LOG.isDebugEnabled()) { LOG.debug( @@ -337,7 +337,7 @@ public class PsiManagerImpl extends PsiManagerEx { afterChange(true); } - public void childRemoved(PsiTreeChangeEventImpl event) { + public void childRemoved(@NotNull PsiTreeChangeEventImpl event) { event.setCode(PsiTreeChangeEventImpl.PsiEventType.CHILD_REMOVED); if (LOG.isDebugEnabled()) { LOG.debug( @@ -348,7 +348,7 @@ public class PsiManagerImpl extends PsiManagerEx { afterChange(true); } - public void childReplaced(PsiTreeChangeEventImpl event) { + public void childReplaced(@NotNull PsiTreeChangeEventImpl event) { event.setCode(PsiTreeChangeEventImpl.PsiEventType.CHILD_REPLACED); if (LOG.isDebugEnabled()) { LOG.debug( @@ -361,7 +361,7 @@ public class PsiManagerImpl extends PsiManagerEx { afterChange(true); } - public void childMoved(PsiTreeChangeEventImpl event) { + public void childMoved(@NotNull PsiTreeChangeEventImpl event) { event.setCode(PsiTreeChangeEventImpl.PsiEventType.CHILD_MOVED); if (LOG.isDebugEnabled()) { LOG.debug( @@ -374,7 +374,7 @@ public class PsiManagerImpl extends PsiManagerEx { afterChange(true); } - public void childrenChanged(PsiTreeChangeEventImpl event) { + public void childrenChanged(@NotNull PsiTreeChangeEventImpl event) { event.setCode(PsiTreeChangeEventImpl.PsiEventType.CHILDREN_CHANGED); if (LOG.isDebugEnabled()) { LOG.debug( @@ -385,7 +385,7 @@ public class PsiManagerImpl extends PsiManagerEx { afterChange(true); } - public void propertyChanged(PsiTreeChangeEventImpl event) { + public void propertyChanged(@NotNull PsiTreeChangeEventImpl event) { event.setCode(PsiTreeChangeEventImpl.PsiEventType.PROPERTY_CHANGED); if (LOG.isDebugEnabled()) { LOG.debug( @@ -399,11 +399,11 @@ public class PsiManagerImpl extends PsiManagerEx { afterChange(true); } - public void addTreeChangePreprocessor(PsiTreeChangePreprocessor preprocessor) { + public void addTreeChangePreprocessor(@NotNull PsiTreeChangePreprocessor preprocessor) { myTreeChangePreprocessors.add(preprocessor); } - private void fireEvent(PsiTreeChangeEventImpl event) { + private void fireEvent(@NotNull PsiTreeChangeEventImpl event) { boolean isRealTreeChange = event.getCode() != PsiTreeChangeEventImpl.PsiEventType.PROPERTY_CHANGED && event.getCode() != PsiTreeChangeEventImpl.PsiEventType.BEFORE_PROPERTY_CHANGE; 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 60b19f3d76fa..e1a390b8d9f3 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 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -106,6 +106,7 @@ public class FileManagerImpl implements FileManager { } @TestOnly + @NotNull public ConcurrentMap getVFileToViewProviderMap() { return myVFileToViewProviderMap; } @@ -169,7 +170,7 @@ public class FileManagerImpl implements FileManager { } @Nullable - private FileViewProvider getFromInjected(VirtualFile file) { + private FileViewProvider getFromInjected(@NotNull VirtualFile file) { if (file instanceof VirtualFileWindow) { DocumentWindow document = ((VirtualFileWindow)file).getDocumentWindow(); PsiFile psiFile = PsiDocumentManager.getInstance(myManager.getProject()).getCachedPsiFile(document); @@ -204,7 +205,7 @@ public class FileManagerImpl implements FileManager { } @Nullable - private Language getLanguage(final VirtualFile file) { + private Language getLanguage(@NotNull VirtualFile file) { final FileType fileType = file.getFileType(); Project project = myManager.getProject(); if (fileType instanceof LanguageFileType) { @@ -252,14 +253,12 @@ public class FileManagerImpl implements FileManager { updateMaps(); - event = new PsiTreeChangeEventImpl(myManager); - event.setPropertyName(PsiTreeChangeEvent.PROP_FILE_TYPES); myManager.propertyChanged(event); } } private boolean myProcessingFileTypesChange = false; - private void handleFileTypesChange(final FileTypesChanged runnable) { + private void handleFileTypesChange(@NotNull FileTypesChanged runnable) { if (myProcessingFileTypesChange) return; myProcessingFileTypesChange = true; try { @@ -366,7 +365,7 @@ public class FileManagerImpl implements FileManager { } @Nullable - private PsiDirectory findDirectoryImpl(final VirtualFile vFile) { + private PsiDirectory findDirectoryImpl(@NotNull VirtualFile vFile) { PsiDirectory psiDir = myVFileToPsiDirMap.get(vFile); if (psiDir != null) return psiDir; @@ -381,11 +380,11 @@ public class FileManagerImpl implements FileManager { return ConcurrencyUtil.cacheOrGet(myVFileToPsiDirMap, vFile, psiDir); } - PsiDirectory getCachedDirectory(VirtualFile vFile) { + PsiDirectory getCachedDirectory(@NotNull VirtualFile vFile) { return myVFileToPsiDirMap.get(vFile); } - void cacheViewProvider(@NotNull VirtualFile vFile, FileViewProvider viewProvider) { + void cacheViewProvider(@NotNull VirtualFile vFile, @Nullable FileViewProvider viewProvider) { if (viewProvider == null) { removeCachedViewProvider(vFile); } @@ -398,7 +397,7 @@ public class FileManagerImpl implements FileManager { myVFileToViewProviderMap.remove(vFile); } - void removeFilesAndDirsRecursively(VirtualFile vFile) { + void removeFilesAndDirsRecursively(@NotNull VirtualFile vFile) { VfsUtilCore.visitChildrenRecursively(vFile, new VirtualFileVisitor() { @Override public boolean visitFile(@NotNull VirtualFile file) { @@ -414,7 +413,7 @@ public class FileManagerImpl implements FileManager { } @Nullable - PsiFile getCachedPsiFileInner(VirtualFile file) { + PsiFile getCachedPsiFileInner(@NotNull VirtualFile file) { final FileViewProvider fileViewProvider = myVFileToViewProviderMap.get(file); return fileViewProvider instanceof SingleRootFileViewProvider ? ((SingleRootFileViewProvider)fileViewProvider).getCachedPsi(fileViewProvider.getBaseLanguage()) : null; @@ -497,7 +496,7 @@ public class FileManagerImpl implements FileManager { reloadFromDisk(file, false); } - void reloadFromDisk(PsiFile file, boolean ignoreDocument) { + void reloadFromDisk(@NotNull PsiFile file, boolean ignoreDocument) { VirtualFile vFile = file.getVirtualFile(); assert vFile != null; diff --git a/platform/lang-impl/src/com/intellij/mock/MockPsiManager.java b/platform/lang-impl/src/com/intellij/mock/MockPsiManager.java index b69a8d389ad0..c1572ccb7941 100644 --- a/platform/lang-impl/src/com/intellij/mock/MockPsiManager.java +++ b/platform/lang-impl/src/com/intellij/mock/MockPsiManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -84,7 +84,7 @@ public class MockPsiManager extends PsiManagerEx { } @Override - public void addPsiTreeChangeListener(@NotNull PsiTreeChangeListener listener, Disposable parentDisposable) { + public void addPsiTreeChangeListener(@NotNull PsiTreeChangeListener listener, @NotNull Disposable parentDisposable) { } @Override