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:
Dmitry Jemerov
2011-04-06 16:38:52 +02:00
parent 03fa1bc66b
commit a7d7d5bd95
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ide/highlighter/HighlighterFactory.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
public class HighlighterFactory {
private HighlighterFactory() {}
@@ -50,7 +51,7 @@ public class HighlighterFactory {
return EditorHighlighterFactory.getInstance().createEditorHighlighter(fileType, settings, project);
}
public static EditorHighlighter createHighlighter(VirtualFile vFile, EditorColorsScheme settings, Project project) {
public static EditorHighlighter createHighlighter(@NotNull VirtualFile vFile, EditorColorsScheme settings, Project project) {
return EditorHighlighterFactory.getInstance().createEditorHighlighter(vFile, settings, project);
}
}
platform/platform-api/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactory.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
/**
* @author yole
@@ -37,7 +38,7 @@ public abstract class EditorHighlighterFactory {
public abstract EditorHighlighter createEditorHighlighter(final Project project, final FileType fileType);
public abstract EditorHighlighter createEditorHighlighter(final VirtualFile file, final EditorColorsScheme globalScheme, final Project project);
public abstract EditorHighlighter createEditorHighlighter(@NotNull final VirtualFile file, final EditorColorsScheme globalScheme, final Project project);
public abstract EditorHighlighter createEditorHighlighter(final Project project, final VirtualFile file);
platform/platform-impl/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
+2 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.LanguageSubstitutors;
import com.intellij.testFramework.LightVirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -49,7 +50,7 @@ public class EditorHighlighterFactoryImpl extends EditorHighlighterFactory {
return createEditorHighlighter(fileType, EditorColorsManager.getInstance().getGlobalScheme(), project);
}
public EditorHighlighter createEditorHighlighter(final VirtualFile vFile, final EditorColorsScheme settings, final Project project) {
public EditorHighlighter createEditorHighlighter(@NotNull final VirtualFile vFile, final EditorColorsScheme settings, final Project project) {
final FileType fileType = vFile.getFileType();
if (fileType instanceof LanguageFileType) {
LanguageFileType substFileType = substituteFileType(((LanguageFileType)fileType).getLanguage(), vFile, project);