You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2009/03/05 15:41:58 UTC
svn commit: r750467 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse:
CHANGES.txt src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Author: hibou
Date: Thu Mar 5 14:41:58 2009
New Revision: 750467
URL: http://svn.apache.org/viewvc?rev=750467&view=rev
Log:
IVYDE-166:
- the artifacts should be associated if they have the same mrid
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=750467&r1=750466&r2=750467&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Thu Mar 5 14:41:58 2009
@@ -26,6 +26,7 @@
- FIX: "Delete old retrieved artifacts" gets grayed out after OK'ing the dialog (IVYDE-155)
- FIX: REGRESSION: Resolving does no longer respect configurations (IVYDE-161)
- FIX: Parsing ivy file fails in IvyDE while it succeeds in Ant (IVYDE-35)
+- FIX: Sources attach but Javadocs don't (IVYDE-166)
version 2.0.0 beta1
==========================
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=750467&r1=750466&r2=750467&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java Thu Mar 5 14:41:58 2009
@@ -507,7 +507,7 @@
Artifact a = otherAdr.getArtifact();
if (otherAdr.getLocalFile() != null
&& isSourceArtifactName(artifact.getName(), a.getName())
- && a.getId().getRevision().equals(artifact.getId().getRevision())
+ && a.getModuleRevisionId().equals(artifact.getModuleRevisionId())
&& isSources(a)) {
return new Path(otherAdr.getLocalFile().getAbsolutePath());
}
@@ -543,7 +543,7 @@
if (otherAdr.getLocalFile() != null
&& isJavadocArtifactName(artifact.getName(), a.getName())
&& a.getModuleRevisionId().equals(artifact.getModuleRevisionId())
- && a.getId().equals(artifact.getId()) && isJavadoc(a)) {
+ && isJavadoc(a)) {
return new Path(otherAdr.getLocalFile().getAbsolutePath());
}
}