Changeset 7043


Ignore:
Timestamp:
Dec 11, 2015, 1:49:44 PM (6 years ago)
Author:
Nicklas Nordborg
Message:

Fixes Javadoc errors and warnings.

Location:
branches/3.7-stable/src
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/3.7-stable/src/clients/web/net/sf/basedb/clients/web/plugins/AnyToAnyDataLoader.java

    r6932 r7043  
    4848    @param linkName Name of the any-to-any link (required)
    4949    @param linkType Target item type of the link (optional)
    50     @param propertyPath Property of the target item to load (optional)
     50    @param linkProperty Property of the target item to load (optional)
    5151  */
    5252  @SuppressWarnings("unchecked")
  • branches/3.7-stable/src/core/net/sf/basedb/core/Annotation.java

    r6937 r7043  
    9393    Create a new inherited or cloned annotation.
    9494    @param dc The DbControl object
    95     @param annotationType The annotation type of the new annotation
     95    @param inheritedFrom The annotation to inherit
    9696    @param annotationSet The annotation set of the new annotation
     97    @param clone If the annotation values should be cloned or not
    9798    @see AnnotationSet#getAnnotation(AnnotationType)
    9899    @since 3.6
  • branches/3.7-stable/src/core/net/sf/basedb/core/AnnotationSet.java

    r6940 r7043  
    10441044    inherit by annotation set is no longer supported. Calling
    10451045    this method will be translated to inheriting all individual annotations
    1046     from the annotation set using {@link #inheritAll(AnnotationSet)}
     1046    from the annotation set using {@link #inheritAll(AnnotationSet, boolean)}
    10471047   
    10481048    @param annotationSet The annotation set to inherit
     
    10511051      use permission for the annotation set to inherit
    10521052    @throws InvalidDataException If the annotation set is null
    1053     @deprecated In 3.6, use {@link #inheritAll(AnnotationSet)} instead
     1053    @deprecated In 3.6, use {@link #inheritAll(AnnotationSet, boolean)} instead
    10541054  */
    10551055  @Deprecated
  • branches/3.7-stable/src/core/net/sf/basedb/core/Kit.java

    r6996 r7043  
    4949    The ID for the sampling kit type, for example a kit
    5050    used when creating a {@link Sample} from a {@link
    51     Biosource}.
     51    BioSource}.
    5252  */
    5353  public static final String SAMPLING = "net.sf.basedb.core.KitType.SAMPLING";
     
    294294    <ul>
    295295    <li>{@link BioMaterial}:s and {@link PhysicalBioAssay}:s using this kit
    296     <li>{@link BioPlateEvents}:s with this kit
     296    <li>{@link BioPlateEvent}:s with this kit
    297297    <li>{@link DerivedBioAssay}: with this kit
    298298    </ul>
  • branches/3.7-stable/src/core/net/sf/basedb/core/Update.java

    r7035 r7043  
    247247    <td>122</td>
    248248    <td>
    249       Added {@link RootRawBioAssayData}. Existing raw bioassay<->Experiment links
     249      Added {@link RootRawBioAssayData}. Existing raw bioassay -- Experiment links
    250250      are moved over to this item.
    251251    </td>
  • branches/3.7-stable/src/core/net/sf/basedb/core/query/ConditionalQueryElement.java

    r7018 r7043  
    3535  @author Nicklas
    3636  @since 3.7
    37   @see Restrictions#conditionalRestriction(Filter, Restriction, Restriction)
     37  @see Restrictions#conditionalRestriction(Filter, Restriction, Restriction, boolean)
    3838*/
    3939public class ConditionalQueryElement
  • branches/3.7-stable/src/core/net/sf/basedb/core/query/ReturnClassFilter.java

    r7034 r7043  
    3131  with a conditiona restriction or expression as
    3232  created by {@link Restrictions#conditionalRestriction(Filter, Restriction, Restriction, boolean)}
    33   and {@link Expressions#conditionalRestriction(Filter, Expression, Expression, boolean)}
     33  and {@link Expressions#conditionalExpression(Filter, Expression, Expression)}
    3434 
    3535  @author nicklas
  • branches/3.7-stable/src/core/net/sf/basedb/core/snapshot/AnnotationSnapshot.java

    r6962 r7043  
    400400    Get the unit the annotatation values should use for display.
    401401    NOTE! The unit is only available for primary and cloned annotations. Use
    402     {@link #getActualUnit()} or {@link #getInheritedFrom()}.getThisUnit() to get
     402    {@link #getActualUnit(DbControl)} or {@link #getInheritedFrom()}.getThisUnit() to get
    403403    the unit also for inherited annotations.
    404404   
  • branches/3.7-stable/src/core/net/sf/basedb/util/bcrypt/BCrypt.java

    r6906 r7043  
    3131* <p>
    3232* <code>
    33 * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
     33* String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br>
    3434* </code>
    3535* <p>
     
    3838* <p>
    3939* <code>
    40 * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
    41 * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br />
    42 * else<br />
    43 * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
     40* if (BCrypt.checkpw(candidate_password, stored_hash))<br>
     41* &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br>
     42* else<br>
     43* &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br>
    4444* </code>
    4545* <p>
     
    4848* <p>
    4949* <code>
    50 * String strong_salt = BCrypt.gensalt(10)<br />
    51 * String stronger_salt = BCrypt.gensalt(12)<br />
     50* String strong_salt = BCrypt.gensalt(10)<br>
     51* String stronger_salt = BCrypt.gensalt(12)<br>
    5252* </code>
    5353* <p>
Note: See TracChangeset for help on using the changeset viewer.