From a295bc81c8f0ea8021856aaac5674363f64ed062 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Tue, 12 Feb 2013 14:26:35 +0400
Subject: [PATCH] IDEA-73118 SNAPSHOT dependencies not handled as per Maven 3.0

---
 .../idea/maven/model/MavenArtifact.java       | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java
index 560e19f2f271..829a8ffcb352 100644
--- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java
+++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java
@@ -86,6 +86,10 @@ public class MavenArtifact implements Serializable {
     return myVersion;
   }
 
+  public String getBaseVersion() {
+    return myBaseVersion;
+  }
+
   public MavenId getMavenId() {
     return new MavenId(myGroupId, myArtifactId, myVersion);
   }
@@ -136,14 +140,13 @@ public class MavenArtifact implements Serializable {
     return getRelativePathForExtraArtifact(null, null);
   }
 
-  public String getRelativePathForExtraArtifact(@Nullable String extraArtifactClassifier, @Nullable String customExtension) {
-    StringBuilder result = new StringBuilder();
-    result.append(myGroupId.replace('.', '/'));
-    result.append('/');
-    result.append(myArtifactId);
-    result.append('/');
-    result.append(myVersion);
-    result.append('/');
+  public String getFileNameWithBaseVersion() {
+    StringBuilder res = new StringBuilder();
+    appendFileName(res, null, null);
+    return res.toString();
+  }
+
+  private void appendFileName(StringBuilder result, @Nullable String extraArtifactClassifier, @Nullable String customExtension) {
     result.append(myArtifactId);
     result.append('-');
     result.append(myVersion);
@@ -155,6 +158,18 @@ public class MavenArtifact implements Serializable {
 
     result.append(".");
     result.append(customExtension == null ? myExtension : customExtension);
+  }
+
+  public String getRelativePathForExtraArtifact(@Nullable String extraArtifactClassifier, @Nullable String customExtension) {
+    StringBuilder result = new StringBuilder();
+    result.append(myGroupId.replace('.', '/'));
+    result.append('/');
+    result.append(myArtifactId);
+    result.append('/');
+    result.append(myVersion);
+    result.append('/');
+
+    appendFileName(result, extraArtifactClassifier, customExtension);
     return result.toString();
   }