From 7e86f8c6b89cd6033df3822e29c9e471ae4992ef Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Tue, 24 Sep 2013 16:11:51 +0400
Subject: [PATCH] Small refactoring: add NN and extract variable

---
 .../plugin/configuration/ConfigureKotlinInProjectUtils.java  | 2 +-
 .../jet/plugin/configuration/KotlinMavenConfigurator.java    | 2 +-
 .../jet/plugin/configuration/KotlinProjectConfigurator.java  | 2 +-
 .../plugin/configuration/KotlinWithGradleConfigurator.java   | 2 +-
 .../plugin/configuration/KotlinWithLibraryConfigurator.java  | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java b/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java
index 3d900a20f10..557812b2298 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java
@@ -88,7 +88,7 @@ public class ConfigureKotlinInProjectUtils {
         showConfigureKotlinNotification(project);
     }
 
-    private static void showConfigureKotlinNotification(final Project project) {
+    private static void showConfigureKotlinNotification(@NotNull final Project project) {
         Notifications.Bus.notify(
                 new Notification("Configure Kotlin",
                                  "Kotlin files found in your project.",
diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java
index 70036a0da8a..f4e2c5e5246 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java
@@ -77,7 +77,7 @@ public class KotlinMavenConfigurator implements KotlinProjectConfigurator {
     }
 
     @Override
-    public void configure(Project project) {
+    public void configure(@NotNull Project project) {
         List<Module> nonConfiguredModules = ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this);
 
         ConfigureDialogWithModulesAndVersion dialog =
diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinProjectConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinProjectConfigurator.java
index 7cd6c3ad796..64086c404b6 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinProjectConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinProjectConfigurator.java
@@ -12,7 +12,7 @@ public interface KotlinProjectConfigurator {
 
     boolean isApplicable(@NotNull Module module);
 
-    void configure(Project project);
+    void configure(@NotNull Project project);
 
     @NotNull String getPresentableText();
 
diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java
index a29386b503b..fb0aa9cf70e 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java
@@ -77,7 +77,7 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
     }
 
     @Override
-    public void configure(Project project) {
+    public void configure(@NotNull Project project) {
         List<Module> nonConfiguredModules = ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this);
 
         ConfigureDialogWithModulesAndVersion dialog =
diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java
index f9e01f3a755..6fb2b755e48 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java
@@ -211,12 +211,13 @@ public abstract class KotlinWithLibraryConfigurator implements KotlinProjectConf
 
     private static void addSourcesToLibraryIfNeeded(@NotNull Library library, @NotNull File file) {
         String[] librarySourceRoots = library.getUrls(OrderRootType.SOURCES);
+        String librarySourceRoot = VfsUtil.getUrlForLibraryRoot(file);
         for (String sourceRoot : librarySourceRoots) {
-            if (sourceRoot.equals(VfsUtil.getUrlForLibraryRoot(file))) return;
+            if (sourceRoot.equals(librarySourceRoot)) return;
         }
 
         final Library.ModifiableModel model = library.getModifiableModel();
-        model.addRoot(VfsUtil.getUrlForLibraryRoot(file), OrderRootType.SOURCES);
+        model.addRoot(librarySourceRoot, OrderRootType.SOURCES);
 
         ApplicationManager.getApplication().runWriteAction(new Runnable() {
             @Override