summaryrefslogtreecommitdiff
path: root/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl
diff options
context:
space:
mode:
Diffstat (limited to 'platform/lang-impl/src/com/intellij/openapi/fileEditor/impl')
-rw-r--r--platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java7
-rw-r--r--platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java14
2 files changed, 11 insertions, 10 deletions
diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java
index 7713734d07de..eaed20f2960d 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java
@@ -102,8 +102,9 @@ public class PsiAwareFileEditorManagerImpl extends FileEditorManagerImpl {
return myProblemSolver.isProblemFile(file);
}
+ @NotNull
@Override
- public String getFileTooltipText(final VirtualFile file) {
+ public String getFileTooltipText(@NotNull final VirtualFile file) {
final StringBuilder tooltipText = new StringBuilder();
final Module module = ModuleUtilCore.findModuleForFile(file, getProject());
if (module != null) {
@@ -116,7 +117,7 @@ public class PsiAwareFileEditorManagerImpl extends FileEditorManagerImpl {
}
@Override
- protected Editor getOpenedEditor(final Editor editor, final boolean focusEditor) {
+ protected Editor getOpenedEditor(@NotNull final Editor editor, final boolean focusEditor) {
PsiDocumentManager documentManager = PsiDocumentManager.getInstance(getProject());
Document document = editor.getDocument();
PsiFile psiFile = documentManager.getPsiFile(document);
@@ -200,7 +201,7 @@ public class PsiAwareFileEditorManagerImpl extends FileEditorManagerImpl {
updateFile(file);
}
- private void updateFile(final VirtualFile file) {
+ private void updateFile(@NotNull VirtualFile file) {
queueUpdateFile(file);
}
}
diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java
index 79ac777a6fd8..958daee0098a 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java
@@ -38,6 +38,7 @@ import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.testFramework.LightVirtualFile;
+import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.HashMap;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
@@ -195,7 +196,7 @@ public class TestEditorManagerImpl extends FileEditorManagerEx implements Applic
return openTextEditor(descriptor, false);
}
- private FileEditorProvider getProvider(FileEditor editor) {
+ private static FileEditorProvider getProvider(FileEditor editor) {
return new FileEditorProvider() {
@Override
public boolean accept(@NotNull Project project, @NotNull VirtualFile file) {
@@ -205,18 +206,17 @@ public class TestEditorManagerImpl extends FileEditorManagerEx implements Applic
@Override
@NotNull
public FileEditor createEditor(@NotNull Project project, @NotNull VirtualFile file) {
- return null;
+ throw new IncorrectOperationException();
}
@Override
public void disposeEditor(@NotNull FileEditor editor) {
- //Disposer.dispose(editor);
}
@Override
@NotNull
public FileEditorState readState(@NotNull Element sourceElement, @NotNull Project project, @NotNull VirtualFile file) {
- return null;
+ throw new IncorrectOperationException();
}
@Override
@@ -233,7 +233,7 @@ public class TestEditorManagerImpl extends FileEditorManagerEx implements Applic
@Override
@NotNull
public FileEditorPolicy getPolicy() {
- return null;
+ throw new IncorrectOperationException();
}
};
}
@@ -482,7 +482,7 @@ public class TestEditorManagerImpl extends FileEditorManagerEx implements Applic
@NotNull
@Override
public EditorsSplitters getSplitters() {
- return null;
+ throw new IncorrectOperationException();
}
@NotNull
@@ -492,6 +492,6 @@ public class TestEditorManagerImpl extends FileEditorManagerEx implements Applic
}
@Override
- public void setSelectedEditor(@NotNull VirtualFile file, String fileEditorProviderId) {
+ public void setSelectedEditor(@NotNull VirtualFile file, @NotNull String fileEditorProviderId) {
}
}