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

eclipse: clear model before applying; register module sources in dependencies list

Browse Source
This commit is contained in:
anna
2012-11-02 15:37:47 +01:00
parent d65b6be914
commit 80c294778b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathReader.java
+5 -5
View File
@@ -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) {
plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsEclipseClasspathSerializer.java
+3
View File
@@ -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>());