cleanup

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);

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

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";

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()) {

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);
   }