incubator-bval-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r1166416 - /incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java
Date Wed, 07 Sep 2011 21:43:09 GMT
Author: mbenson
Date: Wed Sep  7 21:43:08 2011
New Revision: 1166416

URL: http://svn.apache.org/viewvc?rev=1166416&view=rev
Log:
merge detritus

Modified:
    incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java

Modified: incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java
URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java?rev=1166416&r1=1166415&r2=1166416&view=diff
==============================================================================
--- incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java
(original)
+++ incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java
Wed Sep  7 21:43:08 2011
@@ -80,22 +80,13 @@ public class BeanDescriptorImpl extends 
     }
 
     /**
-     * Return the property level constraints for a given propertyName or null if
-     * either the property does not exist or has no constraint The returned
+     * Return the property level constraints for a given propertyName or {@code null} if
+     * either the property does not exist or has no constraint. The returned
      * object (and associated objects including ConstraintDescriptors) are
      * immutable.
      * 
      * @param propertyName
      *            property evaluated
-=======
-     * Return the property level constraints for a given propertyName or null if
-     * either the property does not exist or has no constraint The returned
-     * object (and associated objects including ConstraintDescriptors) are
-     * immutable.
-     * 
-     * @param propertyName
-     *            property evaluated
->>>>>>> .merge-right.r997084
      */
     public PropertyDescriptor getConstraintsForProperty(String propertyName) {
         if (propertyName == null || propertyName.trim().length() == 0) {



Mime
View raw message