external system: use ExternalSystemApiUtil.isOneToOneMapping method after modules...

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
index 21e6325651a6d00fbb2b086a1189665d57ea6f41..1a60ecb643e244e65b4d77aa6a15e09de511c33e 100644 (file)
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
@@ -86,14 +86,20 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
       createModules(toCreate, modelsProvider, project);
     }
 
-    final boolean isOneToOneMapping = projectData != null && ExternalSystemApiUtil.isOneToOneMapping(project, projectData);
-
     for (DataNode<E> node : toImport) {
       Module module = node.getUserData(MODULE_KEY);
       if (module != null) {
         setModuleOptions(module, node);
+        ModifiableRootModel modifiableRootModel = modelsProvider.getModifiableRootModel(module);
+        syncPaths(module, modifiableRootModel, node.getData());
+        setLanguageLevel(modifiableRootModel, node.getData());
+      }
+    }
 
-        final ModifiableModuleModel modifiableModel = modelsProvider.getModifiableModuleModel();
+    final boolean isOneToOneMapping = projectData != null && ExternalSystemApiUtil.isOneToOneMapping(project, projectData);
+    for (DataNode<E> node : toImport) {
+      Module module = node.getUserData(MODULE_KEY);
+      if (module != null) {
         final String[] groupPath;
         if (isOneToOneMapping || projectData == null) {
           groupPath = node.getData().getIdeModuleGroup();
@@ -104,10 +110,8 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
                       ? new String[]{externalProjectGroup}
                       : ArrayUtil.prepend(externalProjectGroup, node.getData().getIdeModuleGroup());
         }
+        final ModifiableModuleModel modifiableModel = modelsProvider.getModifiableModuleModel();
         modifiableModel.setModuleGroupPath(module, groupPath);
-        ModifiableRootModel modifiableRootModel = modelsProvider.getModifiableRootModel(module);
-        syncPaths(module, modifiableRootModel, node.getData());
-        setLanguageLevel(modifiableRootModel, node.getData());
       }
     }
   }