From 80c294778b0bcd34c873c1afdbc539ee83bc252c Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Fri, 2 Nov 2012 14:17:03 +0100
Subject: [PATCH] eclipse: clear model before applying; register module sources
 in dependencies list

---
 .../jps/eclipse/model/JpsEclipseClasspathReader.java   | 10 +++++-----
 .../eclipse/model/JpsEclipseClasspathSerializer.java   |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathReader.java b/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathReader.java
index bb3fef56de2c..2f42773af59e 100644
--- a/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathReader.java
+++ b/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathReader.java
@@ -86,11 +86,9 @@ class JpsEclipseClasspathReader extends AbstractEclipseClasspathReader<JpsModule
                                 Collection<String> unknownJdks,
                                 EclipseModuleManager eclipseModuleManager,
                                 String jdkName) {
-    if (jdkName == null) {
-      final JpsDependenciesList dependenciesList = rootModel.getDependenciesList();
-      dependenciesList.addSdkDependency(JpsJavaSdkType.INSTANCE);
-    }
-    else {
+    final JpsDependenciesList dependenciesList = rootModel.getDependenciesList();
+    dependenciesList.addSdkDependency(JpsJavaSdkType.INSTANCE);
+    if (jdkName != null) {
       JpsSdkTableSerializer.setSdkReference(rootModel.getSdkReferencesTable(), jdkName, JpsJavaSdkType.INSTANCE);
     }
   }
@@ -235,6 +233,8 @@ class JpsEclipseClasspathReader extends AbstractEclipseClasspathReader<JpsModule
     final JpsJavaModuleExtension extension = getService().getOrCreateModuleExtension(rootModel);
     extension.setOutputUrl(pathToUrl(path));
     extension.setInheritOutput(false);
+
+    rootModel.getDependenciesList().addModuleSourceDependency();
   }
 
   private static void setLibraryEntryExported(final JpsDependencyElement dependency, boolean exported) {
diff --git a/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathSerializer.java b/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathSerializer.java
index 2d84201bb338..ef2be8f6b333 100644
--- a/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathSerializer.java
+++ b/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathSerializer.java
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.eclipse.EclipseXml;
+import org.jetbrains.jps.model.module.JpsDependenciesList;
 import org.jetbrains.jps.model.module.JpsModule;
 import org.jetbrains.jps.model.serialization.JpsMacroExpander;
 import org.jetbrains.jps.model.serialization.module.JpsModuleClasspathSerializer;
@@ -29,6 +30,8 @@ public class JpsEclipseClasspathSerializer extends JpsModuleClasspathSerializer
                             @Nullable String classpathDir,
                             @NotNull String baseModulePath,
                             JpsMacroExpander expander, List<String> paths) {
+    final JpsDependenciesList dependenciesList = module.getDependenciesList();
+    dependenciesList.clear();
     try {
       final Document document = JDOMUtil.loadDocument(new File(classpathDir, EclipseXml.DOT_CLASSPATH_EXT));
       final JpsEclipseClasspathReader reader = new JpsEclipseClasspathReader(classpathDir, paths, new HashSet<String>());