From a26aa57fbee1b53b8a051a2da24de393c41f2ac1 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 24 May 2012 14:48:27 +0400
Subject: [PATCH] cleanup

---
 .../intellij/openapi/roots/impl/ModifiableModelCommitter.java | 3 +--
 .../src/com/intellij/openapi/roots/impl/SourceFolderImpl.java | 4 +++-
 .../intellij/openapi/roots/impl/libraries/JarDirectories.java | 4 ++--
 .../maven/importing/MavenDefaultModifiableModelsProvider.java | 3 +++
 .../jetbrains/idea/maven/importing/MavenRootModelAdapter.java | 3 +--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModifiableModelCommitter.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModifiableModelCommitter.java
index 1ba173dfe919..9d0d766d6b9a 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModifiableModelCommitter.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModifiableModelCommitter.java
@@ -34,8 +34,7 @@ import java.util.*;
 public class ModifiableModelCommitter {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.module.impl.ModifiableModelCommitter");
 
-  public static void multiCommit(ModifiableRootModel[] rootModels,
-                          ModifiableModuleModel moduleModel) {
+  public static void multiCommit(ModifiableRootModel[] rootModels, ModifiableModuleModel moduleModel) {
     ApplicationManager.getApplication().assertWriteAccessAllowed();
 
     final List<RootModelImpl> modelsToCommit = getSortedChangedModels(rootModels, moduleModel);
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/SourceFolderImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/SourceFolderImpl.java
index 049e7048b875..824a71d36ab4 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/SourceFolderImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/SourceFolderImpl.java
@@ -100,7 +100,9 @@ public class SourceFolderImpl extends ContentFolderBaseImpl implements SourceFol
 
   @Override
   public ContentFolder cloneFolder(ContentEntry contentEntry) {
-    return new SourceFolderImpl(this, (ContentEntryImpl) contentEntry);
+    assert !((ContentEntryImpl)contentEntry).isDisposed() : "target entry already disposed: " + contentEntry;
+    assert !isDisposed() : "Already disposed: " + this;
+    return new SourceFolderImpl(this, (ContentEntryImpl)contentEntry);
   }
 
   @Override
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java
index e52129a9915b..b9334dd6685f 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java
@@ -33,8 +33,8 @@ import java.util.List;
  * @author nik
  */
 public class JarDirectories implements JDOMExternalizable {
-  private MultiMap<OrderRootType, String> myDirectories = new MultiMap<OrderRootType, String>();
-  private MultiMap<OrderRootType, String> myRecursivelyIncluded = new MultiMap<OrderRootType, String>();
+  private final MultiMap<OrderRootType, String> myDirectories = new MultiMap<OrderRootType, String>();
+  private final MultiMap<OrderRootType, String> myRecursivelyIncluded = new MultiMap<OrderRootType, String>();
 
   @NonNls private static final String JAR_DIRECTORY_ELEMENT = "jarDirectory";
   @NonNls private static final String URL_ATTR = "url";
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java
index f9af5a08c854..81ddd7cbdc2b 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java
@@ -118,6 +118,9 @@ public class MavenDefaultModifiableModelsProvider extends MavenBaseModifiableMod
             Collection<ModifiableRootModel> rootModels = myRootModels.values();
 
             ModifiableRootModel[] rootModels1 = rootModels.toArray(new ModifiableRootModel[rootModels.size()]);
+            for (ModifiableRootModel model : rootModels1) {
+              assert !model.isDisposed() : "Already disposed: " + model;
+            }
             ModifiableModelCommitter.multiCommit(rootModels1, myModuleModel);
 
             for (ModifiableFacetModel each : myFacetModels.values()) {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
index adee4cf84848..be944b5ff8fd 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
@@ -114,8 +114,7 @@ public class MavenRootModelAdapter {
     Url url = toUrl(path);
     ContentEntry e = getContentRootFor(url);
     if (e == null) return;
-    unregisterAll(path, true, true
-    );
+    unregisterAll(path, true, true);
     unregisterAll(path, false, true);
     e.addSourceFolder(url.getUrl(), testSource);
   }