From 2cf9aba56ba9361bce78f0a9f5fb0e111849aded Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Wed, 22 Sep 2010 15:39:00 +0400
Subject: [PATCH] Maven: correctly configuring dependency paths for dated
 snapshot versions.

---
 .../org/jetbrains/idea/maven/model/MavenArtifact.java    | 9 ++-------
 .../jetbrains/idea/maven/server/MavenModelConverter.java | 3 ++-
 2 files changed, 4 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 950a9ae65e8d..5779a12db383 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
@@ -29,7 +29,6 @@ public class MavenArtifact implements Serializable {
   private final String myGroupId;
   private final String myArtifactId;
   private final String myVersion;
-  private final String myBaseVersion;
   private final String myType;
   private final String myClassifier;
 
@@ -57,8 +56,7 @@ public class MavenArtifact implements Serializable {
                        boolean stubbed) {
     myGroupId = groupId;
     myArtifactId = artifactId;
-    myVersion = version;
-    myBaseVersion = baseVersion;
+    myVersion = !StringUtil.isEmptyOrSpaces(baseVersion) ? baseVersion : version;
     myType = type;
     myClassifier = classifier;
     myScope = scope;
@@ -249,8 +247,7 @@ public class MavenArtifact implements Serializable {
     if (!StringUtil.isEmptyOrSpaces(myType) && !MavenConstants.TYPE_JAR.equals(myType)) MavenId.append(builder, myType);
     if (!StringUtil.isEmptyOrSpaces(myClassifier)) MavenId.append(builder, myClassifier);
 
-    String version = !StringUtil.isEmptyOrSpaces(myBaseVersion) ? myBaseVersion : myVersion;
-    if (!StringUtil.isEmptyOrSpaces(version)) MavenId.append(builder, version);
+    MavenId.append(builder, myVersion);
 
     return builder.toString();
   }
@@ -270,7 +267,6 @@ public class MavenArtifact implements Serializable {
     if (myGroupId != null ? !myGroupId.equals(that.myGroupId) : that.myGroupId != null) return false;
     if (myArtifactId != null ? !myArtifactId.equals(that.myArtifactId) : that.myArtifactId != null) return false;
     if (myVersion != null ? !myVersion.equals(that.myVersion) : that.myVersion != null) return false;
-    if (myBaseVersion != null ? !myBaseVersion.equals(that.myBaseVersion) : that.myBaseVersion != null) return false;
     if (myType != null ? !myType.equals(that.myType) : that.myType != null) return false;
     if (myClassifier != null ? !myClassifier.equals(that.myClassifier) : that.myClassifier != null) return false;
     if (myScope != null ? !myScope.equals(that.myScope) : that.myScope != null) return false;
@@ -285,7 +281,6 @@ public class MavenArtifact implements Serializable {
     int result = myGroupId != null ? myGroupId.hashCode() : 0;
     result = 31 * result + (myArtifactId != null ? myArtifactId.hashCode() : 0);
     result = 31 * result + (myVersion != null ? myVersion.hashCode() : 0);
-    result = 31 * result + (myBaseVersion != null ? myBaseVersion.hashCode() : 0);
     result = 31 * result + (myType != null ? myType.hashCode() : 0);
     result = 31 * result + (myClassifier != null ? myClassifier.hashCode() : 0);
     result = 31 * result + (myScope != null ? myScope.hashCode() : 0);
diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java
index 2d4248762c8b..8ff4b1119633 100644
--- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java
+++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java
@@ -200,7 +200,8 @@ public class MavenModelConverter {
   }
 
   public static MavenArtifact convertArtifact(Artifact artifact, File localRepository) {
-    return new MavenArtifact(artifact.getGroupId(), artifact.getArtifactId(),
+    return new MavenArtifact(artifact.getGroupId(),
+                             artifact.getArtifactId(),
                              artifact.getVersion(),
                              artifact.getBaseVersion(),
                              artifact.getType(),