Changeset 3263


Ignore:
Timestamp:
10/11/07 12:20:56 (12 years ago)
Author:
curtis
Message:

Rename "used" to "usedFiles" so it is easier to search.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/OMETiffReader.java

    r3261 r3263  
    5252 
    5353  /** List of used files. */ 
    54   private String[] used; 
     54  private String[] usedFiles; 
    5555 
    5656  /** List of Image IDs. */ 
     
    182182    } 
    183183 
    184     used = (String[]) files.toArray(new String[0]); 
    185     usedIFDs = new Hashtable[used.length][]; 
    186  
    187     for (int i=0; i<used.length; i++) { 
    188       if (used[i].endsWith(currentId)) { 
     184    usedFiles = (String[]) files.toArray(new String[0]); 
     185    usedIFDs = new Hashtable[usedFiles.length][]; 
     186 
     187    for (int i=0; i<usedFiles.length; i++) { 
     188      if (usedFiles[i].endsWith(currentId)) { 
    189189        usedIFDs[i] = ifds; 
    190190        continue; 
    191191      } 
    192       status("Parsing " + used[i]); 
     192      status("Parsing " + usedFiles[i]); 
    193193      currentSeries = -1; 
    194194      tempIfdMap = null; 
     
    197197      currentFile = i; 
    198198 
    199       usedIFDs[i] = TiffTools.getIFDs(new RandomAccessStream(used[i])); 
     199      usedIFDs[i] = TiffTools.getIFDs(new RandomAccessStream(usedFiles[i])); 
    200200      String c = (String) 
    201201        TiffTools.getIFDValue(usedIFDs[i][0], TiffTools.IMAGE_DESCRIPTION); 
     
    252252  public String[] getUsedFiles() { 
    253253    FormatTools.assertId(currentId, true, 1); 
    254     return used; 
     254    return usedFiles; 
    255255  } 
    256256 
     
    266266    int fileIndex = fileMap[series][no]; 
    267267 
    268     in = new RandomAccessStream(used[fileIndex]); 
     268    in = new RandomAccessStream(usedFiles[fileIndex]); 
    269269    TiffTools.getSamples(usedIFDs[fileIndex][ifd], in, buf); 
    270270    in.close(); 
Note: See TracChangeset for help on using the changeset viewer.