From a01e8900fb4a47dfc2faff803888bdcc10d2929f Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Mon, 8 Oct 2012 16:23:08 +0400 Subject: [PATCH] Support maven 3 Implement assembleInheritance() --- .../idea/maven/server/Maven3ServerEmbedderImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java index ed60dab83d83..2bbc89af1f31 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java @@ -36,6 +36,7 @@ import org.apache.maven.model.Profile; import org.apache.maven.model.profile.DefaultProfileInjector; import org.apache.maven.profiles.activation.*; import org.apache.maven.project.*; +import org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler; import org.apache.maven.project.interpolation.AbstractStringBasedModelInterpolator; import org.apache.maven.project.interpolation.ModelInterpolationException; import org.apache.maven.project.path.DefaultPathTranslator; @@ -432,8 +433,9 @@ public class Maven3ServerEmbedderImpl extends MavenRemoteObject implements Maven private Set retrieveUnresolvedArtifactIds() { Set result = new THashSet(); - ((CustomMaven3WagonManager)getComponent(WagonManager.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); - ((CustomMaven3ArtifactResolver)getComponent(ArtifactResolver.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); + // TODO collect unresolved artifacts + //((CustomMaven3WagonManager)getComponent(WagonManager.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); + //((CustomMaven3ArtifactResolver)getComponent(ArtifactResolver.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); return result; } @@ -501,8 +503,10 @@ public class Maven3ServerEmbedderImpl extends MavenRemoteObject implements Maven return MavenModelConverter.convertModel(result, null); } - public static MavenModel assembleInheritance(MavenModel model, MavenModel parentModel) { - throw new UnsupportedOperationException(); + public static MavenModel assembleInheritance(MavenModel model, MavenModel parentModel) throws RemoteException { + Model result = MavenModelConverter.toNativeModel(model); + new DefaultModelInheritanceAssembler().assembleModelInheritance(result, MavenModelConverter.toNativeModel(parentModel)); + return MavenModelConverter.convertModel(result, null); } public static ProfileApplicationResult applyProfiles(MavenModel model,