Changeset 1685


Ignore:
Timestamp:
Jun 4, 2012, 1:50:35 PM (11 years ago)
Author:
Nicklas Nordborg
Message:

References #371, #372 and #373. Synchonized names with existing items on the production server.

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/BioplateType.java

    r1669 r1685  
    4848  */
    4949  public static final BioplateType PARAFFIN_BLOCK =
    50     new BioplateType("Paraffin block", Item.SAMPLE, Subtype.HISTOLOGY, LockMode.LOCKED_AFTER_ADD, Geometry.THREE_BY_TWO, "PB", 5);
    51  
    52   /**
    53     The definition of the "HE glass" plate type. It is locked to samples
     50    new BioplateType("FFPE block", Item.SAMPLE, Subtype.HISTOLOGY, LockMode.LOCKED_AFTER_ADD, Geometry.THREE_BY_TWO, "PB", 5);
     51 
     52  /**
     53    The definition of the "HE stain glass" plate type. It is locked to samples
    5454    of subtype {@link Subtype#STAINED}.
    5555    @since 2.7
    5656  */
    5757  public static final BioplateType HE_GLASS =
    58     new BioplateType("HE glass", Item.SAMPLE, Subtype.STAINED, LockMode.LOCKED_AFTER_ADD, Geometry.THREE_BY_TWO, "HE", 5);
     58    new BioplateType("HE stain glass", Item.SAMPLE, Subtype.STAINED, LockMode.LOCKED_AFTER_ADD, Geometry.THREE_BY_TWO, "HE", 5);
    5959
    6060 
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Subtype.java

    r1684 r1685  
    145145  public static final Subtype HISTOLOGY_PROTOCOL = new Subtype("Histology", Item.PROTOCOL, false);
    146146
     147  /**
     148    The definition of the "Staining" protocol subtype (used when HE-staining Histology items).
     149    @since 2.7
     150  */
     151  public static final Subtype STAINING_PROTOCOL = new Subtype("Staining", Item.PROTOCOL, false);
     152 
    147153 
    148154  /**
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1684 r1685  
    127127        jsonChecks.add(checkSubtype(dc, Subtype.HISTOLOGY_PROTOCOL, createIfMissing));
    128128        jsonChecks.add(checkSubtype(dc, Subtype.HISTOLOGY, createIfMissing, Subtype.SPECIMEN, Subtype.HISTOLOGY_PROTOCOL));
    129         jsonChecks.add(checkSubtype(dc, Subtype.STAINED, createIfMissing, Subtype.HISTOLOGY));
     129        jsonChecks.add(checkSubtype(dc, Subtype.STAINING_PROTOCOL, createIfMissing));
     130        jsonChecks.add(checkSubtype(dc, Subtype.STAINED, createIfMissing, Subtype.HISTOLOGY, Subtype.STAINING_PROTOCOL));
    130131        jsonChecks.add(checkSubtype(dc, Subtype.SAMPLE_HANDLING_PROTOCOL, createIfMissing));
    131132        jsonChecks.add(checkSubtype(dc, Subtype.EXTRACTION_PROTOCOL, createIfMissing));
Note: See TracChangeset for help on using the changeset viewer.