MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-03-16 12:12:46 +04:00
parent 9cb4eaa7d6
commit 458cf60915
10 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class JavaFileManagerImpl implements JavaFileManager, Disposable {
connection.subscribe(AppTopics.FILE_DOCUMENT_SYNC, new FileDocumentManagerAdapter() {
@Override
public void fileWithNoDocumentChanged(final VirtualFile file) {
public void fileWithNoDocumentChanged(@NotNull final VirtualFile file) {
clearNonRepositoryMaps();
}
});
platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec
editorFactory.getEventMulticaster().addDocumentListener(this, myProject);
bus.connect().subscribe(AppTopics.FILE_DOCUMENT_SYNC, new FileDocumentManagerAdapter() {
@Override
public void fileContentLoaded(final VirtualFile virtualFile, Document document) {
public void fileContentLoaded(@NotNull final VirtualFile virtualFile, @NotNull Document document) {
PsiFile psiFile = ApplicationManager.getApplication().runReadAction(new Computable<PsiFile>() {
@Override
public PsiFile compute() {
platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java
+2 -1
View File
@@ -38,6 +38,7 @@ import com.intellij.psi.impl.PsiTreeChangeEventImpl;
import com.intellij.psi.impl.smartPointers.SmartPointerManagerImpl;
import com.intellij.util.FileContentUtil;
import com.intellij.util.messages.MessageBusConnection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class PsiVFSListener extends VirtualFileAdapter {
@@ -623,7 +624,7 @@ public class PsiVFSListener extends VirtualFileAdapter {
private class MyFileDocumentManagerAdapter extends FileDocumentManagerAdapter {
@Override
public void fileWithNoDocumentChanged(VirtualFile file) {
public void fileWithNoDocumentChanged(@NotNull VirtualFile file) {
final PsiFile psiFile = myFileManager.getCachedPsiFileInner(file);
if (psiFile != null) {
ApplicationManager.getApplication().runWriteAction(
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
+1 -1
View File
@@ -243,7 +243,7 @@ public class FileBasedIndex implements ApplicationComponent {
connection.subscribe(AppTopics.FILE_DOCUMENT_SYNC, new FileDocumentManagerAdapter() {
@Override
public void fileContentReloaded(VirtualFile file, Document document) {
public void fileContentReloaded(VirtualFile file, @NotNull Document document) {
cleanupMemoryStorage();
}
platform/platform-api/src/com/intellij/openapi/fileEditor/FileDocumentManagerAdapter.java
+6 -5
View File
@@ -17,24 +17,25 @@ package com.intellij.openapi.fileEditor;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
public abstract class FileDocumentManagerAdapter implements FileDocumentManagerListener{
public void beforeAllDocumentsSaving() {
}
public void beforeDocumentSaving(Document document) {
public void beforeDocumentSaving(@NotNull Document document) {
}
public void fileWithNoDocumentChanged(VirtualFile file) {
public void fileWithNoDocumentChanged(@NotNull VirtualFile file) {
}
public void beforeFileContentReload(VirtualFile file, Document document) {
public void beforeFileContentReload(VirtualFile file, @NotNull Document document) {
}
public void fileContentReloaded(VirtualFile file, Document document) {
public void fileContentReloaded(VirtualFile file, @NotNull Document document) {
}
public void fileContentLoaded(VirtualFile file, Document document) {
public void fileContentLoaded(@NotNull VirtualFile file, @NotNull Document document) {
}
public void unsavedDocumentsDropped() {
platform/platform-api/src/com/intellij/openapi/fileEditor/FileDocumentManagerListener.java
+6 -5
View File
@@ -18,6 +18,7 @@ package com.intellij.openapi.fileEditor;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import java.util.EventListener;
@@ -45,16 +46,16 @@ public interface FileDocumentManagerListener extends EventListener {
/**
* NOTE: Vetoing facility is deprecated in this listener implement {@link FileDocumentSynchronizationVetoer} instead.
*/
void beforeDocumentSaving(Document document);
void beforeDocumentSaving(@NotNull Document document);
/**
* NOTE: Vetoing facility is deprecated in this listener implement {@link FileDocumentSynchronizationVetoer} instead.
*/
void beforeFileContentReload(VirtualFile file, Document document);
void beforeFileContentReload(VirtualFile file, @NotNull Document document);
void fileWithNoDocumentChanged(VirtualFile file);
void fileContentReloaded(VirtualFile file, Document document);
void fileContentLoaded(VirtualFile file, Document document);
void fileWithNoDocumentChanged(@NotNull VirtualFile file);
void fileContentReloaded(VirtualFile file, @NotNull Document document);
void fileContentLoaded(@NotNull VirtualFile file, @NotNull Document document);
void unsavedDocumentsDropped();
}
platform/platform-api/src/com/intellij/openapi/fileEditor/FileDocumentSynchronizationVetoer.java
+3 -2
View File
@@ -22,10 +22,11 @@ package com.intellij.openapi.fileEditor;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
public interface FileDocumentSynchronizationVetoer {
ExtensionPointName<FileDocumentSynchronizationVetoer> EP_NAME = ExtensionPointName.create("com.intellij.fileDocumentSynchronizationVetoer");
boolean maySaveDocument(Document document);
boolean mayReloadFileContent(VirtualFile file, Document document);
boolean maySaveDocument(@NotNull Document document);
boolean mayReloadFileContent(VirtualFile file, @NotNull Document document);
}
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
+2 -2
View File
@@ -514,7 +514,7 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Appl
}
}
private void fireFileWithNoDocumentChanged(final VirtualFile file) {
private void fireFileWithNoDocumentChanged(@NotNull VirtualFile file) {
myMultiCaster.fileWithNoDocumentChanged(file);
}
@@ -634,7 +634,7 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Appl
myMultiCaster.unsavedDocumentsDropped();
}
private boolean fireBeforeFileContentReload(final VirtualFile file, final Document document) {
private boolean fireBeforeFileContentReload(final VirtualFile file, @NotNull Document document) {
for (FileDocumentSynchronizationVetoer vetoer : Extensions.getExtensions(FileDocumentSynchronizationVetoer.EP_NAME)) {
try {
if (!vetoer.mayReloadFileContent(file, document)) {
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/TrailingSpacesStripper.java
+1 -1
View File
@@ -52,7 +52,7 @@ public final class TrailingSpacesStripper extends FileDocumentManagerAdapter {
}
@Override
public void beforeDocumentSaving(Document document) {
public void beforeDocumentSaving(@NotNull Document document) {
strip(document);
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SaveCommittingDocumentsVetoer.java
+3 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.fileEditor.FileDocumentSynchronizationVetoer;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.changes.ui.CommitHelper;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
@@ -33,7 +34,7 @@ public class SaveCommittingDocumentsVetoer implements FileDocumentSynchronizatio
myAdapter = adapter;
}
public boolean maySaveDocument(Document document) {
public boolean maySaveDocument(@NotNull Document document) {
final Object beingCommitted = document.getUserData(CommitHelper.DOCUMENT_BEING_COMMITTED_KEY);
if (beingCommitted == VetoSavingCommittingDocumentsAdapter.SAVE_DENIED) {
return false;
@@ -47,7 +48,7 @@ public class SaveCommittingDocumentsVetoer implements FileDocumentSynchronizatio
return true;
}
public boolean mayReloadFileContent(VirtualFile file, Document document) {
public boolean mayReloadFileContent(VirtualFile file, @NotNull Document document) {
return true;
}
}