Changeset 3149


Ignore:
Timestamp:
Feb 26, 2007, 10:48:21 AM (15 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #502: Experiment Overview warns about missing 'Required by MIAME' annotations even if values are set

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.2/src/core/net/sf/basedb/util/overview/ExperimentOverview.java

    r3137 r3149  
    281281    this.annotatableParents = new HashMap<Annotatable, Set<Annotatable>>();
    282282   
    283     // Load 'Required for MIAME' annotation types
     283    // Load 'Required for MIAME' annotation types (parameter='false' must also be set)
    284284    ItemQuery<AnnotationType> query = initQuery(AnnotationType.getQuery(null), "name");
    285285    query.restrict(
    286286      Restrictions.eq(
    287287        Hql.property("requiredForMiame"),
    288         Expressions.parameter("flag", true, Type.BOOLEAN)
     288        Expressions.parameter("miameFlag", true, Type.BOOLEAN)
     289      )
     290    );
     291    query.restrict(
     292      Restrictions.eq(
     293        Hql.property("protocolParameter"),
     294        Expressions.parameter("parameterFlag", false, Type.BOOLEAN)
    289295      )
    290296    );
     
    15421548          failures.add(new Failure(Validator.MISSING_PARAMETER, parentNode,
    15431549            "Missing parameter value: " + pp.getName(),
    1544             new Fix("Add parameter value", parentItem, pp, false)));
     1550            new Fix("Add parameter value for: " + pp.getName(), parentItem, pp, false)));
    15451551        }
    15461552      }
     
    15801586        {
    15811587          AnnotationType at = a.getAnnotationType();
    1582           if (protocol == null || protocol.isParameter(at))
     1588          // Protocol parameters are handled elsewhere
     1589          if (protocol == null || !protocol.isParameter(at))
    15831590          {
    15841591            Node atNode = new Node("annotationtype."+at.getId(), at.getName(), annotationsNode, at);
Note: See TracChangeset for help on using the changeset viewer.