From 75ca104cb9801424d058b051a1e5a541709cd44c Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 20 Feb 2014 19:57:01 +0400
Subject: [PATCH] notnull

---
 .../intellij/ide/projectView/impl/nodes/PackageElement.java  | 3 ++-
 .../src/com/intellij/ide/projectView/ProjectViewNode.java    | 5 +++--
 .../src/com/intellij/ide/projectView/RootsProvider.java      | 4 +++-
 .../ide/projectView/impl/nodes/AbstractModuleNode.java       | 3 ++-
 .../intellij/ide/projectView/impl/nodes/ModuleGroupNode.java | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
index 3e92bdafbbab..ee64a3186f0e 100644
--- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
+++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.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.
@@ -58,6 +58,7 @@ public final class PackageElement implements Queryable, RootsProvider {
     return myElement;
   }
 
+  @NotNull
   @Override
   public Collection<VirtualFile> getRoots() {
     Set<VirtualFile> roots= new HashSet<VirtualFile>();
diff --git a/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java b/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java
index 5b72e74bcb09..eabf799ba1bd 100644
--- a/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java
+++ b/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.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.
@@ -108,7 +108,7 @@ public abstract class ProjectViewNode <Value> extends AbstractTreeNode<Value> im
                                                 Object value,
                                                 ViewSettings settings) throws
                                                                        InstantiationException {
-    Object[] parameters = new Object[]{project, value, settings};
+    Object[] parameters = {project, value, settings};
     for (Constructor<? extends AbstractTreeNode> constructor : (Constructor<? extends AbstractTreeNode>[])nodeClass.getConstructors()) {
       if (constructor.getParameterTypes().length != 3) continue;
       try {
@@ -164,6 +164,7 @@ public abstract class ProjectViewNode <Value> extends AbstractTreeNode<Value> im
     return false;
   }
 
+  @NotNull
   @Override
   public Collection<VirtualFile> getRoots() {
     Value value = getValue();
diff --git a/platform/lang-api/src/com/intellij/ide/projectView/RootsProvider.java b/platform/lang-api/src/com/intellij/ide/projectView/RootsProvider.java
index 6a7ca09059c4..2f341936fb3d 100644
--- a/platform/lang-api/src/com/intellij/ide/projectView/RootsProvider.java
+++ b/platform/lang-api/src/com/intellij/ide/projectView/RootsProvider.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.
@@ -17,6 +17,7 @@ package com.intellij.ide.projectView;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.HashSet;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.Set;
@@ -25,6 +26,7 @@ public interface RootsProvider {
 
   Set<VirtualFile> EMPTY_ROOTS = new HashSet<VirtualFile>();
 
+  @NotNull
   Collection<VirtualFile> getRoots();
 
 }
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java
index 3ef138d82542..58591a139949 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.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.
@@ -62,6 +62,7 @@ public abstract class AbstractModuleNode extends ProjectViewNode<Module> impleme
     return "Module";
   }
 
+  @NotNull
   @Override
   public Collection<VirtualFile> getRoots() {
     return Arrays.asList(ModuleRootManager.getInstance(getValue()).getContentRoots());
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ModuleGroupNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ModuleGroupNode.java
index 1c3dca9dbb3a..621dd67af1e2 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ModuleGroupNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ModuleGroupNode.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.
@@ -70,6 +70,7 @@ public abstract class ModuleGroupNode extends ProjectViewNode<ModuleGroup> imple
     return result;
   }
 
+  @NotNull
   @Override
   public Collection<VirtualFile> getRoots() {
     Collection<AbstractTreeNode> children = getChildren();