Fix Maven tests.

This commit is contained in:
Sergey Evdokimov
2013-06-18 15:02:28 +04:00
parent d632619bbb
commit b5ffa5e630
2 changed files with 5 additions and 1 deletions
@@ -17,6 +17,7 @@ package org.jetbrains.idea.maven.dom.converters;
import com.intellij.util.xml.ConvertContext;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.model.MavenConstants;
import org.jetbrains.idea.maven.project.MavenProject;
import org.jetbrains.idea.maven.project.MavenProjectsManager;
import org.jetbrains.idea.maven.project.SupportedRequestType;
@@ -35,6 +36,9 @@ public class MavenDependencyTypeConverter extends MavenProjectConstantListConver
Set<String> res = new LinkedHashSet<String>();
res.addAll(MavenProjectsManager.getInstance(context.getProject()).getImportingSettings().getDependencyTypesAsSet());
res.add(MavenConstants.TYPE_POM);
res.addAll(project.getDependencyTypesFromImporters(SupportedRequestType.FOR_COMPLETION));
return res;
@@ -53,7 +53,7 @@ public class MavenImportingSettings implements Cloneable {
private GeneratedSourcesFolder generatedSourcesFolder = GeneratedSourcesFolder.AUTODETECT;
private String dependencyTypes = "jar, test-jar, maven-plugin, ejb, ejb-client, jboss-har, jboss-sar, war, ear, bundle, client";
private String dependencyTypes = "jar, test-jar, maven-plugin, ejb, ejb-client, jboss-har, jboss-sar, war, ear, bundle";
private Set<String> myDependencyTypesAsSet;
private List<Listener> myListeners = ContainerUtil.createLockFreeCopyOnWriteList();