From 5cc8ad16dddb483bed0ce425fcb42edb084318a8 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 12 Nov 2012 12:42:44 +0400
Subject: [PATCH] notnull

---
 .../lang-impl/src/com/intellij/find/FindSettings.java    | 9 +++++++--
 .../src/com/intellij/find/impl/FindSettingsImpl.java     | 7 ++++++-
 .../src/com/intellij/openapi/ui/DialogWrapper.java       | 4 +++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/find/FindSettings.java b/platform/lang-impl/src/com/intellij/find/FindSettings.java
index a713e971cb05..964670a45723 100644
--- a/platform/lang-impl/src/com/intellij/find/FindSettings.java
+++ b/platform/lang-impl/src/com/intellij/find/FindSettings.java
@@ -17,8 +17,9 @@
 package com.intellij.find;
 
 import com.intellij.openapi.components.ServiceManager;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
+import java.util.List;
 
 public abstract class FindSettings{
 
@@ -84,8 +85,10 @@ public abstract class FindSettings{
 
   public abstract void addDirectory(String s);
 
+  @NotNull
   public abstract String[] getRecentFindStrings();
 
+  @NotNull
   public abstract String[] getRecentReplaceStrings();
 
   /**
@@ -95,9 +98,11 @@ public abstract class FindSettings{
    * @return the recent file masks list
    * @since 5.0.2
    */
+  @NotNull
   public abstract String[] getRecentFileMasks();
 
-  public abstract ArrayList<String> getRecentDirectories();
+  @NotNull
+  public abstract List<String> getRecentDirectories();
 
   public abstract void setWithSubdirectories(boolean b);
 
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
index ff60d4497a8a..5fb74f190ac0 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
@@ -32,6 +32,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.PlatformUtils;
 import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -317,23 +318,27 @@ public class FindSettingsImpl extends FindSettings implements PersistentStateCom
     addStringToList(s, RECENT_DIR_STRINGS, MAX_RECENT_SIZE);
   }
 
+  @NotNull
   @Override
   public String[] getRecentFindStrings(){
     return ArrayUtil.toStringArray(RECENT_FIND_STRINGS);
   }
 
+  @NotNull
   @Override
   public String[] getRecentReplaceStrings(){
     return ArrayUtil.toStringArray(RECENT_REPLACE_STRINGS);
   }
 
+  @NotNull
   @Override
   public String[] getRecentFileMasks() {
     return ArrayUtil.toStringArray(RECENT_FILE_MASKS);
   }
 
+  @NotNull
   @Override
-  public ArrayList<String> getRecentDirectories(){
+  public List<String> getRecentDirectories(){
     return new ArrayList<String>(RECENT_DIR_STRINGS);
   }
 
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 020fc13489a4..448cac200e6b 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -495,7 +495,8 @@ public abstract class DialogWrapper {
     return panel;
   }
 
-  private Action[] filter(Action[] actions) {
+  @NotNull
+  private Action[] filter(@NotNull Action[] actions) {
     ArrayList<Action> answer = new ArrayList<Action>();
     for (Action action : actions) {
       if (action != null && (ApplicationInfo.contextHelpAvailable() || action != getHelpAction())) {
@@ -877,6 +878,7 @@ public abstract class DialogWrapper {
    * @see #createSouthPanel
    * @see #createJButtonForAction
    */
+  @NotNull
   protected Action[] createActions() {
     if (getHelpId() == null) {
       if (SystemInfo.isMac) {