Changeset 3871


Ignore:
Timestamp:
04/02/08 14:06:26 (12 years ago)
Author:
curtis
Message:

Restore usedFiles logic, but respect noStitch flag first.

File:
1 edited

Legend:

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

    r3827 r3871  
    667667    FormatTools.assertId(currentId, true, 2); 
    668668 
     669    if (noStitch) return reader.getUsedFiles(); 
     670 
    669671    // returning the files list directly here is fast, since we do not 
    670672    // have to call initFile on each constituent file; but we can only do so 
    671673    // when each constituent file does not itself have multiple used files 
    672674 
    673     if (reader.getUsedFiles().length > 1 || noStitch) { 
     675    if (reader.getUsedFiles().length > 1) { 
    674676      // each constituent file has multiple used files; we must build the list 
    675677      // this could happen with, e.g., a stitched collection of ICS/IDS pairs 
    676678      // we have no datasets structured this way, so this logic is untested 
    677       /* 
    678679      if (usedFiles == null) { 
    679680        String[][][] used = new String[files.length][][]; 
     
    704705        } 
    705706      } 
    706       */ 
    707       return reader.getUsedFiles(); 
     707      return usedFiles; 
    708708    } 
    709709    // assume every constituent file has no other used files 
Note: See TracChangeset for help on using the changeset viewer.