svn commit: r696060 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse: CHANGES.txt src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java

[hi...@apache.org]

Author: hibou
Date: Tue Sep 16 14:10:08 2008
New Revision: 696060

URL: http://svn.apache.org/viewvc?rev=696060&view=rev
Log:
IVYDE-99: add the missing attribute

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.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=696060&r1=696059&r2=696060&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Tue Sep 16 14:10:08 2008
@@ -11,6 +11,7 @@
 
 - IMPROVE: Retrieve after resolve feature does not clean target directory first (IVYDE-105)
 
+- FIX: Ivy editor: code completion missing for matcher attribute of conflicts manager (IVYDE-99)
 - FIX: The project dependencies and the errors markers are conflicting (IVYDE-116) 
 - FIX: same jar files get downloaded 3 times (binary, javadoc and sources jar files are identical) (IVYDE-117)
 - FIX: IvyDE crashes during resolve due to an incompatibility with Eclipse 3.2 (IVYDE-108)

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java?rev=696060&r1=696059&r2=696060&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java Tue Sep 16 14:10:08 2008
@@ -665,6 +665,9 @@
                 false));
         manager.addAttribute(new IvyTagAttribute("rev",
                 "a comma separated list of revisions this conflict manager should select", false));
+        manager.addAttribute(new IvyTagAttribute("matcher",
+                "the matcher to use to match the modules for which \n"
+                        + "the conflict manager should be used", false));
         conflicts.addChildIvyTag(manager);
         ivyTag.addChildIvyTag(conflicts);
         addTag(conflicts);