From 8cb40bfdac217ad278237a81d26f4bec81703d3f Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 30 Aug 2013 12:22:17 +0400 Subject: [PATCH] notnullified --- .../service/project/ModuleAwareContentRoot.java | 8 ++++++++ .../src/com/intellij/openapi/roots/ContentEntry.java | 8 ++++++++ .../src/com/intellij/openapi/roots/ModuleRootModel.java | 1 + .../intellij/openapi/roots/impl/ContentEntryImpl.java | 9 ++++++++- .../openapi/roots/impl/ModuleRootManagerImpl.java | 1 + .../com/intellij/openapi/roots/impl/RootModelBase.java | 1 + .../model/impl/module/content/JpsContentEntry.java | 8 ++++++++ 7 files changed, 35 insertions(+), 1 deletion(-) diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/ModuleAwareContentRoot.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/ModuleAwareContentRoot.java index 0eefad4bf3ec..c82ec18e9596 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/ModuleAwareContentRoot.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/ModuleAwareContentRoot.java @@ -40,11 +40,13 @@ public class ModuleAwareContentRoot implements ContentEntry { return myModule; } + @NotNull @Override public List getSourceFolders(@NotNull JpsModuleSourceRootType rootType) { return myDelegate.getSourceFolders(rootType); } + @NotNull @Override public List getSourceFolders(@NotNull Set> rootTypes) { return myDelegate.getSourceFolders(rootTypes); @@ -68,26 +70,31 @@ public class ModuleAwareContentRoot implements ContentEntry { return myDelegate.getSourceFolders(); } + @NotNull @Override public VirtualFile[] getSourceFolderFiles() { return myDelegate.getSourceFolderFiles(); } + @NotNull @Override public ExcludeFolder[] getExcludeFolders() { return myDelegate.getExcludeFolders(); } + @NotNull @Override public VirtualFile[] getExcludeFolderFiles() { return myDelegate.getExcludeFolderFiles(); } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull VirtualFile file, boolean isTestSource) { return myDelegate.addSourceFolder(file, isTestSource); } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull VirtualFile file, boolean isTestSource, @NotNull String packagePrefix) { return myDelegate.addSourceFolder(file, isTestSource, packagePrefix); @@ -101,6 +108,7 @@ public class ModuleAwareContentRoot implements ContentEntry { return myDelegate.addSourceFolder(file, type, properties); } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull String url, boolean isTestSource) { return myDelegate.addSourceFolder(url, isTestSource); diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ContentEntry.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ContentEntry.java index 36b2840c570a..360de6639897 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ContentEntry.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ContentEntry.java @@ -64,6 +64,7 @@ public interface ContentEntry extends Synthetic { * @param rootType type of accepted source roots * @return list of source roots of the specified type containing in this content root */ + @NotNull List getSourceFolders(@NotNull JpsModuleSourceRootType rootType); /** @@ -71,6 +72,7 @@ public interface ContentEntry extends Synthetic { * @param rootTypes types of accepted source roots * @return list of source roots of the specified types containing in this content root */ + @NotNull List getSourceFolders(@NotNull Set> rootTypes); /** @@ -78,6 +80,7 @@ public interface ContentEntry extends Synthetic { * * @return list of all valid source roots. */ + @NotNull VirtualFile[] getSourceFolderFiles(); /** @@ -85,6 +88,7 @@ public interface ContentEntry extends Synthetic { * * @return list of this ContentEntry {@link com.intellij.openapi.roots.ExcludeFolder}s */ + @NotNull ExcludeFolder[] getExcludeFolders(); /** @@ -92,6 +96,7 @@ public interface ContentEntry extends Synthetic { * * @return list of all valid exclude roots. */ + @NotNull VirtualFile[] getExcludeFolderFiles(); /** @@ -101,6 +106,7 @@ public interface ContentEntry extends Synthetic { * @param isTestSource true if the directory is added as a test source root. * @return the object representing the added root. */ + @NotNull SourceFolder addSourceFolder(@NotNull VirtualFile file, boolean isTestSource); /** @@ -112,6 +118,7 @@ public interface ContentEntry extends Synthetic { * package prefix is required. * @return the object representing the added root. */ + @NotNull SourceFolder addSourceFolder(@NotNull VirtualFile file, boolean isTestSource, @NotNull String packagePrefix); @NotNull @@ -125,6 +132,7 @@ public interface ContentEntry extends Synthetic { * @param isTestSource true if the directory is added as a test source root. * @return the object representing the added root. */ + @NotNull SourceFolder addSourceFolder(@NotNull String url, boolean isTestSource); /** diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootModel.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootModel.java index ff180ec4336a..bcbe8319cf9f 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootModel.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootModel.java @@ -47,6 +47,7 @@ public interface ModuleRootModel { * @return list of content entries for this module * @see ContentEntry */ + @NotNull ContentEntry[] getContentEntries(); /** diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java index 057c43af42ea..0197e1d5349a 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java @@ -113,11 +113,13 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE return mySourceFolders.toArray(new SourceFolder[mySourceFolders.size()]); } + @NotNull @Override public List getSourceFolders(@NotNull JpsModuleSourceRootType rootType) { return getSourceFolders(Collections.singleton(rootType)); } + @NotNull @Override public List getSourceFolders(@NotNull Set> rootTypes) { SmartList folders = new SmartList(); @@ -144,6 +146,7 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE return VfsUtilCore.toVirtualFileArray(result); } + @NotNull @Override public ExcludeFolder[] getExcludeFolders() { //assert !isDisposed(); @@ -181,11 +184,13 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE return VfsUtilCore.toVirtualFileArray(result); } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull VirtualFile file, boolean isTestSource) { return addSourceFolder(file, isTestSource, SourceFolderImpl.DEFAULT_PACKAGE_PREFIX); } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull VirtualFile file, boolean isTestSource, @NotNull String packagePrefix) { JavaSourceRootType type = isTestSource ? JavaSourceRootType.TEST_SOURCE : JavaSourceRootType.SOURCE; @@ -201,6 +206,7 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE return addSourceFolder(new SourceFolderImpl(file, JpsElementFactory.getInstance().createModuleSourceRoot(file.getUrl(), type, properties), this)); } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull String url, boolean isTestSource) { assertFolderUnderMe(url); @@ -209,7 +215,8 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE return addSourceFolder(new SourceFolderImpl(JpsElementFactory.getInstance().createModuleSourceRoot(url, type, properties), this)); } - private SourceFolder addSourceFolder(SourceFolderImpl f) { + @NotNull + private SourceFolder addSourceFolder(@NotNull SourceFolderImpl f) { mySourceFolders.add(f); Disposer.register(this, f); //rewire source folder dispose parent from rootmodel to this content root return f; diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java index 2690cd95ce14..3d3b285ea32d 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java @@ -150,6 +150,7 @@ public class ModuleRootManagerImpl extends ModuleRootManager implements ModuleCo return myRootModel; } + @NotNull @Override public ContentEntry[] getContentEntries() { return myRootModel.getContentEntries(); diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelBase.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelBase.java index 82dd0bff7e03..e74a1bb9c420 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelBase.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelBase.java @@ -153,6 +153,7 @@ public abstract class RootModelBase implements ModuleRootModel { return result; } + @NotNull @Override public ContentEntry[] getContentEntries() { final Collection content = getContent(); diff --git a/platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsContentEntry.java b/platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsContentEntry.java index eea605f7c902..44e5ee552a96 100644 --- a/platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsContentEntry.java +++ b/platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsContentEntry.java @@ -92,11 +92,13 @@ public class JpsContentEntry implements ContentEntry, Disposable { return mySourceFolders.toArray(new SourceFolder[mySourceFolders.size()]); } + @NotNull @Override public List getSourceFolders(@NotNull JpsModuleSourceRootType rootType) { return getSourceFolders(Collections.singleton(rootType)); } + @NotNull @Override public List getSourceFolders(@NotNull Set> rootTypes) { List folders = new SmartList(); @@ -108,6 +110,7 @@ public class JpsContentEntry implements ContentEntry, Disposable { return folders; } + @NotNull @Override public VirtualFile[] getSourceFolderFiles() { return getFiles(getSourceFolders()); @@ -124,6 +127,7 @@ public class JpsContentEntry implements ContentEntry, Disposable { return VfsUtilCore.toVirtualFileArray(result); } + @NotNull @Override public ExcludeFolder[] getExcludeFolders() { final ArrayList result = new ArrayList(myExcludeFolders); @@ -149,16 +153,19 @@ public class JpsContentEntry implements ContentEntry, Disposable { } } + @NotNull @Override public VirtualFile[] getExcludeFolderFiles() { return getFiles(getExcludeFolders()); } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull VirtualFile file, boolean isTestSource) { return addSourceFolder(file, isTestSource, ""); } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull VirtualFile file, boolean isTestSource, @NotNull String packagePrefix) { return addSourceFolder(file.getUrl(), isTestSource, packagePrefix); @@ -184,6 +191,7 @@ public class JpsContentEntry implements ContentEntry, Disposable { return sourceFolder; } + @NotNull @Override public SourceFolder addSourceFolder(@NotNull String url, boolean isTestSource) { return addSourceFolder(url, isTestSource, "");