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

Gradle: IDEA-124477 sourceFolder order in iml file generated by gradle is unstable

Browse Source
This commit is contained in:
Vladislav.Soroka
2014-04-29 13:05:38 +04:00
parent c0f36112f3
commit a4ac6554fc
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ContentRootData.java
+11 -5
View File
@@ -10,10 +10,7 @@ import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.Locale;
import java.util.Map;
import java.util.*;
/**
* @author Denis Zhdanov
@@ -64,7 +61,7 @@ public class ContentRootData extends AbstractExternalEntityData {
if (FileUtil.isAncestor(new File(getRootPath()), new File(path), false)) {
Collection<SourceRoot> paths = myData.get(type);
if (paths == null) {
myData.put(type, paths = ContainerUtilRt.newHashSet());
myData.put(type, paths = new TreeSet<SourceRoot>(SourceRootComparator.INSTANCE));
}
paths.add(new SourceRoot(
ExternalSystemApiUtil.toCanonicalPath(path),
@@ -148,4 +145,13 @@ public class ContentRootData extends AbstractExternalEntityData {
return buffer.toString();
}
}
private static final class SourceRootComparator implements Comparator<SourceRoot> {
private static final SourceRootComparator INSTANCE = new SourceRootComparator();
@Override
public int compare(@NotNull SourceRoot o1, @NotNull SourceRoot o2) {
return StringUtil.naturalCompare(o1.myPath, o2.myPath);
}
}
}