Changeset 2474


Ignore:
Timestamp:
Jul 31, 2006, 3:52:51 PM (17 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #263: Update to latest versions of 3rd-party software

  • Log4j: 1.2.12 --> 1.2.13
  • Xerces: 2.6.2 --> 2.8.0
  • MySQL JDBC driver: 3.1.12 --> 3.1.13
  • Postgres JDBC driver: 8.0.317 --> 8.1.407
  • JEP: 2.3.0 --> 2.4.0
  • JFreeChart: 1.0.0 --> 1.0.1
  • Hibernate: 3.1.2 --> 3.2.cr3
Location:
trunk
Files:
8 added
10 deleted
78 edited

Legend:

Unmodified
Added
Removed

  • trunk/doc/3rd-party-components.txt

    r2315 r2474  
    3939
    4040More info : http://www.hibernate.org/
    41 Version   : 3.1.2
     41Version   : 3.2.0.cr3
    4242License   : LGPL (hibernate.license.txt)
    43 Jar files : hibernate3.jar, antlr-2.7.6rc1.jar, asm.jar, asm-attrs.jar,
     43Jar files : hibernate3.jar, antlr-2.7.6.jar, asm.jar, asm-attrs.jar,
    4444            cglib-2.1.3.jar, commons-collections-2.1.1.jar, commons-logging-1.0.4.jar
    45             dom4j-1.6.1.jar, ehcache-1.1.jar, jta.jar, log4j-1.2.11.jar,
     45            dom4j-1.6.1.jar, ehcache-1.2.jar, jta.jar, log4j-1.2.11.jar,
    4646            c3p0-0.9.0.jar
    4747
    … …  
    5656
    5757More info : http://logging.apache.org/log4j/docs/
    58 Version   : 1.2.11
     58Version   : 1.2.13
    5959License   : Apache License 2.0 (apache.license-2.0.txt)
    60 Jar files : log4j-1.2.11.jar
     60Jar files : log4j-1.2.13.jar
    6161
    6262JDOM
    … …  
    8989library is only required for compiling and are not included in the
    9090distribution. The web server/servlet container should already have
    91 these API installed (that'w what makes it a servlet container).
     91these API installed (that's what makes it a servlet container).
    9292
    9393More info : http://java.sun.com/products/servlet/index.jsp
    … …  
    103103
    104104More info : http://xml.apache.org/xerces2-j/index.html
    105 Version   : 2.6.2
     105Version   : 2.8.0
    106106License   : Apache Software License (xerces.license.txt)
    107 Jar files : xerces-2.6.2.jar, xml-apis.jar
     107Jar files : xerces-2.8.0.jar, xml-apis.jar
    108108
    109109
    … …  
    114114
    115115More info : http://www.mysql.com/products/connector/j/
    116 Version   : 3.1.12
     116Version   : 3.1.13
    117117License   : GPL (gpl.license.txt)
    118 Jar files : mysql-connector-java-3.1.12-bin.jar
     118Jar files : mysql-connector-java-3.1.13-bin.jar
    119119
    120120
    … …  
    125125
    126126More info : http://jdbc.postgresql.org/
    127 Version   : 8.0.313
     127Version   : 8.1.407
    128128License   : BSD License (postgres.license.txt)
    129 Jar files : postgresql-8.0-313.jdbc3.jar
     129Jar files : postgresql-8.1-407.jdbc3.jar
    130130
    131131
    … …  
    150150
    151151More info : http://www.singularsys.com/jep/
    152 Version   : 2.3.0
     152Version   : 2.4.0
    153153License   : GPL (gpl.license.txt)
    154 Jar files : jep-2.3.0.jar
     154Jar files : jep-2.4.0.jar
    155155
    156156
    … …  
    160160
    161161More info : http://www.jfree.org/
    162 Version   : 1.0.0
     162Version   : 1.0.1
    163163License   : LGPL (lgpl.txt)
    164 Jar files : jfreechart-1.0.0.jar jcommon-1.0.0.jar
     164Jar files : jfreechart-1.0.1.jar jcommon-1.0.0.jar
    165165
    166166

  • trunk/src/clients/web/net/sf/basedb/clients/web/servlet/PlotServlet.java

    r2327 r2474  
    727727      -------------------------------------------
    728728    */
    729     public int getTotalCount()
     729    public long getTotalCount()
    730730    {
    731731      return child.getTotalCount();

  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/Navigator.java

    r2304 r2474  
    224224    this.totalRows = totalRows;
    225225  }
     226  public void setTotalrows(long totalRows)
     227  {
     228    this.totalRows = (int)totalRows;
     229  }
    226230  public int getTotalrows()
    227231  {

  • trunk/src/core/net/sf/basedb/core/AbstractEntityQuery.java

    r2404 r2474  
    248248    lastCountDc = null;
    249249  }
    250   public int count(DbControl dc)
     250  public long count(DbControl dc)
    251251    throws BaseException
    252252  {
    253     return HibernateUtil.loadData(Integer.class, getCountHqlQuery(dc));
     253    return HibernateUtil.loadData(Long.class, getCountHqlQuery(dc));
    254254  }
    255255

  • trunk/src/core/net/sf/basedb/core/AbstractResultList.java

    r2304 r2474  
    4343{
    4444
    45   private final int totalCount;
     45  private final long totalCount;
    4646
    47   AbstractResultList(int totalCount)
     47  AbstractResultList(long totalCount)
    4848  {
    4949    this.totalCount = totalCount;
    … …  
    5454    -------------------------------------------
    5555  */
    56   public int getTotalCount()
     56  public long getTotalCount()
    5757  {
    5858    return totalCount;

  • trunk/src/core/net/sf/basedb/core/AbstractSqlQuery.java

    r2304 r2474  
    9696    return QueryType.SQL;
    9797  }
    98   public int count(DbControl dc)
     98  public long count(DbControl dc)
    9999    throws BaseException
    100100  {
    … …  
    137137    throws BaseException
    138138  {
    139     int totalCount = -1;
     139    long totalCount = -1;
    140140
    141141    // Reset temporary query elements

  • trunk/src/core/net/sf/basedb/core/AnnotationType.java

    r2382 r2474  
    171171      */
    172172      query.setEntity("annotationType", this.getData());
    173       used = HibernateUtil.loadData(Integer.class, query) > 0;
     173      used = HibernateUtil.loadData(Long.class, query) > 0;
    174174    }
    175175    if (!used)
    … …  
    183183      */
    184184      query.setEntity("annotationType", this.getData());
    185       used = HibernateUtil.loadData(Integer.class, query) > 0;
     185      used = HibernateUtil.loadData(Long.class, query) > 0;
    186186    }
    187187    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/ArrayBatch.java

    r2382 r2474  
    150150    */
    151151    query.setEntity("arrayBatch", this.getData());
    152     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     152    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    153153  }
    154154  // -------------------------------------------

  • trunk/src/core/net/sf/basedb/core/ArrayDesign.java

    r2449 r2474  
    171171    */
    172172    query.setEntity("arrayDesign", this.getData());
    173     int count = HibernateUtil.loadData(Integer.class, query);
     173    long count = HibernateUtil.loadData(Long.class, query);
    174174    if (count == 0)
    175175    {
    … …  
    181181      */
    182182      query.setEntity("arrayDesign", this.getData());
    183       count = HibernateUtil.loadData(Integer.class, query);
     183      count = HibernateUtil.loadData(Long.class, query);
    184184    }
    185185    return count > 0 || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/BasicItem.java

    r2382 r2474  
    215215    query.setInteger("toId", this.getId());
    216216    query.setInteger("toType", this.getType().getValue());
    217     return HibernateUtil.loadData(Integer.class, query) > 0;
     217    return HibernateUtil.loadData(Long.class, query) > 0;
    218218  }
    219219

  • trunk/src/core/net/sf/basedb/core/BioSource.java

    r2404 r2474  
    176176    @return The number of samples
    177177   */
    178   public int countSamples()
     178  public long countSamples()
    179179    throws BaseException
    180180  {
    … …  
    187187    */
    188188    query.setEntity("biosource", this.getData());
    189     return HibernateUtil.loadData(Integer.class, query);
     189    return HibernateUtil.loadData(Long.class, query);
    190190  }
    191191 

  • trunk/src/core/net/sf/basedb/core/DataQuery.java

    r2304 r2474  
    7979  {
    8080    enableFilters(dc);
    81     int totalCount = -1;
     81    long totalCount = -1;
    8282
    8383    // Load the total count if it is requested
    8484    if (isReturningTotalCount())
    8585    {
    86       totalCount = HibernateUtil.loadData(Integer.class, getCountHqlQuery(dc));
     86      totalCount = HibernateUtil.loadData(Long.class, getCountHqlQuery(dc));
    8787    }
    8888   

  • trunk/src/core/net/sf/basedb/core/DataResultIterator.java

    r2304 r2474  
    5959    The total number of items.
    6060  */
    61   private final int totalCount;
     61  private final long totalCount;
    6262
    6363  /**
    … …  
    7171  private final Item itemType;
    7272
    73   DataResultIterator(ScrollIterator<I> data, DbControl dc, Class<I> dataClass, int totalCount)
     73  DataResultIterator(ScrollIterator<I> data, DbControl dc, Class<I> dataClass, long totalCount)
    7474  {
    7575    assert data != null : "data == null";
    … …  
    8686    ---------------------------------
    8787  */
    88   public int getTotalCount()
     88  public long getTotalCount()
    8989  {
    9090    return totalCount;

  • trunk/src/core/net/sf/basedb/core/Directory.java

    r2451 r2474  
    419419    throws BaseException
    420420  {
    421     int count;
     421    long count;
    422422    org.hibernate.Session session = getDbControl().getHibernateSession();
    423423    org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "COUNT_FILES_IN_DIRECTORY");
    … …  
    428428    */
    429429    query.setEntity("directory", getData());
    430     count = HibernateUtil.loadData(Integer.class, query);
     430    count = HibernateUtil.loadData(Long.class, query);
    431431    if (count == 0)
    432432    {
    … …  
    438438      */
    439439      query.setEntity("directory", getData());
    440       count = HibernateUtil.loadData(Integer.class, query);
     440      count = HibernateUtil.loadData(Long.class, query);
    441441    }
    442442    if (count == 0)
    … …  
    449449      */
    450450      query.setEntity("directory", getData());
    451       count = HibernateUtil.loadData(Integer.class, query);
     451      count = HibernateUtil.loadData(Long.class, query);
    452452    }
    453453    return count > 0 || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/DynamicResultIterator.java

    r2304 r2474  
    5252    The total number of items.
    5353  */
    54   private final int totalCount;
     54  private final long totalCount;
    5555
    5656  private final int limit;
    … …  
    7272      query
    7373  */
    74   DynamicResultIterator(ResultSet results, int totalCount, int limit)
     74  DynamicResultIterator(ResultSet results, long totalCount, int limit)
    7575  {
    7676    this.results = results;
    … …  
    8686    ---------------------------------
    8787  */
    88   public int getTotalCount()
     88  public long getTotalCount()
    8989  {
    9090    return totalCount;

  • trunk/src/core/net/sf/basedb/core/ExtraValueType.java

    r2382 r2474  
    217217    */
    218218    query.setEntity("extraValueType", this.getData());
    219     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     219    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    220220  }
    221221  // -------------------------------------------

  • trunk/src/core/net/sf/basedb/core/Extract.java

    r2464 r2474  
    232232  }
    233233 
    234   public int countLabeledExtracts()
     234  public long countLabeledExtracts()
    235235    throws BaseException
    236236  {
    … …  
    243243    */
    244244    query.setEntity("extract", this.getData());
    245     return HibernateUtil.loadData(Integer.class, query);
     245    return HibernateUtil.loadData(Long.class, query);
    246246  }
    247247}

  • trunk/src/core/net/sf/basedb/core/File.java

    r2451 r2474  
    386386      */
    387387      query.setEntity("file", this.getData());
    388       used = HibernateUtil.loadData(Integer.class, query) > 0;
     388      used = HibernateUtil.loadData(Long.class, query) > 0;
    389389    }
    390390    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/FileType.java

    r2382 r2474  
    227227    */
    228228    query.setEntity("filetype", this.getData());
    229     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     229    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    230230  }
    231231  void initPermissions(int granted, int denied)

  • trunk/src/core/net/sf/basedb/core/Group.java

    r2382 r2474  
    223223    */
    224224    query.setEntity("theGroup", this.getData());
    225     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     225    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    226226  }
    227227

  • trunk/src/core/net/sf/basedb/core/Hardware.java

    r2382 r2474  
    153153      */
    154154      q.setEntity("scanner", this.getData());
    155       used = HibernateUtil.loadData(Integer.class, q) > 0;
     155      used = HibernateUtil.loadData(Long.class, q) > 0;
    156156    }
    157157    if (!used)
    … …  
    164164      */
    165165      q.setEntity("printrobot", this.getData());
    166       used = HibernateUtil.loadData(Integer.class, q) > 0;
     166      used = HibernateUtil.loadData(Long.class, q) > 0;
    167167    }
    168168    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/HardwareType.java

    r2442 r2474  
    131131    */
    132132    query.setEntity("hardwaretype", this.getData());
    133     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     133    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    134134  }
    135135  /**

  • trunk/src/core/net/sf/basedb/core/HibernateUtil.java

    r2392 r2474  
    175175  {
    176176    isInitialised = false;
     177    if (sf != null && !sf.isClosed()) sf.close();
    177178    sf = null;
    178179    cfg = null;

  • trunk/src/core/net/sf/basedb/core/Hybridization.java

    r2411 r2474  
    261261    @return The number of scans
    262262   */
    263   public int countScans()
     263  public long countScans()
    264264    throws BaseException
    265265  {
    … …  
    272272    */
    273273    query.setEntity("hybridization", this.getData());
    274     return HibernateUtil.loadData(Integer.class, query);
     274    return HibernateUtil.loadData(Long.class, query);
    275275  }
    276276

  • trunk/src/core/net/sf/basedb/core/ItemQuery.java

    r2304 r2474  
    9191   
    9292    List<? extends BasicData> result = HibernateUtil.loadList(dataClass, getMainHqlQuery(dc));
    93     int totalCount = result.size();
     93    long totalCount = result.size();
    9494   
    9595    // Load the total count if needed and requested
    9696    if ((getFirstResult() >= 0 || getMaxResults() > 0) && isReturningTotalCount())
    9797    {
    98       totalCount = HibernateUtil.loadData(Integer.class, getCountHqlQuery(dc));
     98      totalCount = HibernateUtil.loadData(Long.class, getCountHqlQuery(dc));
    9999    }
    100100
    … …  
    113113  {
    114114    enableFilters(dc);
    115     int totalCount = -1;
     115    long totalCount = -1;
    116116   
    117117    // Load the total count if it is requested
    118118    if (isReturningTotalCount())
    119119    {
    120       totalCount = HibernateUtil.loadData(Integer.class, getCountHqlQuery(dc));
     120      totalCount = HibernateUtil.loadData(Long.class, getCountHqlQuery(dc));
    121121    }
    122122

  • trunk/src/core/net/sf/basedb/core/ItemResultIterator.java

    r2304 r2474  
    5656    The total number of items.
    5757  */
    58   private final int totalCount;
     58  private final long totalCount;
    5959 
    6060  /**
    … …  
    6363  private final Item itemType;
    6464
    65   ItemResultIterator(ScrollIterator<? extends BasicData> data, DbControl dc, Class<I> itemClass, int totalCount)
     65  ItemResultIterator(ScrollIterator<? extends BasicData> data, DbControl dc, Class<I> itemClass, long totalCount)
    6666  {
    6767    assert data != null : "data == null";
    … …  
    7979    ---------------------------------
    8080  */
    81   public int getTotalCount()
     81  public long getTotalCount()
    8282  {
    8383    return totalCount;

  • trunk/src/core/net/sf/basedb/core/ItemResultList.java

    r2304 r2474  
    6262  private final Item itemType;
    6363
    64   ItemResultList(List<? extends BasicData> data, DbControl dc, Class<I> itemClass, int totalCount)
     64  ItemResultList(List<? extends BasicData> data, DbControl dc, Class<I> itemClass, long totalCount)
    6565  {
    6666    super(totalCount);

  • trunk/src/core/net/sf/basedb/core/Job.java

    r2470 r2474  
    231231      */
    232232      query.setEntity("job", this.getData());
    233       used = HibernateUtil.loadData(Integer.class, query) > 0;
     233      used = HibernateUtil.loadData(Long.class, query) > 0;
    234234    }
    235235    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/Label.java

    r2382 r2474  
    128128    */
    129129    query.setEntity("label", this.getData());
    130     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     130    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    131131  }
    132132  // -------------------------------------------

  • trunk/src/core/net/sf/basedb/core/MeasuredBioMaterial.java

    r2382 r2474  
    7676    */
    7777    query.setEntity("bioMaterial", this.getData());
    78     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     78    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    7979  }
    8080  /**

  • trunk/src/core/net/sf/basedb/core/Message.java

    r2382 r2474  
    102102    @throws BaseException If there is an error
    103103  */
    104   public static int countUnreadMessages(DbControl dc, User user)
     104  public static long countUnreadMessages(DbControl dc, User user)
    105105    throws BaseException
    106106  {
    … …  
    114114    query.setInteger("user", user == null ? dc.getSessionControl().getLoggedInUserId() : user.getId());
    115115    query.setCacheable(true);
    116     return HibernateUtil.loadData(Integer.class, query);
     116    return HibernateUtil.loadData(Long.class, query);
    117117  }
    118118 

  • trunk/src/core/net/sf/basedb/core/Plate.java

    r2382 r2474  
    179179    */
    180180    query.setEntity("plate", this.getData());
    181     boolean used = HibernateUtil.loadData(Integer.class, query) > 0;
     181    boolean used = HibernateUtil.loadData(Long.class, query) > 0;
    182182    if (!used)
    183183    {
    … …  
    190190      */
    191191      query.setEntity("plate", this.getData());
    192       used = HibernateUtil.loadData(Integer.class, query) > 0;
     192      used = HibernateUtil.loadData(Long.class, query) > 0;
    193193    }
    194194    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/PlateEventType.java

    r2382 r2474  
    208208    */
    209209    query.setEntity("plateEventType", this.getData());
    210     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     210    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    211211  }
    212212  /*

  • trunk/src/core/net/sf/basedb/core/PlateGeometry.java

    r2382 r2474  
    185185    */
    186186    query.setEntity("plateGeometry", this.getData());
    187     boolean used = HibernateUtil.loadData(Integer.class, query) > 0;
     187    boolean used = HibernateUtil.loadData(Long.class, query) > 0;
    188188    if (!used)
    189189    {
    … …  
    196196      */
    197197      query.setEntity("plateGeometry", this.getData());
    198       used = HibernateUtil.loadData(Integer.class, query) > 0;
     198      used = HibernateUtil.loadData(Long.class, query) > 0;
    199199    }
    200200    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/PlateMapping.java

    r2382 r2474  
    165165    */
    166166    query.setEntity("plateMapping", this.getData());
    167     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     167    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    168168  }
    169169  // -------------------------------------------

  • trunk/src/core/net/sf/basedb/core/PlateType.java

    r2382 r2474  
    133133    */
    134134    query.setEntity("plateType", this.getData());
    135     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     135    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    136136  }
    137137  // -------------------------------------------

  • trunk/src/core/net/sf/basedb/core/PluginConfiguration.java

    r2382 r2474  
    199199    */
    200200    query.setEntity("pluginConfiguration", this.getData());
    201     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     201    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    202202  }
    203203  // -------------------------------------------

  • trunk/src/core/net/sf/basedb/core/PluginDefinition.java

    r2382 r2474  
    272272    {
    273273      Object[] o = (Object[])cnt;
    274       result.put(Plugin.MainType.fromValue((Integer)o[0]), (Integer)o[1]);
     274      result.put(Plugin.MainType.fromValue((Integer)o[0]), ((Long)o[1]).intValue());
    275275    }
    276276    return result;
    … …  
    326326    */
    327327    query.setEntity("pluginDefinition", this.getData());
    328     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     328    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    329329  }
    330330  // -------------------------------------------

  • trunk/src/core/net/sf/basedb/core/Protocol.java

    r2382 r2474  
    162162      */
    163163      query.setEntity("protocol", this.getData());
    164       used = HibernateUtil.loadData(Integer.class, query) > 0;
     164      used = HibernateUtil.loadData(Long.class, query) > 0;
    165165    }
    166166    if (!used)
    … …  
    173173      */
    174174      query.setEntity("protocol", this.getData());
    175       used = HibernateUtil.loadData(Integer.class, query) > 0;
     175      used = HibernateUtil.loadData(Long.class, query) > 0;
    176176    }
    177177    if (!used)
    … …  
    184184      */
    185185      query.setEntity("protocol", this.getData());
    186       used = HibernateUtil.loadData(Integer.class, query) > 0;
     186      used = HibernateUtil.loadData(Long.class, query) > 0;
    187187    }
    188188    if (!used)
    … …  
    195195      */
    196196      query.setEntity("protocol", this.getData());
    197       used = HibernateUtil.loadData(Integer.class, query) > 0;
     197      used = HibernateUtil.loadData(Long.class, query) > 0;
    198198    }
    199199    if (!used)
    … …  
    206206      */
    207207      query.setEntity("protocol", this.getData());
    208       used = HibernateUtil.loadData(Integer.class, query) > 0;
     208      used = HibernateUtil.loadData(Long.class, query) > 0;
    209209    }
    210210    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/ProtocolType.java

    r2441 r2474  
    244244    */
    245245    query.setEntity("protocolType", this.getData());
    246     boolean used = HibernateUtil.loadData(Integer.class, query) > 0;
     246    boolean used = HibernateUtil.loadData(Long.class, query) > 0;
    247247    if (!used)
    248248    {
    … …  
    254254      */
    255255      query.setEntity("protocolType", this.getData());
    256       used = HibernateUtil.loadData(Integer.class, query) > 0;
     256      used = HibernateUtil.loadData(Long.class, query) > 0;
    257257    }
    258258    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/Quota.java

    r2382 r2474  
    254254     */
    255255    query.setEntity("quota", this.getData());
    256     used = HibernateUtil.loadData(Integer.class, query) > 0;
     256    used = HibernateUtil.loadData(Long.class, query) > 0;
    257257    if (!used)
    258258    {
    … …  
    264264      */
    265265      query.setEntity("quota", this.getData());
    266       used = HibernateUtil.loadData(Integer.class, query) > 0;
     266      used = HibernateUtil.loadData(Long.class, query) > 0;
    267267    }
    268268    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/RawBioAssay.java

    r2420 r2474  
    218218    */
    219219    query.setEntity("rawBioAssay", this.getData());
    220     boolean used = HibernateUtil.loadData(Integer.class, query) > 0;
     220    boolean used = HibernateUtil.loadData(Long.class, query) > 0;
    221221    if (!used)
    222222    {
    … …  
    229229      */
    230230      query.setEntity("rawBioAssay", this.getData());
    231       used = HibernateUtil.loadData(Integer.class, query) > 0;
     231      used = HibernateUtil.loadData(Long.class, query) > 0;
    232232    }
    233233    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/RawDataBatcher.java

    r2459 r2474  
    161161    if (arrayDesign != null && arrayDesign.getHasFeatures())
    162162    {
    163       preloaded = new HashMap<FeatureCoordinate, FeatureData>(rawBioAssay.getArrayDesign().getFeatures().count(dc));
     163      preloaded = new HashMap<FeatureCoordinate, FeatureData>((int)rawBioAssay.getArrayDesign().getFeatures().count(dc));
    164164      org.hibernate.Query preloadFeatures = HibernateUtil.getPredefinedQuery(dc.getHibernateSession(), "PRELOAD_FEATURES");
    165165      /*

  • trunk/src/core/net/sf/basedb/core/ReporterScoreQuery.java

    r2302 r2474  
    5757  {
    5858    enableFilters(dc);
    59     int totalCount = -1;
     59    long totalCount = -1;
    6060   
    6161    // Load the total count if it is requested
    6262    if (isReturningTotalCount())
    6363    {
    64       totalCount = HibernateUtil.loadData(Integer.class, getCountHqlQuery(dc));
     64      totalCount = HibernateUtil.loadData(Long.class, getCountHqlQuery(dc));
    6565    }
    6666

  • trunk/src/core/net/sf/basedb/core/ReporterScoreResultIterator.java

    r2150 r2474  
    5353    The total number of items.
    5454  */
    55   private final int totalCount;
     55  private final long totalCount;
    5656 
    5757  /**
    … …  
    6060  private final Item itemType;
    6161
    62   ReporterScoreResultIterator(ScrollIterator<ReporterListScoreData> data, DbControl dc, int totalCount)
     62  ReporterScoreResultIterator(ScrollIterator<ReporterListScoreData> data, DbControl dc, long totalCount)
    6363  {
    6464    assert data != null : "data == null";
    … …  
    7474    ---------------------------------
    7575  */
    76   public int getTotalCount()
     76  public long getTotalCount()
    7777  {
    7878    return totalCount;

  • trunk/src/core/net/sf/basedb/core/ReporterType.java

    r2382 r2474  
    182182    */
    183183    query.setEntity("reporterType", this.getData());
    184     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     184    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    185185  }
    186186

  • trunk/src/core/net/sf/basedb/core/Sample.java

    r2421 r2474  
    235235    @return The number of extracts
    236236   */
    237   public int countExtracts()
     237  public long countExtracts()
    238238    throws BaseException
    239239  {
    … …  
    246246    */
    247247    query.setEntity("sample", this.getData());
    248     return HibernateUtil.loadData(Integer.class, query);
     248    return HibernateUtil.loadData(Long.class, query);
    249249  }
    250250}

  • trunk/src/core/net/sf/basedb/core/Scan.java

    r2413 r2474  
    306306    @return The number of raw bioassays
    307307   */
    308   public int countRawBioAssays()
     308  public long countRawBioAssays()
    309309    throws BaseException
    310310  {
    … …  
    317317    */
    318318    query.setEntity("scan", this.getData());
    319     return HibernateUtil.loadData(Integer.class, query);
     319    return HibernateUtil.loadData(Long.class, query);
    320320  }
    321321
    … …  
    348348    @return The number of images
    349349   */
    350   public int countImages()
     350  public long countImages()
    351351    throws BaseException
    352352  {
    … …  
    359359    */
    360360    query.setEntity("scan", this.getData());
    361     return HibernateUtil.loadData(Integer.class, query);
     361    return HibernateUtil.loadData(Long.class, query);
    362362  }
    363363

  • trunk/src/core/net/sf/basedb/core/Software.java

    r2382 r2474  
    145145    */
    146146    query.setEntity("software", this.getData());
    147     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     147    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    148148  }
    149149  // -------------------------------------------

  • trunk/src/core/net/sf/basedb/core/SoftwareType.java

    r2442 r2474  
    175175    */
    176176    query.setEntity("softwaretype", this.getData());
    177     return HibernateUtil.loadData(Integer.class, query) > 0 || super.isUsed();
     177    return HibernateUtil.loadData(Long.class, query) > 0 || super.isUsed();
    178178  }
    179179 

  • trunk/src/core/net/sf/basedb/core/UnmodifiableResultList.java

    r2218 r2474  
    4040  implements ResultList<T>
    4141{
    42   private final int totalCount;
     42  private final long totalCount;
    4343
    44   public UnmodifiableResultList(List<T> items, int totalCount)
     44  public UnmodifiableResultList(List<T> items, long totalCount)
    4545  {
    4646    super(items);
    … …  
    5252    -------------------------------------------
    5353  */
    54   public int getTotalCount()
     54  public long getTotalCount()
    5555  {
    5656    return totalCount;

  • trunk/src/core/net/sf/basedb/core/Well.java

    r2382 r2474  
    180180    */
    181181    query.setEntity("well", this.getData());
    182     boolean used = HibernateUtil.loadData(Integer.class, query) > 0;
     182    boolean used = HibernateUtil.loadData(Long.class, query) > 0;
    183183    if (!used)
    184184    {
    … …  
    190190      */
    191191      query.setEntity("well", this.getData());
    192       used = HibernateUtil.loadData(Integer.class, query) > 0;
     192      used = HibernateUtil.loadData(Long.class, query) > 0;
    193193    }
    194194    return used || super.isUsed();

  • trunk/src/core/net/sf/basedb/core/query/Query.java

    r2304 r2474  
    325325    @throws BaseException If there is an error
    326326  */
    327   public int count(DbControl dc)
     327  public long count(DbControl dc)
    328328    throws BaseException;
    329329

  • trunk/src/core/net/sf/basedb/core/query/QueryResult.java

    r2304 r2474  
    4444    @see Query#setReturnTotalCount(boolean)
    4545  */
    46   public int getTotalCount();
     46  public long getTotalCount();
    4747}

  • trunk/src/core/net/sf/basedb/util/jep/ChannelFunction.java

    r2304 r2474  
    142142    this.numParameters = n;
    143143  }
     144  public boolean checkNumberOfParameters(int n)
     145  {
     146    return n == 1;
     147  }
    144148  @SuppressWarnings({"unchecked"})
    145149  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/jep/InReporterListFunction.java

    r2399 r2474  
    116116    this.numParameters = n;
    117117  }
     118  public boolean checkNumberOfParameters(int n)
     119  {
     120    return n == 1;
     121  }
    118122  @SuppressWarnings({"unchecked"})
    119123  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/jep/Log2Function.java

    r2317 r2474  
    120120  public void setCurNumberOfParameters(int n)
    121121  {}
    122  
     122  public boolean checkNumberOfParameters(int n)
     123  {
     124    return n == 1;
     125  }
    123126  @SuppressWarnings({"unchecked"})
    124127  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/jep/MeanFunction.java

    r2304 r2474  
    126126    this.numParameters = n;
    127127  }
     128  public boolean checkNumberOfParameters(int n)
     129  {
     130    return n == 1;
     131  }
    128132  @SuppressWarnings({"unchecked"})
    129133  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/jep/NotInReporterListFunction.java

    r2399 r2474  
    116116    this.numParameters = n;
    117117  }
     118  public boolean checkNumberOfParameters(int n)
     119  {
     120    return n == 1;
     121  }
    118122  @SuppressWarnings({"unchecked"})
    119123  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/jep/RawFunction.java

    r2304 r2474  
    151151    this.numParameters = n;
    152152  }
     153  public boolean checkNumberOfParameters(int n)
     154  {
     155    return n == 1;
     156  }
    153157  @SuppressWarnings({"unchecked"})
    154158  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/jep/ReporterFunction.java

    r2304 r2474  
    145145    this.numParameters = n;
    146146  }
     147  public boolean checkNumberOfParameters(int n)
     148  {
     149    return n == 1;
     150  }
    147151  @SuppressWarnings({"unchecked"})
    148152  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/jep/ScoreFunction.java

    r2399 r2474  
    130130    this.numParameters = n;
    131131  }
     132  public boolean checkNumberOfParameters(int n)
     133  {
     134    return n == 1;
     135  }
    132136  @SuppressWarnings({"unchecked"})
    133137  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/parser/ColFunction.java

    r2317 r2474  
    8989  public void setCurNumberOfParameters(int n)
    9090  {}
    91 
     91  public boolean checkNumberOfParameters(int n)
     92  {
     93    return n == 1;
     94  }
    9295  @SuppressWarnings({"unchecked"})
    9396  public void run(Stack stack)

  • trunk/src/core/net/sf/basedb/util/plot/HistogramPlot.java

    r2327 r2474  
    117117  {
    118118    final boolean isCount = yAggregate == YAggregate.COUNT;
    119     float[] xValues = new float[data.getTotalCount()];
    120     float[] yValues = isCount ? null : new float[data.getTotalCount()];
     119    float[] xValues = new float[(int)data.getTotalCount()];
     120    float[] yValues = isCount ? null : new float[(int)data.getTotalCount()];
    121121    int i = 0;
    122122
    … …  
    178178    Map<Integer, TempSeries> series = new HashMap<Integer, TempSeries>(annotations.size());
    179179    List<TempSeries> tempSeries = new ArrayList<TempSeries>(annotations.size());
    180     int meanCount = data.getTotalCount() / annotations.size();
     180    int meanCount = (int)(data.getTotalCount() / annotations.size());
    181181    for (PlotAnnotation pa : annotations)
    182182    {

  • trunk/src/install/includes

    r2341 r2474  
    4545CP=$CP:$WEBINF/lib/commons-logging-1.0.4.jar
    4646CP=$CP:$WEBINF/lib/dom4j-1.6.1.jar
    47 CP=$CP:$WEBINF/lib/ehcache-1.1.jar
     47CP=$CP:$WEBINF/lib/ehcache-1.2.jar
    4848CP=$CP:$WEBINF/lib/jta.jar
    49 CP=$CP:$WEBINF/lib/antlr-2.7.6rc1.jar
     49CP=$CP:$WEBINF/lib/antlr-2.7.6.jar
    5050
    5151# Log4j logging system (also used by Hibernate)
    52 CP=$CP:$WEBINF/lib/log4j-1.2.11.jar
     52CP=$CP:$WEBINF/lib/log4j-1.2.13.jar
    5353
    5454# C3P0 Connection pool manager
    … …  
    5656
    5757# MySQL JDBC driver
    58 CP=$CP:$WEBINF/lib/mysql-connector-java-3.1.12-bin.jar
     58CP=$CP:$WEBINF/lib/mysql-connector-java-3.1.13-bin.jar
    5959
    6060# Postgres JDBC driver
    61 CP=$CP:$WEBINF/lib/postgresql-8.0-313.jdbc3.jar
    62 
    63 # Oracle JDBC driver (experimental)
    64 CP=$CP:$WEBINF/lib/ojdbc14.jar
     61CP=$CP:$WEBINF/lib/postgresql-8.1-407.jdbc3.jar
    6562
    6663# JDOM and Xerces XML parser
    … …  
    6865CP=$CP:$WEBINF/lib/jaxen-1.1-beta-7.jar
    6966CP=$CP:$WEBINF/lib/saxpath.jar
    70 CP=$CP:$WEBINF/lib/xerces-2.6.2.jar
     67CP=$CP:$WEBINF/lib/xerces-2.8.0.jar
    7168CP=$CP:$WEBINF/lib/xml-apis.jar
    7269
    … …  
    7774
    7875# Java Math Expression Parser
    79 CP=$CP:$WEBINF/lib/jep-2.3.0.jar
     76CP=$CP:$WEBINF/lib/jep-2.4.0.jar
    8077
    8178# JFreeChart
    82 CP=$CP:$WEBINF/lib/jfreechart-1.0.0.jar
     79CP=$CP:$WEBINF/lib/jfreechart-1.0.1.jar
    8380CP=$CP:$WEBINF/lib/jcommon-1.0.0.jar
    8481

  • trunk/src/install/set_classpath.bat

    r2341 r2474  
    4444SET CP=%CP%;%WEBINF%/lib/commons-logging-1.0.4.jar
    4545SET CP=%CP%;%WEBINF%/lib/dom4j-1.6.1.jar
    46 SET CP=%CP%;%WEBINF%/lib/ehcache-1.1.jar
     46SET CP=%CP%;%WEBINF%/lib/ehcache-1.2.jar
    4747SET CP=%CP%;%WEBINF%/lib/jta.jar
    48 SET CP=%CP%;%WEBINF%/lib/antlr-2.7.6rc1.jar
     48SET CP=%CP%;%WEBINF%/lib/antlr-2.7.6.jar
    4949
    5050REM Log4j (also used by Hibernate)
    51 SET CP=%CP%;%WEBINF%/lib/log4j-1.2.11.jar
     51SET CP=%CP%;%WEBINF%/lib/log4j-1.2.13.jar
    5252
    5353REM C3P0 Connection pool manager
    … …  
    5555
    5656REM MySQL JDBC driver
    57 SET CP=%CP%;%WEBINF%/lib/mysql-connector-java-3.1.12-bin.jar
     57SET CP=%CP%;%WEBINF%/lib/mysql-connector-java-3.1.13-bin.jar
    5858
    5959REM Postgres JDBC driver
    60 SET CP=%CP%;%WEBINF%/lib/postgresql-8.0-313.jdbc3.jar
    61 
    62 REM Oracle JDBC driver (experimental)
    63 SET CP=%CP%;%WEBINF%/lib/ojdbc14.jar
     60SET CP=%CP%;%WEBINF%/lib/postgresql-8.1-407.jdbc3.jar
    6461
    6562REM JDOM and Xerces XML parser
    … …  
    6764SET CP=%CP%;%WEBINF%/lib/jaxen-1.1-beta-7.jar
    6865SET CP=%CP%;%WEBINF%/lib/saxpath.jar
    69 SET CP=%CP%;%WEBINF%/lib/xerces-2.6.2.jar
     66SET CP=%CP%;%WEBINF%/lib/xerces-2.8.0.jar
    7067SET CP=%CP%;%WEBINF%/lib/xml-apis.jar
    7168
    … …  
    7673
    7774REM Java Math Expression Parser
    78 SET CP=%CP%;%WEBINF%/lib/jep-2.3.0.jar
     75SET CP=%CP%;%WEBINF%/lib/jep-2.4.0.jar
    7976
    8077REM JFreeChart
    81 SET CP=%CP%:%WEBINF%/lib/jfreechart-1.0.0.jar
     78SET CP=%CP%:%WEBINF%/lib/jfreechart-1.0.1.jar
    8279SET CP=%CP%:%WEBINF%/lib/jcommon-1.0.0.jar
    8380

  • trunk/src/plugins/core/net/sf/basedb/plugins/HelpExporter.java

    r2439 r2474  
    358358  {
    359359   
    360     int nrOfItem = query.count(dc);
     360    long nrOfItem = query.count(dc); 
    361361    if (nrOfItem > 0)
    362362    {

  • trunk/src/plugins/core/net/sf/basedb/plugins/LowessNormalization.java

    r2462 r2474  
    235235        query = bioAssaySet.getSpotData();
    236236        query.restrict(intensityRestriction);
    237         int numSpots = query.count(dc);
     237        long numSpots = query.count(dc);
    238238        int normalizedSpots = 0;
    239         if (progress != null) progress.display(normalizedSpots / numSpots * 100, normalizedSpots + " spots normalized");
     239        if (progress != null) progress.display((int)(normalizedSpots / numSpots * 100), normalizedSpots + " spots normalized");
    240240       
    241241        List<BioAssay> assays = bioAssaySet.getBioAssays().list(dc);
    … …  
    310310           
    311311            normalizedSpots += smoothCurve.size();
    312             if (progress != null) progress.display((normalizedSpots * 100) / numSpots, normalizedSpots + " spots normalized");
     312            if (progress != null) progress.display((int)((normalizedSpots * 100) / numSpots), normalizedSpots + " spots normalized");
    313313          }
    314314        }

  • trunk/src/plugins/core/net/sf/basedb/plugins/MedianRatioNormalization.java

    r2462 r2474  
    210210        query = bioAssaySet.getSpotData();
    211211        query.restrict(intensityRestriction);
    212         int numSpots = query.count(dc);
     212        long numSpots = query.count(dc);
    213213        int normalizedSpots = 0;
    214         progress.display(normalizedSpots / numSpots * 100, normalizedSpots + " spots normalized");
     214        progress.display((int)(normalizedSpots / numSpots * 100), normalizedSpots + " spots normalized");
    215215
    216216        List<BioAssay> assays = bioAssaySet.getBioAssays().list(dc);
    … …  
    245245            query.order(Orders.asc(Expressions.selected(ratio)));
    246246           
    247             int count = query.count(dc);
     247            int count = (int)query.count(dc);
    248248            if (count <= 0) continue;
    249249            int lowCount = (int) Math.floor(count * lowExclude / 100);
    … …  
    297297              batcher.insert(r.getShort(column), r.getInt(position), r.getFloat(ch1), r.getFloat(ch2));
    298298              normalizedSpots++;
    299               progress.display((normalizedSpots * 100) / numSpots, normalizedSpots + " spots normalized");
     299              progress.display((int)(normalizedSpots * 100 / numSpots), normalizedSpots + " spots normalized");
    300300            }
    301301          }

  • trunk/src/test/run.bat

    r2340 r2474  
    3838SET CP=%CP%;../../lib/dist/commons-logging-1.0.4.jar
    3939SET CP=%CP%;../../lib/dist/dom4j-1.6.1.jar
    40 SET CP=%CP%;../../lib/dist/ehcache-1.1.jar
     40SET CP=%CP%;../../lib/dist/ehcache-1.2.jar
    4141SET CP=%CP%;../../lib/dist/jta.jar
    42 SET CP=%CP%;../../lib/dist/antlr-2.7.6rc1.jar
     42SET CP=%CP%;../../lib/dist/antlr-2.7.6.jar
    4343
    4444REM Log4j (also used by Hibernate)
    45 SET CP=%CP%;../../lib/compile/log4j-1.2.11.jar
     45SET CP=%CP%;../../lib/compile/log4j-1.2.13.jar
    4646
    4747REM C3P0 Connection pool manager
    … …  
    4949
    5050REM MySQL JDBC driver
    51 SET CP=%CP%;../../lib/dist/mysql-connector-java-3.1.12-bin.jar
     51SET CP=%CP%;../../lib/dist/mysql-connector-java-3.1.13-bin.jar
    5252
    5353REM Postgres JDBC driver
    54 SET CP=%CP%;../../lib/dist/postgresql-8.0-313.jdbc3.jar
    55 
    56 REM Oracle JDBC driver (experimental)
    57 SET CP=%CP%;../../lib/dist/ojdbc14.jar
     54SET CP=%CP%;../../lib/dist/postgresql-8.1-407.jdbc3.jar
    5855
    5956REM JDOM and Xerces XML parser
    … …  
    6158SET CP=%CP%;../../lib/dist/jaxen-1.1-beta-7.jar
    6259SET CP=%CP%;../../lib/dist/saxpath.jar
    63 SET CP=%CP%;../../lib/dist/xerces-2.6.2.jar
     60SET CP=%CP%;../../lib/dist/xerces-2.8.0.jar
    6461SET CP=%CP%;../../lib/dist/xml-apis.jar
    6562
    … …  
    7067
    7168REM Java Math Expression Parser
    72 SET CP=%CP%;../../lib/compile/jep-2.3.0.jar
     69SET CP=%CP%;../../lib/compile/jep-2.4.0.jar
    7370
    7471REM JFreeChart
    75 SET CP=%CP%:../../lib/compile/jfreechart-1.0.0.jar
     72SET CP=%CP%:../../lib/compile/jfreechart-1.0.1.jar
    7673SET CP=%CP%:../../lib/compile/jcommon-1.0.0.jar
    7774

  • trunk/src/test/set_classpath.sh

    r2340 r2474  
    3939CP=$CP:$LIB_DIST/commons-logging-1.0.4.jar
    4040CP=$CP:$LIB_DIST/dom4j-1.6.1.jar
    41 CP=$CP:$LIB_DIST/ehcache-1.1.jar
     41CP=$CP:$LIB_DIST/ehcache-1.2.jar
    4242CP=$CP:$LIB_DIST/jta.jar
    43 CP=$CP:$LIB_DIST/antlr-2.7.6rc1.jar
     43CP=$CP:$LIB_DIST/antlr-2.7.6.jar
    4444
    4545# Log4j logging system (also used by Hibernate)
    46 CP=$CP:$LIB_COMPILE/log4j-1.2.11.jar
     46CP=$CP:$LIB_COMPILE/log4j-1.2.13.jar
    4747
    4848# C3P0 Connection pool manager
    … …  
    5050
    5151# MySQL JDBC driver
    52 CP=$CP:$LIB_DIST/mysql-connector-java-3.1.12-bin.jar
     52CP=$CP:$LIB_DIST/mysql-connector-java-3.1.13-bin.jar
    5353
    5454# Postgres JDBC driver
    55 CP=$CP:$LIB_DIST/postgresql-8.0-313.jdbc3.jar
    56 
    57 # Oracle JDBC driver (experimental)
    58 CP=$CP:$LIB_DIST/ojdbc14.jar
     55CP=$CP:$LIB_DIST/postgresql-8.1-407.jdbc3.jar
    5956
    6057# JDOM and Xerces XML parser
    … …  
    6259CP=$CP:$LIB_DIST/jaxen-1.1-beta-7.jar
    6360CP=$CP:$LIB_DIST/saxpath.jar
    64 CP=$CP:$LIB_DIST/xerces-2.6.2.jar
     61CP=$CP:$LIB_DIST/xerces-2.8.0.jar
    6562CP=$CP:$LIB_DIST/xml-apis.jar
    6663
    … …  
    7168
    7269# Java Math Expression Parser
    73 CP=$CP:$LIB_COMPILE/jep-2.3.0.jar
     70CP=$CP:$LIB_COMPILE/jep-2.4.0.jar
    7471
    7572# JFreeChart
    76 CP=$CP:$LIB_COMPILE/jfreechart-1.0.0.jar
     73CP=$CP:$LIB_COMPILE/jfreechart-1.0.1.jar
    7774CP=$CP:$LIB_COMPILE/jcommon-1.0.0.jar
    7875

  • trunk/www/footnote.jsp

    r2304 r2474  
    5656  dc = sc.newDbControl();
    5757}
    58 int numNewMessages = 0;
     58long numNewMessages = 0;
    5959try
    6060{

  • trunk/www/lims/arraybatches/list_batches.jsp

    r2449 r2474  
    479479                  try
    480480                  {
    481                     out.write(slideQuery.count(dc));
     481                    %>
     482                    <%=slideQuery.count(dc)%>
     483                    <%
    482484                  }
    483485                  catch (Throwable t)

  • trunk/www/lims/arrayslides/edit_slide.jsp

    r2456 r2474  
    8484    if (currentArrayBatch != null)
    8585    {
    86       maxIndex = currentArrayBatch.getArraySlides().count(dc);
     86      maxIndex = (int)currentArrayBatch.getArraySlides().count(dc);
    8787    }
    8888  }

  • trunk/www/lims/platetypes/eventtypes/edit_eventtype.jsp

    r2456 r2474  
    8181      currentProtocolType = Base.getFirstMatching(dc, ProtocolType.getQuery(), "name", cc.getPropertyFilter("protocolType.name"));
    8282    }
    83     maxOrdinal = plateType.getEventTypes().count(dc);
     83    maxOrdinal = (int)plateType.getEventTypes().count(dc);
    8484  }
    8585  else

  • trunk/www/views/experiments/bioassaysets/create_filter.jsp

    r2424 r2474  
    7070  BioAssaySet bioAssaySet = BioAssaySet.getById(dc, itemId);
    7171
    72   int numBioAssays = bioAssaySet.getBioAssays().count(dc);
     72  long numBioAssays = bioAssaySet.getBioAssays().count(dc);
    7373 
    7474  RawDataType rdt = bioAssaySet.getRawDataType();
Note: See TracChangeset for help on using the changeset viewer.