This commit is contained in:
Vladimir Krivosheev
2015-04-21 14:19:18 +02:00
parent 95d277ff6c
commit 591969cc2b
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.roots.impl;
import com.intellij.openapi.CompositeDisposable;
@@ -100,17 +99,12 @@ public class RootModelImpl extends RootModelBase implements ModifiableRootModel
myModuleLibraryTable = new ModuleLibraryTable(this, myProjectRootManager);
final List contentChildren = element.getChildren(ContentEntryImpl.ELEMENT_NAME);
for (Object aContentChildren : contentChildren) {
Element child = (Element)aContentChildren;
ContentEntryImpl contentEntry = new ContentEntryImpl(child, this);
myContent.add(contentEntry);
for (Element child : element.getChildren(ContentEntryImpl.ELEMENT_NAME)) {
myContent.add(new ContentEntryImpl(child, this));
}
final List orderElements = element.getChildren(OrderEntryFactory.ORDER_ENTRY_ELEMENT_NAME);
boolean moduleSourceAdded = false;
for (Object orderElement : orderElements) {
Element child = (Element)orderElement;
for (Element child : element.getChildren(OrderEntryFactory.ORDER_ENTRY_ELEMENT_NAME)) {
final OrderEntry orderEntry = OrderEntryFactory.createOrderEntryByElement(child, this, myProjectRootManager);
if (orderEntry instanceof ModuleSourceOrderEntry) {
if (moduleSourceAdded) continue;