Changeset 2191


Ignore:
Timestamp:
Jan 13, 2014, 11:49:03 AM (8 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #558: Remove Operator annotation

Location:
extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Annotationtype.java

    r2189 r2191  
    503503 
    504504  /**
    505     Generic "Operator" annotation.
    506     @since 2.12
    507   */
    508   public static final Annotationtype OPERATOR =
    509     new Annotationtype("Operator", Type.STRING, Item.BIOPLATE, Item.EXTRACT);
     505    Annotation for pooling operator
     506    @since 2.14
     507  */
     508  public static final Annotationtype POOL_OPERATOR =
     509    new Annotationtype("PoolOperator", Type.STRING, Item.EXTRACT);
    510510
    511511 
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r2168 r2191  
    311311            effectivePermissionsUse, createIfMissing));
    312312        jsonChecks.add(checkAnnotationType(dc, Annotationtype.POOL_DATE, 1, null, effectivePermissionsUse, createIfMissing));
    313         jsonChecks.add(checkAnnotationType(dc, Annotationtype.OPERATOR, 1, null, effectivePermissionsUse, createIfMissing));
     313        jsonChecks.add(checkAnnotationType(dc, Annotationtype.POOL_OPERATOR, 1, null, effectivePermissionsUse, createIfMissing));
    314314        jsonChecks.add(checkAnnotationType(dc, Annotationtype.DILUTION_DATE, 1, null, effectivePermissionsUse, createIfMissing));
    315315        jsonChecks.add(checkAnnotationType(dc, Annotationtype.DILUTION_OPERATOR, 1, null, effectivePermissionsUse, createIfMissing));
     
    414414            Annotationtype.POOL_MOLARITY, Annotationtype.POOL_CONC, Annotationtype.POOL_TARGET_VOLUME_PER_LIB,
    415415            Annotationtype.POOL_TARGET_MOLARITY, Annotationtype.POOL_IS_MANUAL,
    416             Annotationtype.POOL_MIXING_STRATEGY, Annotationtype.POOL_DATE, Annotationtype.OPERATOR,
     416            Annotationtype.POOL_MIXING_STRATEGY, Annotationtype.POOL_DATE, Annotationtype.POOL_OPERATOR,
    417417            Annotationtype.FLAG, Annotationtype.AUTO_PROCESSING));
    418418
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PoolServlet.java

    r2186 r2191  
    597597          creationEvent.setProtocol(poolProtocol);
    598598          poolExtract.setDescription(Values.getStringOrNull((String)jsonPool.get("comments")));
    599           Annotationtype.OPERATOR.setAnnotationValue(dc, poolExtract, operator);
     599          Annotationtype.POOL_OPERATOR.setAnnotationValue(dc, poolExtract, operator);
    600600          Annotationtype.POOL_DATE.setAnnotationValue(dc, poolExtract, poolDate);
    601601         
Note: See TracChangeset for help on using the changeset viewer.