diff options
Diffstat (limited to 'plugins/eclipse/jps-plugin/src/org/jetbrains/jps')
2 files changed, 9 insertions, 2 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 b9f431645c50..5adca0bb5ed7 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 @@ -210,10 +210,11 @@ class JpsEclipseClasspathReader extends AbstractEclipseClasspathReader<JpsModule final String testPattern, Element classpathElement, JpsMacroExpander expander) throws IOException { LOG.debug("start loading classpath for " + model.getName()); + final HashSet<String> libs = new HashSet<String>(); for (Object o : classpathElement.getChildren(EclipseXml.CLASSPATHENTRY_TAG)) { try { readClasspathEntry(model, new ArrayList<String>(), new ArrayList<String>(), new HashSet<String>(), new HashSet<String>(), - testPattern, (Element)o, 0, EclipseModuleManager.EMPTY, expander.getExpandMacroMap()); + testPattern, (Element)o, 0, EclipseModuleManager.EMPTY, expander.getExpandMacroMap(), libs); } catch (ConversionException e) { throw new IOException(e); diff --git a/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsIdeaSpecificSettings.java b/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsIdeaSpecificSettings.java index e1e1b8506a70..9d722746650e 100644 --- a/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsIdeaSpecificSettings.java +++ b/plugins/eclipse/jps-plugin/src/org/jetbrains/jps/eclipse/model/JpsIdeaSpecificSettings.java @@ -118,7 +118,13 @@ class JpsIdeaSpecificSettings extends AbstractIdeaSpecificSettings<JpsModule, St } @Override - protected void readLanguageLevel(Element root, JpsModule model) throws InvalidDataException {} + protected void readLanguageLevel(Element root, JpsModule model) throws InvalidDataException { + final String languageLevel = root.getAttributeValue("LANGUAGE_LEVEL"); + final JpsJavaModuleExtension extension = getService().getOrCreateModuleExtension(model); + if (languageLevel != null) { + extension.setLanguageLevel(LanguageLevel.valueOf(languageLevel)); + } + } @Override protected void expandElement(Element root, JpsModule model) { |