Changeset 2701


Ignore:
Timestamp:
04/27/07 13:26:22 (13 years ago)
Author:
curtis
Message:

Whitespace.

Location:
trunk/loci/formats
Files:
47 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/ChannelMerger.java

    r2695 r2701  
    5151  /* @see IFormatReader#getImageCount() */ 
    5252  public int getImageCount() { 
    53     FormatTools.assertId(getCurrentFile(), true, 2);  
     53    FormatTools.assertId(getCurrentFile(), true, 2); 
    5454    int no = reader.getImageCount(); 
    5555    if (canMerge()) no /= getSizeC(); 
     
    5959  /* @see IFormatReader#getDimensionOrder() */ 
    6060  public String getDimensionOrder() { 
    61     FormatTools.assertId(getCurrentFile(), true, 2);  
     61    FormatTools.assertId(getCurrentFile(), true, 2); 
    6262    String order = reader.getDimensionOrder(); 
    6363    if (canMerge()) { 
     
    7575  /* @see IFormatReader#isRGB() */ 
    7676  public boolean isRGB() { 
    77     FormatTools.assertId(getCurrentFile(), true, 2);  
     77    FormatTools.assertId(getCurrentFile(), true, 2); 
    7878    return canMerge() || reader.isRGB(); 
    7979  } 
     
    8181  /* @see IFormatReader#openImage(int) */ 
    8282  public BufferedImage openImage(int no) throws FormatException, IOException { 
    83     FormatTools.assertId(getCurrentFile(), true, 2);  
     83    FormatTools.assertId(getCurrentFile(), true, 2); 
    8484    if (!canMerge()) return super.openImage(no); 
    8585    int sizeC = getSizeC(); 
     
    104104   */ 
    105105  public byte[] openBytes(int no) throws FormatException, IOException { 
    106     FormatTools.assertId(getCurrentFile(), true, 2);  
     106    FormatTools.assertId(getCurrentFile(), true, 2); 
    107107    if (!canMerge()) return super.openBytes(no); 
    108108    int sizeC = getSizeC(); 
     
    128128    throws FormatException, IOException 
    129129  { 
    130     FormatTools.assertId(getCurrentFile(), true, 2);  
     130    FormatTools.assertId(getCurrentFile(), true, 2); 
    131131    if (!canMerge()) return super.openThumbImage(no); 
    132132    return ImageTools.scale(openImage(no), getThumbSizeX(), 
  • trunk/loci/formats/ChannelSeparator.java

    r2695 r2701  
    5454  /* @see IFormatReader#getImageCount() */ 
    5555  public int getImageCount() { 
    56     FormatTools.assertId(getCurrentFile(), true, 2);  
     56    FormatTools.assertId(getCurrentFile(), true, 2); 
    5757    return reader.isRGB() ? 
    5858      (getSizeC() / reader.getEffectiveSizeC()) * reader.getImageCount() : 
     
    6262  /* @see IFormatReader#getDimensionOrder() */ 
    6363  public String getDimensionOrder() { 
    64     FormatTools.assertId(getCurrentFile(), true, 2);  
     64    FormatTools.assertId(getCurrentFile(), true, 2); 
    6565    String order = super.getDimensionOrder(); 
    6666    if (reader.isRGB()) { 
     
    7474 
    7575  /* @see IFormatReader#isRGB() */ 
    76   public boolean isRGB() {  
    77     FormatTools.assertId(getCurrentFile(), true, 2);  
    78     return false;  
     76  public boolean isRGB() { 
     77    FormatTools.assertId(getCurrentFile(), true, 2); 
     78    return false; 
    7979  } 
    8080 
    8181  /* @see IFormatReader#openImage(int) */ 
    8282  public BufferedImage openImage(int no) throws FormatException, IOException { 
    83     FormatTools.assertId(getCurrentFile(), true, 2);  
     83    FormatTools.assertId(getCurrentFile(), true, 2); 
    8484    if (no < 0 || no >= getImageCount()) { 
    8585      throw new FormatException("Invalid image number: " + no); 
     
    124124  /* @see IFormatReader#openBytes(int) */ 
    125125  public byte[] openBytes(int no) throws FormatException, IOException { 
    126     FormatTools.assertId(getCurrentFile(), true, 2);  
     126    FormatTools.assertId(getCurrentFile(), true, 2); 
    127127    if (no < 0 || no >= getImageCount()) { 
    128128      throw new FormatException("Invalid image number: " + no); 
     
    151151    throws FormatException, IOException 
    152152  { 
    153     FormatTools.assertId(getCurrentFile(), true, 2);  
     153    FormatTools.assertId(getCurrentFile(), true, 2); 
    154154    return ImageTools.scale(openImage(no), getThumbSizeX(), 
    155155      getThumbSizeY(), true); 
  • trunk/loci/formats/DimensionSwapper.java

    r2695 r2701  
    4040  /* @see loci.formats.IFormatReader#getSizeX() */ 
    4141  public int getSizeX() { 
    42     FormatTools.assertId(getCurrentFile(), true, 2);  
     42    FormatTools.assertId(getCurrentFile(), true, 2); 
    4343    return getCoreMetadata().sizeX[getSeries()]; 
    4444  } 
     
    4646  /* @see loci.formats.IFormatReader#getSizeY() */ 
    4747  public int getSizeY() { 
    48     FormatTools.assertId(getCurrentFile(), true, 2);  
     48    FormatTools.assertId(getCurrentFile(), true, 2); 
    4949    return getCoreMetadata().sizeY[getSeries()]; 
    5050  } 
     
    5252  /* @see loci.formats.IFormatReader#getSizeZ() */ 
    5353  public int getSizeZ() { 
    54     FormatTools.assertId(getCurrentFile(), true, 2);  
     54    FormatTools.assertId(getCurrentFile(), true, 2); 
    5555    return getCoreMetadata().sizeZ[getSeries()]; 
    5656  } 
     
    5858  /* @see loci.formats.IFormatReader#getSizeC() */ 
    5959  public int getSizeC() { 
    60     FormatTools.assertId(getCurrentFile(), true, 2);  
     60    FormatTools.assertId(getCurrentFile(), true, 2); 
    6161    return getCoreMetadata().sizeC[getSeries()]; 
    6262  } 
     
    6464  /* @see loci.formats.IFormatReader#getSizeT() */ 
    6565  public int getSizeT() { 
    66     FormatTools.assertId(getCurrentFile(), true, 2);  
     66    FormatTools.assertId(getCurrentFile(), true, 2); 
    6767    return getCoreMetadata().sizeT[getSeries()]; 
    6868  } 
     
    7070  /* @see loci.formats.IFormatReader#getDimensionOrder() */ 
    7171  public String getDimensionOrder() { 
    72     FormatTools.assertId(getCurrentFile(), true, 2);  
     72    FormatTools.assertId(getCurrentFile(), true, 2); 
    7373    return getCoreMetadata().currentOrder[getSeries()]; 
    7474  } 
     
    8383   */ 
    8484  public void swapDimensions(String order) { 
    85     FormatTools.assertId(getCurrentFile(), true, 2);  
     85    FormatTools.assertId(getCurrentFile(), true, 2); 
    8686    if (order == null) return; 
    8787 
  • trunk/loci/formats/FileStitcher.java

    r2698 r2701  
    135135   */ 
    136136  public int[] getAxisTypes() { 
    137     FormatTools.assertId(currentId, true, 2);  
     137    FormatTools.assertId(currentId, true, 2); 
    138138    return ag[getSeries()].getAxisTypes(); 
    139139  } 
     
    149149   */ 
    150150  public void setAxisTypes(int[] axes) throws FormatException { 
    151     FormatTools.assertId(currentId, true, 2);  
     151    FormatTools.assertId(currentId, true, 2); 
    152152    ag[getSeries()].setAxisTypes(axes); 
    153153    computeAxisLengths(); 
     
    156156  /** Gets the file pattern object used to build the list of files. */ 
    157157  public FilePattern getFilePattern() { 
    158     FormatTools.assertId(currentId, true, 2);  
     158    FormatTools.assertId(currentId, true, 2); 
    159159    return fp; 
    160160  } 
     
    165165   */ 
    166166  public AxisGuesser getAxisGuesser() { 
    167     FormatTools.assertId(currentId, true, 2);  
     167    FormatTools.assertId(currentId, true, 2); 
    168168    return ag[getSeries()]; 
    169169  } 
     
    174174   */ 
    175175  public FilePattern findPattern(String id) { 
    176     FormatTools.assertId(currentId, true, 2);  
     176    FormatTools.assertId(currentId, true, 2); 
    177177    if (!patternIds) { 
    178178      // find the containing pattern 
     
    219219  /* @see IFormatReader#getImageCount() */ 
    220220  public int getImageCount() { 
    221     FormatTools.assertId(currentId, true, 2);  
     221    FormatTools.assertId(currentId, true, 2); 
    222222    return core.imageCount[getSeries()]; 
    223223  } 
     
    225225  /* @see IFormatReader#isRGB() */ 
    226226  public boolean isRGB() { 
    227     FormatTools.assertId(currentId, true, 2);  
     227    FormatTools.assertId(currentId, true, 2); 
    228228    return core.rgb[getSeries()]; 
    229229  } 
     
    231231  /* @see IFormatReader#getSizeX() */ 
    232232  public int getSizeX() { 
    233     FormatTools.assertId(currentId, true, 2);  
     233    FormatTools.assertId(currentId, true, 2); 
    234234    return core.sizeX[getSeries()]; 
    235235  } 
     
    237237  /* @see IFormatReader#getSizeY() */ 
    238238  public int getSizeY() { 
    239     FormatTools.assertId(currentId, true, 2);  
     239    FormatTools.assertId(currentId, true, 2); 
    240240    return core.sizeY[getSeries()]; 
    241241  } 
     
    243243  /* @see IFormatReader#getSizeZ() */ 
    244244  public int getSizeZ() { 
    245     FormatTools.assertId(currentId, true, 2);  
     245    FormatTools.assertId(currentId, true, 2); 
    246246    return core.sizeZ[getSeries()]; 
    247247  } 
     
    249249  /* @see IFormatReader#getSizeC() */ 
    250250  public int getSizeC() { 
    251     FormatTools.assertId(currentId, true, 2);  
     251    FormatTools.assertId(currentId, true, 2); 
    252252    return core.sizeC[getSeries()]; 
    253253  } 
     
    255255  /* @see IFormatReader#getSizeT() */ 
    256256  public int getSizeT() { 
    257     FormatTools.assertId(currentId, true, 2);  
     257    FormatTools.assertId(currentId, true, 2); 
    258258    return core.sizeT[getSeries()]; 
    259259  } 
     
    261261  /* @see IFormatReader#getPixelType() */ 
    262262  public int getPixelType() { 
    263     FormatTools.assertId(currentId, true, 2);  
     263    FormatTools.assertId(currentId, true, 2); 
    264264    return core.pixelType[getSeries()]; 
    265265  } 
     
    267267  /* @see IFormatReader#getEffectiveSizeC() */ 
    268268  public int getEffectiveSizeC() { 
    269     FormatTools.assertId(currentId, true, 2);  
     269    FormatTools.assertId(currentId, true, 2); 
    270270    return getImageCount() / (getSizeZ() * getSizeT()); 
    271271  } 
     
    273273  /* @see IFormatReader#getRGBChannelCount() */ 
    274274  public int getRGBChannelCount() { 
    275     FormatTools.assertId(currentId, true, 2);  
     275    FormatTools.assertId(currentId, true, 2); 
    276276    return getSizeC() / getEffectiveSizeC(); 
    277277  } 
     
    279279  /* @see IFormatReader#getChannelDimLengths() */ 
    280280  public int[] getChannelDimLengths() { 
    281     FormatTools.assertId(currentId, true, 2);  
     281    FormatTools.assertId(currentId, true, 2); 
    282282    int sno = getSeries(); 
    283283    int len = lenC[sno].length; 
     
    289289  /* @see IFormatReader#getChannelDimTypes() */ 
    290290  public String[] getChannelDimTypes() { 
    291     FormatTools.assertId(currentId, true, 2);  
     291    FormatTools.assertId(currentId, true, 2); 
    292292    int sno = getSeries(); 
    293293    int len = lenC[sno].length; 
     
    299299  /* @see IFormatReader#getThumbSizeX() */ 
    300300  public int getThumbSizeX() { 
    301     FormatTools.assertId(currentId, true, 2);  
     301    FormatTools.assertId(currentId, true, 2); 
    302302    return reader.getThumbSizeX(); 
    303303  } 
     
    305305  /* @see IFormatReader#getThumbSizeY() */ 
    306306  public int getThumbSizeY() { 
    307     FormatTools.assertId(currentId, true, 2);  
     307    FormatTools.assertId(currentId, true, 2); 
    308308    return reader.getThumbSizeY(); 
    309309  } 
     
    311311  /* @see IFormatReader#isLittleEndian() */ 
    312312  public boolean isLittleEndian() { 
    313     FormatTools.assertId(currentId, true, 2);  
     313    FormatTools.assertId(currentId, true, 2); 
    314314    return reader.isLittleEndian(); 
    315315  } 
     
    317317  /* @see IFormatReader#getDimensionOrder() */ 
    318318  public String getDimensionOrder() { 
    319     FormatTools.assertId(currentId, true, 2);  
     319    FormatTools.assertId(currentId, true, 2); 
    320320    return core.currentOrder[getSeries()]; 
    321321  } 
     
    323323  /* @see IFormatReader#isOrderCertain() */ 
    324324  public boolean isOrderCertain() { 
    325     FormatTools.assertId(currentId, true, 2);  
     325    FormatTools.assertId(currentId, true, 2); 
    326326    return core.orderCertain[getSeries()]; 
    327327  } 
     
    329329  /* @see IFormatReader#isInterleaved() */ 
    330330  public boolean isInterleaved() { 
    331     FormatTools.assertId(currentId, true, 2);  
     331    FormatTools.assertId(currentId, true, 2); 
    332332    return reader.isInterleaved(); 
    333333  } 
     
    335335  /* @see IFormatReader#isInterleaved(int) */ 
    336336  public boolean isInterleaved(int subC) { 
    337     FormatTools.assertId(currentId, true, 2);  
     337    FormatTools.assertId(currentId, true, 2); 
    338338    return reader.isInterleaved(subC); 
    339339  } 
     
    341341  /* @see IFormatReader#openImage(int) */ 
    342342  public BufferedImage openImage(int no) throws FormatException, IOException { 
    343     FormatTools.assertId(currentId, true, 2);  
     343    FormatTools.assertId(currentId, true, 2); 
    344344    int[] q = computeIndices(no); 
    345345    int fno = q[0], ino = q[1]; 
     
    359359  /* @see IFormatReader#openBytes(int) */ 
    360360  public byte[] openBytes(int no) throws FormatException, IOException { 
    361     FormatTools.assertId(currentId, true, 2);  
     361    FormatTools.assertId(currentId, true, 2); 
    362362    int[] q = computeIndices(no); 
    363363    int fno = q[0], ino = q[1]; 
     
    380380    throws FormatException, IOException 
    381381  { 
    382     FormatTools.assertId(currentId, true, 2);  
     382    FormatTools.assertId(currentId, true, 2); 
    383383    int[] q = computeIndices(no); 
    384384    int fno = q[0], ino = q[1]; 
     
    390390    throws FormatException, IOException 
    391391  { 
    392     FormatTools.assertId(currentId, true, 2);  
     392    FormatTools.assertId(currentId, true, 2); 
    393393    int[] q = computeIndices(no); 
    394394    int fno = q[0], ino = q[1]; 
     
    408408  /* @see IFormatReader#openThumbBytes(int) */ 
    409409  public byte[] openThumbBytes(int no) throws FormatException, IOException { 
    410     FormatTools.assertId(currentId, true, 2);  
     410    FormatTools.assertId(currentId, true, 2); 
    411411    int[] q = computeIndices(no); 
    412412    int fno = q[0], ino = q[1]; 
     
    453453  /* @see IFormatReader#getSeriesCount() */ 
    454454  public int getSeriesCount() { 
    455     FormatTools.assertId(currentId, true, 2);  
     455    FormatTools.assertId(currentId, true, 2); 
    456456    return reader.getSeriesCount(); 
    457457  } 
     
    459459  /* @see IFormatReader#setSeries(int) */ 
    460460  public void setSeries(int no) throws FormatException { 
    461     FormatTools.assertId(currentId, true, 2);  
     461    FormatTools.assertId(currentId, true, 2); 
    462462    reader.setSeries(no); 
    463463  } 
     
    465465  /* @see IFormatReader#getSeries() */ 
    466466  public int getSeries() { 
    467     FormatTools.assertId(currentId, true, 2);  
     467    FormatTools.assertId(currentId, true, 2); 
    468468    return reader.getSeries(); 
    469469  } 
     
    471471  /* @see IFormatReader#setNormalized(boolean) */ 
    472472  public void setNormalized(boolean normalize) { 
    473     FormatTools.assertId(currentId, false, 2);  
     473    FormatTools.assertId(currentId, false, 2); 
    474474    if (readers == null) reader.setNormalized(normalize); 
    475475    else { 
     
    485485  /* @see IFormatReader#setMetadataCollected(boolean) */ 
    486486  public void setMetadataCollected(boolean collect) { 
    487     FormatTools.assertId(currentId, false, 2);  
     487    FormatTools.assertId(currentId, false, 2); 
    488488    if (readers == null) reader.setMetadataCollected(collect); 
    489489    else { 
     
    501501  /* @see IFormatReader#getUsedFiles() */ 
    502502  public String[] getUsedFiles() { 
    503     FormatTools.assertId(currentId, true, 2);  
    504      
     503    FormatTools.assertId(currentId, true, 2); 
     504 
    505505    // returning the files list directly here is fast, since we do not 
    506506    // have to call initFile on each constituent file; but we can only do so 
     
    558558  /* @see IFormatReader#getMetadataValue(String) */ 
    559559  public Object getMetadataValue(String field) { 
    560     FormatTools.assertId(currentId, true, 2);  
     560    FormatTools.assertId(currentId, true, 2); 
    561561    return reader.getMetadataValue(field); 
    562562  } 
     
    564564  /* @see IFormatReader#getMetadata() */ 
    565565  public Hashtable getMetadata() { 
    566     FormatTools.assertId(currentId, true, 2);  
     566    FormatTools.assertId(currentId, true, 2); 
    567567    return reader.getMetadata(); 
    568568  } 
     
    570570  /* @see IFormatReader#getCoreMetadata() */ 
    571571  public CoreMetadata getCoreMetadata() { 
    572     FormatTools.assertId(currentId, true, 2);  
     572    FormatTools.assertId(currentId, true, 2); 
    573573    return core; 
    574574  } 
     
    576576  /* @see IFormatReader#setMetadataFiltered(boolean) */ 
    577577  public void setMetadataFiltered(boolean filter) { 
    578     FormatTools.assertId(currentId, false, 2);  
     578    FormatTools.assertId(currentId, false, 2); 
    579579    reader.setMetadataFiltered(filter); 
    580580  } 
     
    587587  /* @see IFormatReader#setMetadataStore(MetadataStore) */ 
    588588  public void setMetadataStore(MetadataStore store) { 
    589     FormatTools.assertId(currentId, false, 2);  
     589    FormatTools.assertId(currentId, false, 2); 
    590590    reader.setMetadataStore(store); 
    591591  } 
     
    593593  /* @see IFormatReader#getMetadataStore() */ 
    594594  public MetadataStore getMetadataStore() { 
    595     FormatTools.assertId(currentId, true, 2);  
     595    FormatTools.assertId(currentId, true, 2); 
    596596    return reader.getMetadataStore(); 
    597597  } 
     
    599599  /* @see IFormatReader#getMetadataStoreRoot() */ 
    600600  public Object getMetadataStoreRoot() { 
    601     FormatTools.assertId(currentId, true, 2);  
     601    FormatTools.assertId(currentId, true, 2); 
    602602    return reader.getMetadataStoreRoot(); 
    603603  } 
     
    622622  /* @see IFormatHandler#getFormat() */ 
    623623  public String getFormat() { 
    624     FormatTools.assertId(currentId, true, 2);  
     624    FormatTools.assertId(currentId, true, 2); 
    625625    return reader.getFormat(); 
    626626  } 
  • trunk/loci/formats/FormatReader.java

    r2695 r2701  
    182182  /* @see IFormatReader#getImageCount() */ 
    183183  public int getImageCount() { 
    184     FormatTools.assertId(currentId, true, 1);  
     184    FormatTools.assertId(currentId, true, 1); 
    185185    return core.imageCount[series]; 
    186186  } 
     
    188188  /* @see IFormatReader#isRGB() */ 
    189189  public boolean isRGB() { 
    190     FormatTools.assertId(currentId, true, 1);  
     190    FormatTools.assertId(currentId, true, 1); 
    191191    return core.rgb[series]; 
    192192  } 
     
    194194  /* @see IFormatReader#getSizeX() */ 
    195195  public int getSizeX() { 
    196     FormatTools.assertId(currentId, true, 1);  
     196    FormatTools.assertId(currentId, true, 1); 
    197197    return core.sizeX[series]; 
    198198  } 
     
    200200  /* @see IFormatReader#getSizeY() */ 
    201201  public int getSizeY() { 
    202     FormatTools.assertId(currentId, true, 1);  
     202    FormatTools.assertId(currentId, true, 1); 
    203203    return core.sizeY[series]; 
    204204  } 
     
    206206  /* @see IFormatReader#getSizeZ() */ 
    207207  public int getSizeZ() { 
    208     FormatTools.assertId(currentId, true, 1);  
     208    FormatTools.assertId(currentId, true, 1); 
    209209    return core.sizeZ[series]; 
    210210  } 
     
    212212  /* @see IFormatReader#getSizeC() */ 
    213213  public int getSizeC() { 
    214     FormatTools.assertId(currentId, true, 1);  
     214    FormatTools.assertId(currentId, true, 1); 
    215215    return core.sizeC[series]; 
    216216  } 
     
    218218  /* @see IFormatReader#getSizeT() */ 
    219219  public int getSizeT() { 
    220     FormatTools.assertId(currentId, true, 1);  
     220    FormatTools.assertId(currentId, true, 1); 
    221221    return core.sizeT[series]; 
    222222  } 
     
    224224  /* @see IFormatReader#getPixelType() */ 
    225225  public int getPixelType() { 
    226     FormatTools.assertId(currentId, true, 1);  
     226    FormatTools.assertId(currentId, true, 1); 
    227227    return core.pixelType[series]; 
    228228  } 
     
    241241  /* @see IFormatReader#getChannelDimLengths() */ 
    242242  public int[] getChannelDimLengths() { 
    243     FormatTools.assertId(currentId, true, 1);  
     243    FormatTools.assertId(currentId, true, 1); 
    244244    if (core.cLengths[series] == null) { 
    245245      core.cLengths[series] = new int[] {core.sizeC[series]}; 
     
    250250  /* @see IFormatReader#getChannelDimTypes() */ 
    251251  public String[] getChannelDimTypes() { 
    252     FormatTools.assertId(currentId, true, 1);  
     252    FormatTools.assertId(currentId, true, 1); 
    253253    if (core.cTypes[series] == null) { 
    254254      core.cTypes[series] = new String[] {FormatTools.CHANNEL}; 
     
    259259  /* @see IFormatReader#getThumbSizeX() */ 
    260260  public int getThumbSizeX() { 
    261     FormatTools.assertId(currentId, true, 1);  
     261    FormatTools.assertId(currentId, true, 1); 
    262262    if (core.thumbSizeX[series] == 0) { 
    263263      int sx = getSizeX(); 
     
    271271  /* @see IFormatReader#getThumbSizeY() */ 
    272272  public int getThumbSizeY() { 
    273     FormatTools.assertId(currentId, true, 1);  
     273    FormatTools.assertId(currentId, true, 1); 
    274274    if (core.thumbSizeY[series] == 0) { 
    275275      int sx = getSizeX(); 
     
    283283  /* @see IFormatReader.isLittleEndian() */ 
    284284  public boolean isLittleEndian() { 
    285     FormatTools.assertId(currentId, true, 1);  
     285    FormatTools.assertId(currentId, true, 1); 
    286286    return core.littleEndian[series]; 
    287287  } 
     
    289289  /* @see IFormatReader#getDimensionOrder() */ 
    290290  public String getDimensionOrder() { 
    291     FormatTools.assertId(currentId, true, 1);  
     291    FormatTools.assertId(currentId, true, 1); 
    292292    return core.currentOrder[series]; 
    293293  } 
     
    295295  /* @see IFormatReader.isOrderCertain() */ 
    296296  public boolean isOrderCertain() { 
    297     FormatTools.assertId(currentId, true, 1);  
     297    FormatTools.assertId(currentId, true, 1); 
    298298    return core.orderCertain[series]; 
    299299  } 
     
    306306  /* @see IFormatReader#isInterleaved(int) */ 
    307307  public boolean isInterleaved(int subC) { 
    308     FormatTools.assertId(currentId, true, 1);  
     308    FormatTools.assertId(currentId, true, 1); 
    309309    return core.interleaved[series]; 
    310310  } 
     
    321321    throws FormatException, IOException 
    322322  { 
    323     FormatTools.assertId(currentId, true, 1);  
     323    FormatTools.assertId(currentId, true, 1); 
    324324    return ImageTools.scale(openImage(no), getThumbSizeX(), 
    325325      getThumbSizeY(), false); 
     
    328328  /* @see IFormatReader#openThumbBytes(int) */ 
    329329  public byte[] openThumbBytes(int no) throws FormatException, IOException { 
    330     FormatTools.assertId(currentId, true, 1);  
     330    FormatTools.assertId(currentId, true, 1); 
    331331    BufferedImage img = openThumbImage(no); 
    332332    byte[][] bytes = ImageTools.getBytes(img); 
     
    349349  /* @see IFormatReader#getSeriesCount() */ 
    350350  public int getSeriesCount() { 
    351     FormatTools.assertId(currentId, true, 1);  
     351    FormatTools.assertId(currentId, true, 1); 
    352352    return core.sizeX.length; 
    353353  } 
     
    368368  /* @see IFormatReader#setNormalized(boolean) */ 
    369369  public void setNormalized(boolean normalize) { 
    370     FormatTools.assertId(currentId, false, 1);  
     370    FormatTools.assertId(currentId, false, 1); 
    371371    if (currentId != null) { 
    372372      String s = "setNormalized called with open file."; 
     
    384384  /* @see IFormatReader#setMetadataCollected(boolean) */ 
    385385  public void setMetadataCollected(boolean collect) { 
    386     FormatTools.assertId(currentId, false, 1);  
     386    FormatTools.assertId(currentId, false, 1); 
    387387    if (currentId != null) { 
    388388      String s = "setMetadataCollected called with open file."; 
     
    400400  /* @see IFormatReader#getUsedFiles() */ 
    401401  public String[] getUsedFiles() { 
    402     FormatTools.assertId(currentId, true, 1);  
     402    FormatTools.assertId(currentId, true, 1); 
    403403    return new String[] {currentId}; 
    404404  } 
     
    411411  /* @see IFormatReader#getIndex(int, int, int) */ 
    412412  public int getIndex(int z, int c, int t) throws FormatException { 
    413     FormatTools.assertId(currentId, true, 1);  
     413    FormatTools.assertId(currentId, true, 1); 
    414414    return FormatTools.getIndex(this, z, c, t); 
    415415  } 
     
    417417  /* @see IFormatReader#getZCTCoords(int) */ 
    418418  public int[] getZCTCoords(int index) throws FormatException { 
    419     FormatTools.assertId(currentId, true, 1);  
     419    FormatTools.assertId(currentId, true, 1); 
    420420    return FormatTools.getZCTCoords(this, index); 
    421421  } 
     
    423423  /* @see IFormatReader#getMetadataValue(String) */ 
    424424  public Object getMetadataValue(String field) { 
    425     FormatTools.assertId(currentId, true, 1);  
     425    FormatTools.assertId(currentId, true, 1); 
    426426    return getMeta(field); 
    427427  } 
     
    429429  /* @see IFormatReader#getMetadata() */ 
    430430  public Hashtable getMetadata() { 
    431     FormatTools.assertId(currentId, true, 1);  
     431    FormatTools.assertId(currentId, true, 1); 
    432432    return metadata; 
    433433  } 
     
    435435  /* @see IFormatReader#getCoreMetadata() */ 
    436436  public CoreMetadata getCoreMetadata() { 
    437     FormatTools.assertId(currentId, true, 1);  
     437    FormatTools.assertId(currentId, true, 1); 
    438438    return core; 
    439439  } 
     
    441441  /* @see IFormatReader#setMetadataFiltered(boolean) */ 
    442442  public void setMetadataFiltered(boolean filter) { 
    443     FormatTools.assertId(currentId, false, 1);  
     443    FormatTools.assertId(currentId, false, 1); 
    444444    if (currentId != null) { 
    445445      String s = "setMetadataFiltered called with open file."; 
     
    457457  /* @see IFormatReader#setMetadataStore(MetadataStore) */ 
    458458  public void setMetadataStore(MetadataStore store) { 
    459     FormatTools.assertId(currentId, false, 1);  
     459    FormatTools.assertId(currentId, false, 1); 
    460460    if (currentId != null) { 
    461461      String s = "setMetadataStore called with open file."; 
     
    473473  /* @see IFormatReader#getMetadataStoreRoot() */ 
    474474  public Object getMetadataStoreRoot() { 
    475     FormatTools.assertId(currentId, true, 1);  
     475    FormatTools.assertId(currentId, true, 1); 
    476476    return getMetadataStore().getRoot(); 
    477477  } 
  • trunk/loci/formats/FormatTools.java

    r2700 r2701  
    616616    } 
    617617 
    618  
    619618    long start = System.currentTimeMillis(); 
    620619    System.out.print(in + " "); 
  • trunk/loci/formats/ImageReader.java

    r2696 r2701  
    165165  /* @see IFormatReader#getImageCount() */ 
    166166  public int getImageCount() { 
    167     FormatTools.assertId(currentId, true, 2);  
     167    FormatTools.assertId(currentId, true, 2); 
    168168    return getReader().getImageCount(); 
    169169  } 
     
    171171  /* @see IFormatReader#isRGB() */ 
    172172  public boolean isRGB() { 
    173     FormatTools.assertId(currentId, true, 2);  
     173    FormatTools.assertId(currentId, true, 2); 
    174174    return getReader().isRGB(); 
    175175  } 
     
    177177  /* @see IFormatReader#getSizeX() */ 
    178178  public int getSizeX() { 
    179     FormatTools.assertId(currentId, true, 2);  
     179    FormatTools.assertId(currentId, true, 2); 
    180180    return getReader().getSizeX(); 
    181181  } 
     
    183183  /* @see IFormatReader#getSizeY() */ 
    184184  public int getSizeY() { 
    185     FormatTools.assertId(currentId, true, 2);  
     185    FormatTools.assertId(currentId, true, 2); 
    186186    return getReader().getSizeY(); 
    187187  } 
     
    189189  /* @see IFormatReader#getSizeC() */ 
    190190  public int getSizeC() { 
    191     FormatTools.assertId(currentId, true, 2);  
     191    FormatTools.assertId(currentId, true, 2); 
    192192    return getReader().getSizeC(); 
    193193  } 
     
    195195  /* @see IFormatReader#getSizeZ() */ 
    196196  public int getSizeZ() { 
    197     FormatTools.assertId(currentId, true, 2);  
     197    FormatTools.assertId(currentId, true, 2); 
    198198    return getReader().getSizeZ(); 
    199199  } 
     
    201201  /* @see IFormatReader#getSizeT() */ 
    202202  public int getSizeT() { 
    203     FormatTools.assertId(currentId, true, 2);  
     203    FormatTools.assertId(currentId, true, 2); 
    204204    return getReader().getSizeT(); 
    205205  } 
     
    207207  /* @see IFormatReader#getPixelType() */ 
    208208  public int getPixelType() { 
    209     FormatTools.assertId(currentId, true, 2);  
     209    FormatTools.assertId(currentId, true, 2); 
    210210    return getReader().getPixelType(); 
    211211  } 
     
    213213  /* @see IFormatReader#getEffectiveSizeC() */ 
    214214  public int getEffectiveSizeC() { 
    215     FormatTools.assertId(currentId, true, 2);  
     215    FormatTools.assertId(currentId, true, 2); 
    216216    return getReader().getEffectiveSizeC(); 
    217217  } 
     
    219219  /* @see IFormatReader#getRGBChannelCount() */ 
    220220  public int getRGBChannelCount() { 
    221     FormatTools.assertId(currentId, true, 2);  
     221    FormatTools.assertId(currentId, true, 2); 
    222222    return getReader().getRGBChannelCount(); 
    223223  } 
     
    225225  /* @see IFormatReader#getChannelDimLengths() */ 
    226226  public int[] getChannelDimLengths() { 
    227     FormatTools.assertId(currentId, true, 2);  
     227    FormatTools.assertId(currentId, true, 2); 
    228228    return getReader().getChannelDimLengths(); 
    229229  } 
     
    231231  /* @see IFormatReader#getChannelDimTypes() */ 
    232232  public String[] getChannelDimTypes() { 
    233     FormatTools.assertId(currentId, true, 2);  
     233    FormatTools.assertId(currentId, true, 2); 
    234234    return getReader().getChannelDimTypes(); 
    235235  } 
     
    237237  /* @see IFormatReader#getThumbSizeX() */ 
    238238  public int getThumbSizeX() { 
    239     FormatTools.assertId(currentId, true, 2);  
     239    FormatTools.assertId(currentId, true, 2); 
    240240    return getReader().getThumbSizeX(); 
    241241  } 
     
    243243  /* @see IFormatReader#getThumbSizeY() */ 
    244244  public int getThumbSizeY() { 
    245     FormatTools.assertId(currentId, true, 2);  
     245    FormatTools.assertId(currentId, true, 2); 
    246246    return getReader().getThumbSizeY(); 
    247247  } 
     
    249249  /* @see IFormatReader#isLittleEndian() */ 
    250250  public boolean isLittleEndian() { 
    251     FormatTools.assertId(currentId, true, 2);  
     251    FormatTools.assertId(currentId, true, 2); 
    252252    return getReader().isLittleEndian(); 
    253253  } 
     
    255255  /* @see IFormatReader#getDimensionOrder() */ 
    256256  public String getDimensionOrder() { 
    257     FormatTools.assertId(currentId, true, 2);  
     257    FormatTools.assertId(currentId, true, 2); 
    258258    return getReader().getDimensionOrder(); 
    259259  } 
     
    261261  /* @see IFormatReader#isOrderCertain() */ 
    262262  public boolean isOrderCertain() { 
    263     FormatTools.assertId(currentId, true, 2);  
     263    FormatTools.assertId(currentId, true, 2); 
    264264    return getReader().isOrderCertain(); 
    265265  } 
     
    267267  /* @see IFormatReader#isInterleaved() */ 
    268268  public boolean isInterleaved() { 
    269     FormatTools.assertId(currentId, true, 2);  
     269    FormatTools.assertId(currentId, true, 2); 
    270270    return getReader().isInterleaved(); 
    271271  } 
     
    273273  /* @see IFormatReader#isInterleaved(int) */ 
    274274  public boolean isInterleaved(int subC) { 
    275     FormatTools.assertId(currentId, true, 2);  
     275    FormatTools.assertId(currentId, true, 2); 
    276276    return getReader().isInterleaved(subC); 
    277277  } 
     
    279279  /* @see IFormatReader#openImage(int) */ 
    280280  public BufferedImage openImage(int no) throws FormatException, IOException { 
    281     FormatTools.assertId(currentId, true, 2);  
     281    FormatTools.assertId(currentId, true, 2); 
    282282    return getReader().openImage(no); 
    283283  } 
     
    285285  /* @see IFormatReader#openBytes(int) */ 
    286286  public byte[] openBytes(int no) throws FormatException, IOException { 
    287     FormatTools.assertId(currentId, true, 2);  
     287    FormatTools.assertId(currentId, true, 2); 
    288288    return getReader().openBytes(no); 
    289289  } 
     
    293293    throws FormatException, IOException 
    294294  { 
    295     FormatTools.assertId(currentId, true, 2);  
     295    FormatTools.assertId(currentId, true, 2); 
    296296    return getReader().openBytes(no, buf); 
    297297  } 
     
    301301    throws FormatException, IOException 
    302302  { 
    303     FormatTools.assertId(currentId, true, 2);  
     303    FormatTools.assertId(currentId, true, 2); 
    304304    return getReader().openThumbImage(no); 
    305305  } 
     
    307307  /* @see IFormatReader#openThumbBytes(int) */ 
    308308  public byte[] openThumbBytes(int no) throws FormatException, IOException { 
    309     FormatTools.assertId(currentId, true, 2);  
     309    FormatTools.assertId(currentId, true, 2); 
    310310    return getReader().openThumbBytes(no); 
    311311  } 
     
    313313  /* @see IFormatReader#getSeriesCount() */ 
    314314  public int getSeriesCount() { 
    315     FormatTools.assertId(currentId, true, 2);  
     315    FormatTools.assertId(currentId, true, 2); 
    316316    return getReader().getSeriesCount(); 
    317317  } 
     
    319319  /* @see IFormatReader#setSeries(int) */ 
    320320  public void setSeries(int no) throws FormatException { 
    321     FormatTools.assertId(currentId, true, 2);  
     321    FormatTools.assertId(currentId, true, 2); 
    322322    getReader().setSeries(no); 
    323323  } 
     
    330330  /* @see IFormatReader#getUsedFiles() */ 
    331331  public String[] getUsedFiles() { 
    332     FormatTools.assertId(currentId, true, 2);  
     332    FormatTools.assertId(currentId, true, 2); 
    333333    return getReader().getUsedFiles(); 
    334334  } 
     
    336336  /* @see IFormatReader#getIndex(int, int, int) */ 
    337337  public int getIndex(int z, int c, int t) throws FormatException { 
    338     FormatTools.assertId(currentId, true, 2);  
     338    FormatTools.assertId(currentId, true, 2); 
    339339    return getReader().getIndex(z, c, t); 
    340340  } 
     
    342342  /* @see IFormatReader#getZCTCoords(int) */ 
    343343  public int[] getZCTCoords(int index) throws FormatException { 
    344     FormatTools.assertId(currentId, true, 2);  
     344    FormatTools.assertId(currentId, true, 2); 
    345345    return getReader().getZCTCoords(index); 
    346346  } 
     
    348348  /* @see IFormatReader#getMetadataValue(String) */ 
    349349  public Object getMetadataValue(String field) { 
    350     FormatTools.assertId(currentId, true, 2);  
     350    FormatTools.assertId(currentId, true, 2); 
    351351    return getReader().getMetadataValue(field); 
    352352  } 
     
    354354  /* @see IFormatReader#getMetadata() */ 
    355355  public Hashtable getMetadata() { 
    356     FormatTools.assertId(currentId, true, 2);  
     356    FormatTools.assertId(currentId, true, 2); 
    357357    return getReader().getMetadata(); 
    358358  } 
     
    360360  /* @see IFormatReader#getCoreMetadata() */ 
    361361  public CoreMetadata getCoreMetadata() { 
    362     FormatTools.assertId(currentId, true, 2);  
     362    FormatTools.assertId(currentId, true, 2); 
    363363    return getReader().getCoreMetadata(); 
    364364  } 
     
    366366  /* @see IFormatReader#getMetadataStore() */ 
    367367  public MetadataStore getMetadataStore() { 
    368     FormatTools.assertId(currentId, true, 2);  
     368    FormatTools.assertId(currentId, true, 2); 
    369369    return getReader().getMetadataStore(); 
    370370  } 
     
    372372  /* @see IFormatReader#getMetadataStoreRoot() */ 
    373373  public Object getMetadataStoreRoot() { 
    374     FormatTools.assertId(currentId, true, 2);  
     374    FormatTools.assertId(currentId, true, 2); 
    375375    return getReader().getMetadataStoreRoot(); 
    376376  } 
     
    383383  /* @see IFormatReader#setNormalized(boolean) */ 
    384384  public void setNormalized(boolean normalize) { 
    385     FormatTools.assertId(currentId, false, 2);  
     385    FormatTools.assertId(currentId, false, 2); 
    386386    for (int i=0; i<readers.length; i++) readers[i].setNormalized(normalize); 
    387387  } 
     
    395395  /* @see IFormatReader#setMetadataCollected(boolean) */ 
    396396  public void setMetadataCollected(boolean collect) { 
    397     FormatTools.assertId(currentId, false, 2);  
     397    FormatTools.assertId(currentId, false, 2); 
    398398    for (int i=0; i<readers.length; i++) { 
    399399      readers[i].setMetadataCollected(collect); 
     
    413413  /* @see IFormatReader#setMetadataFiltered(boolean) */ 
    414414  public void setMetadataFiltered(boolean filter) { 
    415     FormatTools.assertId(currentId, false, 2);  
     415    FormatTools.assertId(currentId, false, 2); 
    416416    for (int i=0; i<readers.length; i++) readers[i].setMetadataFiltered(filter); 
    417417  } 
     
    425425  /* @see IFormatReader#setMetadataStore(MetadataStore) */ 
    426426  public void setMetadataStore(MetadataStore store) { 
    427     FormatTools.assertId(currentId, false, 2);  
     427    FormatTools.assertId(currentId, false, 2); 
    428428    for (int i=0; i<readers.length; i++) readers[i].setMetadataStore(store); 
    429429  } 
     
    484484  /* @see IFormatHandler#close() */ 
    485485  public void close() throws IOException { 
    486     currentId = null;  
     486    currentId = null; 
    487487    for (int i=0; i<readers.length; i++) readers[i].close(); 
    488488  } 
  • trunk/loci/formats/MinMaxCalculator.java

    r2695 r2701  
    6666    throws FormatException, IOException 
    6767  { 
    68     FormatTools.assertId(getCurrentFile(), true, 2);  
     68    FormatTools.assertId(getCurrentFile(), true, 2); 
    6969    if (theC < 0 || theC >= getSizeC()) { 
    7070      throw new FormatException("Invalid channel index: " + theC); 
     
    8585    throws FormatException, IOException 
    8686  { 
    87     FormatTools.assertId(getCurrentFile(), true, 2);  
     87    FormatTools.assertId(getCurrentFile(), true, 2); 
    8888    if (theC < 0 || theC >= getSizeC()) { 
    8989      throw new FormatException("Invalid channel index: " + theC); 
     
    104104    throws FormatException, IOException 
    105105  { 
    106     FormatTools.assertId(getCurrentFile(), true, 2);  
     106    FormatTools.assertId(getCurrentFile(), true, 2); 
    107107    return chanMin == null ? null : new Double(chanMin[getSeries()][theC]); 
    108108  } 
     
    115115    throws FormatException, IOException 
    116116  { 
    117     FormatTools.assertId(getCurrentFile(), true, 2);  
     117    FormatTools.assertId(getCurrentFile(), true, 2); 
    118118    return chanMax == null ? null : new Double(chanMax[getSeries()][theC]); 
    119119  } 
     
    126126   */ 
    127127  public Double[] getPlaneMinimum(int no) throws FormatException, IOException { 
    128     FormatTools.assertId(getCurrentFile(), true, 2);  
     128    FormatTools.assertId(getCurrentFile(), true, 2); 
    129129    if (planeMin == null) return null; 
    130130 
     
    149149   */ 
    150150  public Double[] getPlaneMaximum(int no) throws FormatException, IOException { 
    151     FormatTools.assertId(getCurrentFile(), true, 2);  
     151    FormatTools.assertId(getCurrentFile(), true, 2); 
    152152    if (planeMax == null) return null; 
    153153 
     
    170170   */ 
    171171  public boolean isMinMaxPopulated() throws FormatException, IOException { 
    172     FormatTools.assertId(getCurrentFile(), true, 2);  
     172    FormatTools.assertId(getCurrentFile(), true, 2); 
    173173    return minMaxDone != null && minMaxDone[getSeries()] == getImageCount(); 
    174174  } 
     
    178178  /* @see IFormatReader#openImage(int) */ 
    179179  public BufferedImage openImage(int no) throws FormatException, IOException { 
    180     FormatTools.assertId(getCurrentFile(), true, 2);  
     180    FormatTools.assertId(getCurrentFile(), true, 2); 
    181181    BufferedImage b = super.openImage(no); 
    182182    updateMinMax(b, no); 
     
    186186  /* @see IFormatReader#openBytes(int) */ 
    187187  public byte[] openBytes(int no) throws FormatException, IOException { 
    188     FormatTools.assertId(getCurrentFile(), true, 2);  
     188    FormatTools.assertId(getCurrentFile(), true, 2); 
    189189    byte[] b = super.openBytes(no); 
    190190    updateMinMax(b, no); 
     
    196196    throws FormatException, IOException 
    197197  { 
    198     FormatTools.assertId(getCurrentFile(), true, 2);  
     198    FormatTools.assertId(getCurrentFile(), true, 2); 
    199199    super.openBytes(no, buf); 
    200200    updateMinMax(buf, no); 
  • trunk/loci/formats/in/AVIReader.java

    r2695 r2701  
    9595  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    9696  public byte[] openBytes(int no) throws FormatException, IOException { 
    97     FormatTools.assertId(currentId, true, 1);  
     97    FormatTools.assertId(currentId, true, 1); 
    9898    byte[] buf = 
    9999      new byte[core.sizeY[0] * bmpScanLineSize * (bmpBitsPerPixel / 8)]; 
     
    105105    throws FormatException, IOException 
    106106  { 
    107     FormatTools.assertId(currentId, true, 1);  
     107    FormatTools.assertId(currentId, true, 1); 
    108108    if (no < 0 || no >= getImageCount()) { 
    109109      throw new FormatException("Invalid image number: " + no); 
     
    144144  /* @see loci.formats.IFormatReader#openImage(int) */ 
    145145  public BufferedImage openImage(int no) throws FormatException, IOException { 
    146     FormatTools.assertId(currentId, true, 1);  
     146    FormatTools.assertId(currentId, true, 1); 
    147147    return ImageTools.makeImage(openBytes(no), 
    148148      core.sizeX[0], core.sizeY[0], core.sizeC[0], true); 
  • trunk/loci/formats/in/AliconaReader.java

    r2695 r2701  
    5555  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    5656  public byte[] openBytes(int no) throws FormatException, IOException { 
    57     FormatTools.assertId(currentId, true, 1);  
     57    FormatTools.assertId(currentId, true, 1); 
    5858    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * numBytes]; 
    5959    return openBytes(no, buf); 
     
    6464    throws FormatException, IOException 
    6565  { 
    66     FormatTools.assertId(currentId, true, 1);  
     66    FormatTools.assertId(currentId, true, 1); 
    6767    if (no < 0 || no >= getImageCount()) { 
    6868      throw new FormatException("Invalid image number: " + no); 
     
    9090  /* @see loci.formats.IFormatReader#openImage(int) */ 
    9191  public BufferedImage openImage(int no) throws FormatException, IOException { 
    92     FormatTools.assertId(currentId, true, 1);  
     92    FormatTools.assertId(currentId, true, 1); 
    9393    return ImageTools.makeImage(openBytes(no), core.sizeX[0], core.sizeY[0], 
    9494      1, false, numBytes, true); 
  • trunk/loci/formats/in/BMPReader.java

    r2695 r2701  
    7979  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    8080  public byte[] openBytes(int no) throws FormatException, IOException { 
    81     FormatTools.assertId(currentId, true, 1);  
     81    FormatTools.assertId(currentId, true, 1); 
    8282    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * core.sizeC[0]]; 
    8383    return openBytes(no, buf); 
     
    8888    throws FormatException, IOException 
    8989  { 
    90     FormatTools.assertId(currentId, true, 1);  
     90    FormatTools.assertId(currentId, true, 1); 
    9191    if (no < 0 || no >= getImageCount()) { 
    9292      throw new FormatException("Invalid image number: " + no); 
     
    141141  /* @see loci.formats.IFormatReader#openImage(int) */ 
    142142  public BufferedImage openImage(int no) throws FormatException, IOException { 
    143     FormatTools.assertId(currentId, true, 1);  
     143    FormatTools.assertId(currentId, true, 1); 
    144144    return ImageTools.makeImage(openBytes(no), core.sizeX[0], core.sizeY[0], 
    145145      core.sizeC[0], false); 
  • trunk/loci/formats/in/BaseTiffReader.java

    r2695 r2701  
    7878  /* @see loci.formats.IFormatReader#getMetadataValue(String) */ 
    7979  public Object getMetadataValue(String field) { 
    80     FormatTools.assertId(currentId, true, 1);  
     80    FormatTools.assertId(currentId, true, 1); 
    8181    return getMeta(field); 
    8282  } 
     
    8484  /* @see loci.formats.FormatReader#openBytes(int) */ 
    8585  public byte[] openBytes(int no) throws FormatException, IOException { 
    86     FormatTools.assertId(currentId, true, 1);  
     86    FormatTools.assertId(currentId, true, 1); 
    8787    if (no < 0 || no >= getImageCount()) { 
    8888      throw new FormatException("Invalid image number: " + no); 
     
    9999    throws FormatException, IOException 
    100100  { 
    101     FormatTools.assertId(currentId, true, 1);  
     101    FormatTools.assertId(currentId, true, 1); 
    102102    if (no < 0 || no >= getImageCount()) { 
    103103      throw new FormatException("Invalid image number: " + no); 
     
    110110  /* @see loci.formats.IFormatReader#openImage(int) */ 
    111111  public BufferedImage openImage(int no) throws FormatException, IOException { 
    112     FormatTools.assertId(currentId, true, 1);  
     112    FormatTools.assertId(currentId, true, 1); 
    113113    if (no < 0 || no >= getImageCount()) { 
    114114      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/BioRadReader.java

    r2695 r2701  
    8383  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    8484  public byte[] openBytes(int no) throws FormatException, IOException { 
    85     FormatTools.assertId(currentId, true, 1);  
     85    FormatTools.assertId(currentId, true, 1); 
    8686    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * (byteFormat ? 1 : 2)]; 
    8787    return openBytes(no, buf); 
     
    9292    throws FormatException, IOException 
    9393  { 
    94     FormatTools.assertId(currentId, true, 1);  
     94    FormatTools.assertId(currentId, true, 1); 
    9595    if (no < 0 || no >= core.imageCount[0]) { 
    9696      throw new FormatException("Invalid image number: " + no); 
     
    108108  /* @see loci.formats.IFormatReader#openImage(int) */ 
    109109  public BufferedImage openImage(int no) throws FormatException, IOException { 
    110     FormatTools.assertId(currentId, true, 1);  
     110    FormatTools.assertId(currentId, true, 1); 
    111111    return ImageTools.makeImage(openBytes(no), core.sizeX[0], 
    112112      core.sizeY[0], 1, false, byteFormat ? 1 : 2, LITTLE_ENDIAN); 
  • trunk/loci/formats/in/DeltavisionReader.java

    r2695 r2701  
    9090  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    9191  public byte[] openBytes(int no) throws FormatException, IOException { 
    92     FormatTools.assertId(currentId, true, 1);  
     92    FormatTools.assertId(currentId, true, 1); 
    9393    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * bytesPerPixel]; 
    9494    return openBytes(no, buf); 
     
    9999    throws FormatException, IOException 
    100100  { 
    101     FormatTools.assertId(currentId, true, 1);  
     101    FormatTools.assertId(currentId, true, 1); 
    102102    if (no < 0 || no >= core.imageCount[0]) { 
    103103      throw new FormatException("Invalid image number: " + no); 
     
    117117    throws FormatException, IOException 
    118118  { 
    119     FormatTools.assertId(currentId, true, 1);  
     119    FormatTools.assertId(currentId, true, 1); 
    120120    return ImageTools.makeImage(openBytes(no), core.sizeX[0], 
    121121      core.sizeY[0], 1, false, bytesPerPixel, core.littleEndian[0]); 
  • trunk/loci/formats/in/DicomReader.java

    r2695 r2701  
    105105  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    106106  public byte[] openBytes(int no) throws FormatException, IOException { 
    107     FormatTools.assertId(currentId, true, 1);  
     107    FormatTools.assertId(currentId, true, 1); 
    108108    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * (bitsPerPixel / 8)]; 
    109109    return openBytes(no, buf); 
     
    114114    throws FormatException, IOException 
    115115  { 
    116     FormatTools.assertId(currentId, true, 1);  
     116    FormatTools.assertId(currentId, true, 1); 
    117117    if (no < 0 || no >= getImageCount()) { 
    118118      throw new FormatException("Invalid image number: " + no); 
     
    132132  /* @see loci.formats.IFormatReader#openImage(int) */ 
    133133  public BufferedImage openImage(int no) throws FormatException, IOException { 
    134     FormatTools.assertId(currentId, true, 1);  
     134    FormatTools.assertId(currentId, true, 1); 
    135135    return ImageTools.makeImage(openBytes(no), core.sizeX[0], core.sizeY[0], 
    136136      1, false, bitsPerPixel / 8, core.littleEndian[0]); 
  • trunk/loci/formats/in/EPSReader.java

    r2695 r2701  
    6565  /* @see loci.formats.IFormatRaeder#openBytes(int) */ 
    6666  public byte[] openBytes(int no) throws FormatException, IOException { 
    67     FormatTools.assertId(currentId, true, 1);  
     67    FormatTools.assertId(currentId, true, 1); 
    6868    byte[] buf = 
    6969      new byte[core.sizeX[0] * core.sizeY[0] * core.sizeC[0] * (bps / 8)]; 
     
    7575    throws FormatException, IOException 
    7676  { 
    77     FormatTools.assertId(currentId, true, 1);  
     77    FormatTools.assertId(currentId, true, 1); 
    7878    if (no < 0 || no >= getImageCount()) { 
    7979      throw new FormatException("Invalid image number: " + no); 
     
    117117  /* @see loci.formats.IFormatReader#openImage(int) */ 
    118118  public BufferedImage openImage(int no) throws FormatException, IOException { 
    119     FormatTools.assertId(currentId, true, 1);  
     119    FormatTools.assertId(currentId, true, 1); 
    120120    return ImageTools.makeImage(openBytes(no), core.sizeX[0], core.sizeY[0], 
    121121      isRGB() ? 3 : 1, true); 
  • trunk/loci/formats/in/GIFReader.java

    r2695 r2701  
    137137  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    138138  public byte[] openBytes(int no) throws FormatException, IOException { 
    139     FormatTools.assertId(currentId, true, 1);  
     139    FormatTools.assertId(currentId, true, 1); 
    140140    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * core.sizeC[0]]; 
    141141    return openBytes(no, buf); 
     
    146146    throws FormatException, IOException 
    147147  { 
    148     FormatTools.assertId(currentId, true, 1);  
     148    FormatTools.assertId(currentId, true, 1); 
    149149    if (no < 0 || no >= getImageCount()) { 
    150150      throw new FormatException("Invalid image number: " + no); 
     
    168168    throws FormatException, IOException 
    169169  { 
    170     FormatTools.assertId(currentId, true, 1);  
     170    FormatTools.assertId(currentId, true, 1); 
    171171    byte[] bytes = openBytes(no); 
    172172    return ImageTools.makeImage(bytes, core.sizeX[0], core.sizeY[0], 
  • trunk/loci/formats/in/GatanReader.java

    r2695 r2701  
    7373  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    7474  public byte[] openBytes(int no) throws FormatException, IOException { 
    75     FormatTools.assertId(currentId, true, 1);  
     75    FormatTools.assertId(currentId, true, 1); 
    7676    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * bytesPerPixel]; 
    7777    return openBytes(no, buf); 
     
    8282    throws FormatException, IOException 
    8383  { 
    84     FormatTools.assertId(currentId, true, 1);  
     84    FormatTools.assertId(currentId, true, 1); 
    8585    if (no != 0) { 
    8686      throw new FormatException("Invalid image number: " + no); 
     
    9797  /* @see loci.formats.IFormatReader#openImage(int) */ 
    9898  public BufferedImage openImage(int no) throws FormatException, IOException { 
    99     FormatTools.assertId(currentId, true, 1);  
     99    FormatTools.assertId(currentId, true, 1); 
    100100    if (no < 0 || no >= getImageCount()) { 
    101101      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/ICSReader.java

    r2695 r2701  
    9797  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    9898  public byte[] openBytes(int no) throws FormatException, IOException { 
    99     FormatTools.assertId(currentId, true, 1);  
     99    FormatTools.assertId(currentId, true, 1); 
    100100    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * (bitsPerPixel / 8) * 
    101101      getRGBChannelCount()]; 
     
    107107    throws FormatException, IOException 
    108108  { 
    109     FormatTools.assertId(currentId, true, 1);  
     109    FormatTools.assertId(currentId, true, 1); 
    110110    if (no < 0 || no >= getImageCount()) { 
    111111      throw new FormatException("Invalid image number: " + no); 
     
    146146  /* @see loci.formats.IFormatReader#openImage(int) */ 
    147147  public BufferedImage openImage(int no) throws FormatException, IOException { 
    148     FormatTools.assertId(currentId, true, 1);  
     148    FormatTools.assertId(currentId, true, 1); 
    149149    byte[] plane = openBytes(no); 
    150150    int channels = core.rgb[0] ? core.sizeC[0] : 1; 
     
    172172  /* @see loci.formats.IFormatReader#getUsedFiles() */ 
    173173  public String[] getUsedFiles() { 
    174     FormatTools.assertId(currentId, true, 1);  
     174    FormatTools.assertId(currentId, true, 1); 
    175175    if (versionTwo) { 
    176176      return new String[] {currentIdsId == null ? "" : currentIdsId}; 
  • trunk/loci/formats/in/IPLabReader.java

    r2695 r2701  
    6868  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    6969  public byte[] openBytes(int no) throws FormatException, IOException { 
    70     FormatTools.assertId(currentId, true, 1);  
     70    FormatTools.assertId(currentId, true, 1); 
    7171    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * bps * core.sizeC[0]]; 
    7272    return openBytes(no, buf); 
     
    7777    throws FormatException, IOException 
    7878  { 
    79     FormatTools.assertId(currentId, true, 1);  
     79    FormatTools.assertId(currentId, true, 1); 
    8080    if (no < 0 || no >= getImageCount()) { 
    8181      throw new FormatException("Invalid image number: " + no); 
     
    9494  /* @see loci.formats.IFormatReader#openImage(int) */ 
    9595  public BufferedImage openImage(int no) throws FormatException, IOException { 
    96     FormatTools.assertId(currentId, true, 1);  
     96    FormatTools.assertId(currentId, true, 1); 
    9797    return ImageTools.makeImage(openBytes(no), core.sizeX[0], core.sizeY[0], 
    9898      core.rgb[0] ? core.sizeC[0] : 1, false, bps, core.littleEndian[0]); 
  • trunk/loci/formats/in/IPWReader.java

    r2695 r2701  
    8787  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    8888  public byte[] openBytes(int no) throws FormatException, IOException { 
    89     FormatTools.assertId(currentId, true, 1);  
     89    FormatTools.assertId(currentId, true, 1); 
    9090    int c = getRGBChannelCount(); 
    9191    if (c == 2) c++; 
     
    9999    throws FormatException, IOException 
    100100  { 
    101     FormatTools.assertId(currentId, true, 1);  
     101    FormatTools.assertId(currentId, true, 1); 
    102102    if (no < 0 || no >= getImageCount()) { 
    103103      throw new FormatException("Invalid image number: " + no); 
     
    143143  /* @see loci.formats.IFormatReader#openImage(int) */ 
    144144  public BufferedImage openImage(int no) throws FormatException, IOException { 
    145     FormatTools.assertId(currentId, true, 1);  
     145    FormatTools.assertId(currentId, true, 1); 
    146146    if (no < 0 || no >= getImageCount()) { 
    147147      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/ImageIOReader.java

    r2695 r2701  
    5757  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    5858  public byte[] openBytes(int no) throws FormatException, IOException { 
    59     FormatTools.assertId(currentId, true, 1);  
     59    FormatTools.assertId(currentId, true, 1); 
    6060    byte[] b = ImageTools.getBytes(openImage(no), false, no); 
    6161    int bytesPerChannel = core.sizeX[0] * core.sizeY[0]; 
     
    7373  /* @see loci.formats.IFormatReader#openImage(int) */ 
    7474  public BufferedImage openImage(int no) throws FormatException, IOException { 
    75     FormatTools.assertId(currentId, true, 1);  
     75    FormatTools.assertId(currentId, true, 1); 
    7676    if (no < 0 || no >= getImageCount()) { 
    7777      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/ImageJReader.java

    r2695 r2701  
    8080  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    8181  public byte[] openBytes(int no) throws FormatException, IOException { 
    82     FormatTools.assertId(currentId, true, 1);  
     82    FormatTools.assertId(currentId, true, 1); 
    8383    byte[] b = ImageTools.getBytes(openImage(no), false, no); 
    8484    return b; 
     
    8989    throws FormatException, IOException 
    9090  { 
    91     FormatTools.assertId(currentId, true, 1);  
     91    FormatTools.assertId(currentId, true, 1); 
    9292    if (no < 0 || no >= getImageCount()) { 
    9393      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/ImarisReader.java

    r2695 r2701  
    6565  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    6666  public byte[] openBytes(int no) throws FormatException, IOException { 
    67     FormatTools.assertId(currentId, true, 1);  
     67    FormatTools.assertId(currentId, true, 1); 
    6868    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0]]; 
    6969    return openBytes(no, buf); 
     
    7474    throws FormatException, IOException 
    7575  { 
    76     FormatTools.assertId(currentId, true, 1);  
     76    FormatTools.assertId(currentId, true, 1); 
    7777    if (no < 0 || no >= getImageCount()) { 
    7878      throw new FormatException("Invalid image number: " + no); 
     
    9393  /* @see loci.formats.IFormatReader#openImage(int) */ 
    9494  public BufferedImage openImage(int no) throws FormatException, IOException { 
    95     FormatTools.assertId(currentId, true, 1);  
     95    FormatTools.assertId(currentId, true, 1); 
    9696    return ImageTools.makeImage(openBytes(no), core.sizeX[0], 
    9797      core.sizeY[0], 1, false); 
  • trunk/loci/formats/in/LIFReader.java

    r2695 r2701  
    7474  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    7575  public byte[] openBytes(int no) throws FormatException, IOException { 
    76     FormatTools.assertId(currentId, true, 1);  
     76    FormatTools.assertId(currentId, true, 1); 
    7777    bpp = bitsPerPixel[series]; 
    7878    while (bpp % 8 != 0) bpp++; 
     
    8686    throws FormatException, IOException 
    8787  { 
    88     FormatTools.assertId(currentId, true, 1);  
     88    FormatTools.assertId(currentId, true, 1); 
    8989    if (no < 0 || no >= getImageCount()) { 
    9090      throw new FormatException("Invalid image number: " + no); 
     
    109109  /* @see loci.formats.IFormatReader#openImage(int) */ 
    110110  public BufferedImage openImage(int no) throws FormatException, IOException { 
    111     FormatTools.assertId(currentId, true, 1);  
     111    FormatTools.assertId(currentId, true, 1); 
    112112    return ImageTools.makeImage(openBytes(no), core.sizeX[series], 
    113113      core.sizeY[series], isRGB() ? core.sizeC[series] : 1, false, bpp / 8, 
  • trunk/loci/formats/in/LegacyPictReader.java

    r2695 r2701  
    5454  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    5555  public byte[] openBytes(int no) throws FormatException, IOException { 
    56     FormatTools.assertId(currentId, true, 1);  
     56    FormatTools.assertId(currentId, true, 1); 
    5757    return ImageTools.getBytes(openImage(no), false, 3); 
    5858  } 
     
    6060  /* @see loci.formats.IFormatReader#openImage(int) */ 
    6161  public BufferedImage openImage(int no) throws FormatException, IOException { 
    62     FormatTools.assertId(currentId, true, 1);  
     62    FormatTools.assertId(currentId, true, 1); 
    6363    if (no < 0 || no >= getImageCount()) { 
    6464      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/LegacyQTReader.java

    r2695 r2701  
    7373  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    7474  public byte[] openBytes(int no) throws FormatException, IOException { 
    75     FormatTools.assertId(currentId, true, 1);  
     75    FormatTools.assertId(currentId, true, 1); 
    7676    return ImageTools.getBytes(openImage(no), false, 3); 
    7777  } 
     
    7979  /* @see loci.formats.IFormatReader#openImage(int) */ 
    8080  public BufferedImage openImage(int no) throws FormatException, IOException { 
    81     FormatTools.assertId(currentId, true, 1);  
     81    FormatTools.assertId(currentId, true, 1); 
    8282    if (no < 0 || no >= getImageCount()) { 
    8383      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/LegacyZVIReader.java

    r2695 r2701  
    9696  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    9797  public byte[] openBytes(int no) throws FormatException, IOException { 
    98     FormatTools.assertId(currentId, true, 1);  
     98    FormatTools.assertId(currentId, true, 1); 
    9999    byte[] buf = new byte[((ZVIBlock) blockList.elementAt(no)).imageSize]; 
    100100    return openBytes(no, buf); 
     
    105105    throws FormatException, IOException 
    106106  { 
    107     FormatTools.assertId(currentId, true, 1);  
     107    FormatTools.assertId(currentId, true, 1); 
    108108    if (no < 0 || no >= getImageCount()) { 
    109109      throw new FormatException("Invalid image number: " + no); 
     
    117117  /* @see loci.formats.IFormatReader#openImage(int) */ 
    118118  public BufferedImage openImage(int no) throws FormatException, IOException { 
    119     FormatTools.assertId(currentId, true, 1);  
     119    FormatTools.assertId(currentId, true, 1); 
    120120    if (no < 0 || no >= getImageCount()) { 
    121121      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/LeicaReader.java

    r2695 r2701  
    109109  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    110110  public byte[] openBytes(int no) throws FormatException, IOException { 
    111     FormatTools.assertId(currentId, true, 1);  
     111    FormatTools.assertId(currentId, true, 1); 
    112112    if (no < 0 || no >= getImageCount()) { 
    113113      throw new FormatException("Invalid image number: " + no); 
     
    126126    throws FormatException, IOException 
    127127  { 
    128     FormatTools.assertId(currentId, true, 1);  
     128    FormatTools.assertId(currentId, true, 1); 
    129129    if (no < 0 || no >= getImageCount()) { 
    130130      throw new FormatException("Invalid image number: " + no); 
     
    142142  /* @see loci.formats.IFormatReader#openImage(int) */ 
    143143  public BufferedImage openImage(int no) throws FormatException, IOException { 
    144     FormatTools.assertId(currentId, true, 1);  
     144    FormatTools.assertId(currentId, true, 1); 
    145145    if (no < 0 || no >= getImageCount()) { 
    146146      throw new FormatException("Invalid image number: " + no); 
     
    159159  /* @see loci.formats.IFormatReader#getUsedFiles() */ 
    160160  public String[] getUsedFiles() { 
    161     FormatTools.assertId(currentId, true, 1);  
     161    FormatTools.assertId(currentId, true, 1); 
    162162    Vector v = new Vector(); 
    163163    v.add(leiFilename); 
  • trunk/loci/formats/in/MNGReader.java

    r2695 r2701  
    6262  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    6363  public byte[] openBytes(int no) throws FormatException, IOException { 
    64     FormatTools.assertId(currentId, true, 1);  
     64    FormatTools.assertId(currentId, true, 1); 
    6565    return ImageTools.getBytes(openImage(no), true, core.sizeC[0]); 
    6666  } 
     
    6868  /* @see loci.formats.IFormatReader#openImage(int) */ 
    6969  public BufferedImage openImage(int no) throws FormatException, IOException { 
    70     FormatTools.assertId(currentId, true, 1);  
     70    FormatTools.assertId(currentId, true, 1); 
    7171    if (no < 0 || no >= getImageCount()) { 
    7272      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/MRCReader.java

    r2695 r2701  
    6363  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    6464  public byte[] openBytes(int no) throws FormatException, IOException { 
    65     FormatTools.assertId(currentId, true, 1);  
     65    FormatTools.assertId(currentId, true, 1); 
    6666    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * bpp]; 
    6767    return openBytes(no, buf); 
     
    7272    throws FormatException, IOException 
    7373  { 
    74     FormatTools.assertId(currentId, true, 1);  
     74    FormatTools.assertId(currentId, true, 1); 
    7575    if (no < 0 || no >= getImageCount()) { 
    7676      throw new FormatException("Invalid image number: " + no); 
     
    8686  /* @see loci.formats.IFormatReader#openImage(int) */ 
    8787  public BufferedImage openImage(int no) throws FormatException, IOException { 
    88     FormatTools.assertId(currentId, true, 1);  
     88    FormatTools.assertId(currentId, true, 1); 
    8989    return ImageTools.makeImage(openBytes(no), core.sizeX[0], 
    9090      core.sizeY[0], 1, true, bpp, core.littleEndian[0]); 
  • trunk/loci/formats/in/MicromanagerReader.java

    r2695 r2701  
    6262  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    6363  public byte[] openBytes(int no) throws FormatException, IOException { 
    64     FormatTools.assertId(currentId, true, 1);  
     64    FormatTools.assertId(currentId, true, 1); 
    6565    if (no < 0 || no >= getImageCount()) { 
    6666      throw new FormatException("Invalid image number: " + no); 
     
    7373    throws FormatException, IOException 
    7474  { 
    75     FormatTools.assertId(currentId, true, 1);  
     75    FormatTools.assertId(currentId, true, 1); 
    7676    if (no < 0 || no >= getImageCount()) { 
    7777      throw new FormatException("Invalid image number: " + no); 
     
    8282  /* @see loci.formats.IFormatReader#openImage(int) */ 
    8383  public BufferedImage openImage(int no) throws FormatException, IOException { 
    84     FormatTools.assertId(currentId, true, 1);  
     84    FormatTools.assertId(currentId, true, 1); 
    8585    if (no < 0 || no >= getImageCount()) { 
    8686      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/ND2Reader.java

    r2695 r2701  
    137137  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    138138  public byte[] openBytes(int no) throws FormatException, IOException { 
    139     FormatTools.assertId(currentId, true, 1);  
     139    FormatTools.assertId(currentId, true, 1); 
    140140    if (no < 0 || no >= getImageCount()) { 
    141141      throw new FormatException("Invalid image number: " + no); 
     
    157157  /* @see loci.formats.IFormatReader#openImage(int) */ 
    158158  public BufferedImage openImage(int no) throws FormatException, IOException { 
    159     FormatTools.assertId(currentId, true, 1);  
     159    FormatTools.assertId(currentId, true, 1); 
    160160    if (no < 0 || no >= getImageCount()) { 
    161161      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/NRRDReader.java

    r2695 r2701  
    6363  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    6464  public byte[] openBytes(int no) throws FormatException, IOException { 
    65     FormatTools.assertId(currentId, true, 1);  
     65    FormatTools.assertId(currentId, true, 1); 
    6666    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * core.sizeC[0] * 
    6767      FormatTools.getBytesPerPixel(core.pixelType[0])]; 
     
    7373    throws FormatException, IOException 
    7474  { 
    75     FormatTools.assertId(currentId, true, 1);  
     75    FormatTools.assertId(currentId, true, 1); 
    7676    if (no < 0 || no >= core.imageCount[0]) { 
    7777      throw new FormatException("Invalid image number: " + no); 
     
    9898  /* @see loci.formats.IFormatReader#openImage(int) */ 
    9999  public BufferedImage openImage(int no) throws FormatException, IOException { 
    100     FormatTools.assertId(currentId, true, 1);  
     100    FormatTools.assertId(currentId, true, 1); 
    101101    if (core.pixelType[0] == FormatTools.FLOAT) { 
    102102      byte[] b = openBytes(no); 
  • trunk/loci/formats/in/OIBReader.java

    r2695 r2701  
    138138  /* @see loci.formats.IFormatReader#openImage(int) */ 
    139139  public BufferedImage openImage(int no) throws FormatException, IOException { 
    140     FormatTools.assertId(currentId, true, 1);  
     140    FormatTools.assertId(currentId, true, 1); 
    141141    if (no < 0 || no >= getImageCount()) { 
    142142      throw new FormatException("Invalid image number: " + no); 
     
    154154  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    155155  public byte[] openBytes(int no) throws FormatException, IOException { 
    156     FormatTools.assertId(currentId, true, 1);  
     156    FormatTools.assertId(currentId, true, 1); 
    157157    byte[] buf = new byte[core.sizeX[series] * core.sizeY[series] * 
    158158      getRGBChannelCount() * 
     
    165165    throws FormatException, IOException 
    166166  { 
    167     FormatTools.assertId(currentId, true, 1);  
     167    FormatTools.assertId(currentId, true, 1); 
    168168    if (no < 0 || no >= getImageCount()) { 
    169169      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/OIFReader.java

    r2695 r2701  
    7575  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    7676  public byte[] openBytes(int no) throws FormatException, IOException { 
    77     FormatTools.assertId(currentId, true, 1);  
     77    FormatTools.assertId(currentId, true, 1); 
    7878    byte[] b = tiffReader[no].openBytes(0); 
    7979    tiffReader[no].close(); 
     
    8585    throws FormatException, IOException 
    8686  { 
    87     FormatTools.assertId(currentId, true, 1);  
     87    FormatTools.assertId(currentId, true, 1); 
    8888    if (no < 0 || no >= getImageCount()) { 
    8989      throw new FormatException("Invalid image number: " + no); 
     
    9797  /* @see loci.formats.IFormatReader#openImage(int) */ 
    9898  public BufferedImage openImage(int no) throws FormatException, IOException { 
    99     FormatTools.assertId(currentId, true, 1);  
     99    FormatTools.assertId(currentId, true, 1); 
    100100    if (no < 0 || no >= getImageCount()) { 
    101101      throw new FormatException("Invalid image number: " + no); 
     
    114114    throws FormatException, IOException 
    115115  { 
    116     FormatTools.assertId(currentId, true, 1);  
     116    FormatTools.assertId(currentId, true, 1); 
    117117    if (no < 0 || no >= getImageCount()) { 
    118118      throw new FormatException("Invalid image number: " + no); 
     
    132132  /* @see loci.formats.IFormatReader#getUsedFiles() */ 
    133133  public String[] getUsedFiles() { 
    134     FormatTools.assertId(currentId, true, 1);  
     134    FormatTools.assertId(currentId, true, 1); 
    135135    return (String[]) usedFiles.toArray(new String[0]); 
    136136  } 
  • trunk/loci/formats/in/OMEXMLReader.java

    r2695 r2701  
    8383  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    8484  public byte[] openBytes(int no) throws FormatException, IOException { 
    85     FormatTools.assertId(currentId, true, 1);  
     85    FormatTools.assertId(currentId, true, 1); 
    8686    if (no < 0 || no >= core.imageCount[series]) { 
    8787      throw new FormatException("Invalid image number: " + no); 
     
    150150  /* @see loci.formats.IFormatReader#openImage(int) */ 
    151151  public BufferedImage openImage(int no) throws FormatException, IOException { 
    152     FormatTools.assertId(currentId, true, 1);  
     152    FormatTools.assertId(currentId, true, 1); 
    153153    return ImageTools.makeImage(openBytes(no), core.sizeX[series], 
    154154      core.sizeY[series], 1, false, bpp[series], core.littleEndian[series]); 
  • trunk/loci/formats/in/OpenlabRawReader.java

    r2695 r2701  
    6464  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    6565  public byte[] openBytes(int no) throws FormatException, IOException { 
    66     FormatTools.assertId(currentId, true, 1);  
     66    FormatTools.assertId(currentId, true, 1); 
    6767    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * bytesPerPixel]; 
    6868    return openBytes(no, buf); 
     
    7373    throws FormatException, IOException 
    7474  { 
    75     FormatTools.assertId(currentId, true, 1);  
     75    FormatTools.assertId(currentId, true, 1); 
    7676    if (no < 0 || no >= getImageCount()) { 
    7777      throw new FormatException("Invalid image number: " + no); 
     
    9595  /* @see loci.formats.IFormatReader#openImage(int) */ 
    9696  public BufferedImage openImage(int no) throws FormatException, IOException { 
    97     FormatTools.assertId(currentId, true, 1);  
     97    FormatTools.assertId(currentId, true, 1); 
    9898    return ImageTools.makeImage(openBytes(no), core.sizeX[0], 
    9999      core.sizeY[0], core.sizeC[0], false, bytesPerPixel, false); 
  • trunk/loci/formats/in/OpenlabReader.java

    r2695 r2701  
    8686  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    8787  public byte[] openBytes(int no) throws FormatException, IOException { 
    88     FormatTools.assertId(currentId, true, 1);  
     88    FormatTools.assertId(currentId, true, 1); 
    8989    if (no < 0 || no >= getImageCount()) { 
    9090      throw new FormatException("Invalid image number: " + no); 
     
    290290  /* @see loci.formats.IFormatReader#openImage(int) */ 
    291291  public BufferedImage openImage(int no) throws FormatException, IOException { 
    292     FormatTools.assertId(currentId, true, 1);  
     292    FormatTools.assertId(currentId, true, 1); 
    293293    if (no < 0 || no >= getImageCount()) { 
    294294      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/PerkinElmerReader.java

    r2695 r2701  
    7070  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    7171  public byte[] openBytes(int no) throws FormatException, IOException { 
    72     FormatTools.assertId(currentId, true, 1);  
     72    FormatTools.assertId(currentId, true, 1); 
    7373    if (isTiff) { 
    7474      return tiff[no / core.sizeC[0]].openBytes(0); 
     
    8686  /* @see loci.formats.IFormatReader#openImage(int) */ 
    8787  public BufferedImage openImage(int no) throws FormatException, IOException { 
    88     FormatTools.assertId(currentId, true, 1);  
     88    FormatTools.assertId(currentId, true, 1); 
    8989    if (no < 0 || no >= getImageCount()) { 
    9090      throw new FormatException("Invalid image number: " + no); 
     
    104104  /* @see loci.formats.IFormatReader#getUsedFiles() */ 
    105105  public String[] getUsedFiles() { 
    106     FormatTools.assertId(currentId, true, 1);  
     106    FormatTools.assertId(currentId, true, 1); 
    107107    return (String[]) allFiles.toArray(new String[0]); 
    108108  } 
  • trunk/loci/formats/in/PictReader.java

    r2695 r2701  
    275275  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    276276  public byte[] openBytes(int no) throws FormatException, IOException { 
    277     FormatTools.assertId(currentId, true, 1);  
     277    FormatTools.assertId(currentId, true, 1); 
    278278    return ImageTools.getBytes(openImage(no), false, no % 3); 
    279279  } 
     
    281281  /* @see loci.formats.IFormatReader#openImage(int) */ 
    282282  public BufferedImage openImage(int no) throws FormatException, IOException { 
    283     FormatTools.assertId(currentId, true, 1);  
     283    FormatTools.assertId(currentId, true, 1); 
    284284    if (no < 0 || no >= getImageCount()) { 
    285285      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/PrairieReader.java

    r2695 r2701  
    104104  /* @see loci.formats.IFormatReader#getUsedFiles() */ 
    105105  public String[] getUsedFiles() { 
    106     FormatTools.assertId(currentId, true, 1);  
     106    FormatTools.assertId(currentId, true, 1); 
    107107    String[] s = new String[files.length + 2]; 
    108108    System.arraycopy(files, 0, s, 0, files.length); 
     
    114114  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    115115  public byte[] openBytes(int no) throws FormatException, IOException { 
    116     FormatTools.assertId(currentId, true, 1);  
     116    FormatTools.assertId(currentId, true, 1); 
    117117    if (no < 0 || no >= getImageCount()) { 
    118118      throw new FormatException("Invalid image number: " + no); 
     
    126126    throws FormatException, IOException 
    127127  { 
    128     FormatTools.assertId(currentId, true, 1);  
     128    FormatTools.assertId(currentId, true, 1); 
    129129    if (no < 0 || no >= getImageCount()) { 
    130130      throw new FormatException("Invalid image number: " + no); 
     
    137137  /* @see loci.formats.IFormatReader#openImage(int) */ 
    138138  public BufferedImage openImage(int no) throws FormatException, IOException { 
    139     FormatTools.assertId(currentId, true, 1);  
     139    FormatTools.assertId(currentId, true, 1); 
    140140    if (no < 0 || no >= getImageCount()) { 
    141141      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/QTReader.java

    r2695 r2701  
    141141  /* @see loci.formats.IFormatReader#setMetadataStore(MetadataStore) */ 
    142142  public void setMetadataStore(MetadataStore store) { 
    143     FormatTools.assertId(currentId, false, 1);  
     143    FormatTools.assertId(currentId, false, 1); 
    144144    super.setMetadataStore(store); 
    145145    if (useLegacy) legacy.setMetadataStore(store); 
     
    148148  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    149149  public byte[] openBytes(int no) throws FormatException, IOException { 
    150     FormatTools.assertId(currentId, true, 1);  
     150    FormatTools.assertId(currentId, true, 1); 
    151151    if (no < 0 || no >= getImageCount()) { 
    152152      throw new FormatException("Invalid image number: " + no); 
     
    338338  /* @see loci.formats.IFormatReader#openImage(int) */ 
    339339  public BufferedImage openImage(int no) throws FormatException, IOException { 
    340     FormatTools.assertId(currentId, true, 1);  
     340    FormatTools.assertId(currentId, true, 1); 
    341341    if (no < 0 || no >= getImageCount()) { 
    342342      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/SDTReader.java

    r2695 r2701  
    9595  /* @see loci.formats.IFormatReader#getRGBChannelCount(String) */ 
    9696  public int getRGBChannelCount() { 
    97     FormatTools.assertId(currentId, true, 1);  
     97    FormatTools.assertId(currentId, true, 1); 
    9898    return intensity ? 1 : timeBins; 
    9999  } 
     
    101101  /* @see loci.formats.IFormatReader#getChannelDimLengths() */ 
    102102  public int[] getChannelDimLengths() { 
    103     FormatTools.assertId(currentId, true, 1);  
     103    FormatTools.assertId(currentId, true, 1); 
    104104    return intensity ? new int[] {channels} : new int[] {timeBins, channels}; 
    105105  } 
     
    107107  /* @see loci.formats.IFormatReader#getChannelDimTypes() */ 
    108108  public String[] getChannelDimTypes() { 
    109     FormatTools.assertId(currentId, true, 1);  
     109    FormatTools.assertId(currentId, true, 1); 
    110110    return intensity ? new String[] {FormatTools.SPECTRA} : 
    111111      new String[] {FormatTools.LIFETIME, FormatTools.SPECTRA}; 
     
    114114  /* @see loci.formats.IFormatReader#isInterleaved(int) */ 
    115115  public boolean isInterleaved(int subC) { 
    116     FormatTools.assertId(currentId, true, 1);  
     116    FormatTools.assertId(currentId, true, 1); 
    117117    return !intensity && subC == 0; 
    118118  } 
     
    120120  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    121121  public byte[] openBytes(int no) throws FormatException, IOException { 
    122     FormatTools.assertId(currentId, true, 1);  
     122    FormatTools.assertId(currentId, true, 1); 
    123123    int c = getRGBChannelCount(); 
    124124    byte[] buf = new byte[2 * c * core.sizeX[series] * core.sizeY[series]]; 
     
    130130    throws FormatException, IOException 
    131131  { 
    132     FormatTools.assertId(currentId, true, 1);  
     132    FormatTools.assertId(currentId, true, 1); 
    133133    if (no < 0 || no >= timeBins * channels) { 
    134134      throw new FormatException("Invalid image number: " + no); 
     
    173173  /* @see loci.formats.IFormatReader#openImage(int) */ 
    174174  public BufferedImage openImage(int no) throws FormatException, IOException { 
    175     FormatTools.assertId(currentId, true, 1);  
     175    FormatTools.assertId(currentId, true, 1); 
    176176    return ImageTools.makeImage(openBytes(no), core.sizeX[series], 
    177177      core.sizeY[series], getRGBChannelCount(), false, 2, true); 
  • trunk/loci/formats/in/SlidebookReader.java

    r2695 r2701  
    6363  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    6464  public byte[] openBytes(int no) throws FormatException, IOException { 
    65     FormatTools.assertId(currentId, true, 1);  
     65    FormatTools.assertId(currentId, true, 1); 
    6666    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * 2]; 
    6767    return openBytes(no, buf); 
     
    7272    throws FormatException, IOException 
    7373  { 
    74     FormatTools.assertId(currentId, true, 1);  
     74    FormatTools.assertId(currentId, true, 1); 
    7575    if (no < 0 || no >= getImageCount()) { 
    7676      throw new FormatException("Invalid image number: " + no); 
     
    8686  /* @see loci.formats.IFormatReader#openImage(int) */ 
    8787  public BufferedImage openImage(int no) throws FormatException, IOException { 
    88     FormatTools.assertId(currentId, true, 1);  
     88    FormatTools.assertId(currentId, true, 1); 
    8989    return ImageTools.makeImage(openBytes(no), core.sizeX[0], 
    9090      core.sizeY[0], 1, true, bpp, true); 
  • trunk/loci/formats/in/ZeissLSMReader.java

    r2695 r2701  
    7979  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    8080  public byte[] openBytes(int no) throws FormatException, IOException { 
    81     FormatTools.assertId(currentId, true, 1);  
     81    FormatTools.assertId(currentId, true, 1); 
    8282    if (no < 0 || no >= getImageCount()) { 
    8383      throw new FormatException("Invalid image number: " + no); 
     
    9393    throws FormatException, IOException 
    9494  { 
    95     FormatTools.assertId(currentId, true, 1);  
     95    FormatTools.assertId(currentId, true, 1); 
    9696    if (no < 0 || no >= getImageCount()) { 
    9797      throw new FormatException("Invalid image number: " + no); 
     
    111111  /* @see loci.formats.IFormatReader#openImage(int) */ 
    112112  public BufferedImage openImage(int no) throws FormatException, IOException { 
    113     FormatTools.assertId(currentId, true, 1);  
     113    FormatTools.assertId(currentId, true, 1); 
    114114    if (no < 0 || no >= getImageCount()) { 
    115115      throw new FormatException("Invalid image number: " + no); 
     
    124124    throws FormatException, IOException 
    125125  { 
    126     FormatTools.assertId(currentId, true, 1);  
     126    FormatTools.assertId(currentId, true, 1); 
    127127    if (no < 0 || no >= getImageCount()) { 
    128128      throw new FormatException("Invalid image number: " + no); 
  • trunk/loci/formats/in/ZeissZVIReader.java

    r2695 r2701  
    120120  /* @see loci.formats.IFormatReader#setMetadataStore(MetadataStore) */ 
    121121  public void setMetadataStore(MetadataStore store) { 
    122     FormatTools.assertId(currentId, false, 1);  
     122    FormatTools.assertId(currentId, false, 1); 
    123123    super.setMetadataStore(store); 
    124124    if (noPOI || needLegacy) legacy.setMetadataStore(store); 
     
    127127  /* @see loci.formats.IFormatReader#openBytes(int) */ 
    128128  public byte[] openBytes(int no) throws FormatException, IOException { 
    129     FormatTools.assertId(currentId, true, 1);  
     129    FormatTools.assertId(currentId, true, 1); 
    130130    byte[] buf = new byte[core.sizeX[0] * core.sizeY[0] * 
    131131      FormatTools.getBytesPerPixel(core.pixelType[0]) * getRGBChannelCount()]; 
     
    137137    throws FormatException, IOException 
    138138  { 
    139     FormatTools.assertId(currentId, true, 1);  
     139    FormatTools.assertId(currentId, true, 1); 
    140140    if (noPOI || needLegacy) return legacy.openBytes(no, buf); 
    141141    if (no < 0 || no >= getImageCount()) { 
     
    186186  /* @see loci.formats.IFormatReader#openImage(int) */ 
    187187  public BufferedImage openImage(int no) throws FormatException, IOException { 
    188     FormatTools.assertId(currentId, true, 1);  
     188    FormatTools.assertId(currentId, true, 1); 
    189189    return ImageTools.makeImage(openBytes(no), core.sizeX[0], core.sizeY[0], 
    190190      getRGBChannelCount(), true, bpp == 3 ? 1 : bpp, true, 
Note: See TracChangeset for help on using the changeset viewer.