From b0d4c4f26c76d10b6259e9b5dfda340bd3a5ff31 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 3 Nov 2010 13:42:02 +0300
Subject: [PATCH] sort source roots in eclipse

---
 .../src/com/intellij/openapi/roots/impl/ContentEntryImpl.java   | 2 +-
 .../org/jetbrains/idea/eclipse/config/EclipseModuleManager.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java
index f7260d85a6c6..4f3aa9cd05ec 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java
@@ -44,7 +44,7 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.SimpleContentEntryImpl");
   private final VirtualFilePointer myRoot;
   @NonNls public static final String ELEMENT_NAME = "content";
-  private final LinkedHashSet<SourceFolder> mySourceFolders = new LinkedHashSet<SourceFolder>();
+  private final TreeSet<SourceFolder> mySourceFolders = new TreeSet<SourceFolder>(ContentFolderComparator.INSTANCE);
   private final TreeSet<ExcludeFolder> myExcludeFolders = new TreeSet<ExcludeFolder>(ContentFolderComparator.INSTANCE);
   private final TreeSet<ExcludedOutputFolder> myExcludedOutputFolders = new TreeSet<ExcludedOutputFolder>(ContentFolderComparator.INSTANCE);
   @NonNls public static final String URL_ATTRIBUTE = "url";
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java
index 27067213a990..8b7ed5b6ba98 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java
@@ -126,6 +126,7 @@ public class EclipseModuleManager implements PersistentStateComponent<Element>{
 
   public void setForceConfigureJDK() {
     myForceConfigureJDK = true;
+    myExpectedModuleSourcePlace++;
   }
 
   public void registerEclipseLibUrl(String url) {