MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Vladimir.Orlov
2017-05-02 11:46:12 +03:00
parent f50b20da7c f0b09dd85e
commit 8b10ca2dc0
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/dependencies/buildSrc/buildSrc.iml
+9 -9
View File
@@ -23,6 +23,15 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="Gradle: groovy-all-2.4.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14-all/t7wfomcrmv8dmyii9c9waem8/gradle-2.14/lib/groovy-all-2.4.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="Gradle: gradle-installation-beacon-2.14">
<CLASSES>
@@ -34,14 +43,5 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="Gradle: groovy-all-2.4.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14-all/t7wfomcrmv8dmyii9c9waem8/gradle-2.14/lib/groovy-all-2.4.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
+4 -6
View File
@@ -79,7 +79,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
return;
}
final Collection<DataNode<E>> toCreate = filterExistingModules(toImport, modelsProvider, project);
final Collection<DataNode<E>> toCreate = filterExistingModules(toImport, modelsProvider);
if (!toCreate.isEmpty()) {
createModules(toCreate, modelsProvider, project);
}
@@ -145,8 +145,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
@NotNull
private Collection<DataNode<E>> filterExistingModules(@NotNull Collection<DataNode<E>> modules,
@NotNull IdeModifiableModelsProvider modelsProvider,
@NotNull Project project) {
@NotNull IdeModifiableModelsProvider modelsProvider) {
Collection<DataNode<E>> result = ContainerUtilRt.newArrayList();
for (DataNode<E> node : modules) {
ModuleData moduleData = node.getData();
@@ -257,7 +256,6 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
init();
}
@Nullable
@Override
protected JComponent createCenterPanel() {
return new JBScrollPane(content);
@@ -381,7 +379,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
}
if (LOG.isDebugEnabled()) {
final boolean changed = !ArrayUtil.equals(orderEntries, newOrder, (Comparator<OrderEntry>)(o1, o2) -> o1.compareTo(o2));
final boolean changed = !ArrayUtil.equals(orderEntries, newOrder, Comparator.naturalOrder());
LOG.debug(String.format("rearrange status (%s): %s", modifiableRootModel.getModule(), changed ? "modified" : "not modified"));
}
modifiableRootModel.rearrangeOrderEntries(newOrder);
@@ -398,7 +396,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
idx--;
}
}
return idx == -1 ? -1 : idx;
return idx;
}
private void setLanguageLevel(@NotNull ModifiableRootModel modifiableRootModel, E data) {
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+4 -1
View File
@@ -473,7 +473,8 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
if (dependencies == null) return;
List<String> orphanModules = ContainerUtil.newArrayList();
for (IdeaDependency dependency : dependencies) {
for (int i = 0; i < dependencies.size(); i++) {
IdeaDependency dependency = dependencies.get(i);
if (dependency == null) {
continue;
}
@@ -485,6 +486,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
if (scope != null) {
d.setScope(scope);
}
d.setOrder(i);
ideModule.createChild(ProjectKeys.MODULE_DEPENDENCY, d);
ModuleData targetModule = d.getTarget();
if (targetModule.getId().isEmpty() && targetModule.getLinkedExternalProjectPath().isEmpty()) {
@@ -497,6 +499,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
if (scope != null) {
d.setScope(scope);
}
d.setOrder(i);
ideModule.createChild(ProjectKeys.LIBRARY_DEPENDENCY, d);
}
}