Changeset 1959


Ignore:
Timestamp:
12/21/06 12:14:06 (13 years ago)
Author:
curtis
Message:

Clean up getUsedFiles -- never wrap results with getMappedId.
Still needs to be integrated and tested with omebf.

Location:
trunk/loci/formats
Files:
5 edited

Legend:

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

    r1950 r1959  
    372372  public String[] getUsedFiles(String id) throws FormatException, IOException { 
    373373    if (!id.equals(currentId)) initFile(id); 
    374     return new String[] {getMappedId(id)}; 
     374    return new String[] {id}; 
    375375  } 
    376376 
  • trunk/loci/formats/in/ICSReader.java

    r1947 r1959  
    182182  public String[] getUsedFiles(String id) throws FormatException, IOException { 
    183183    if (!id.equals(currentId)) initFile(id); 
    184     if (versionTwo) return new String[] {getMappedId(currentIdsId)}; 
    185     return new String[] {getMappedId(currentIdsId), getMappedId(currentIcsId)}; 
     184    if (versionTwo) return new String[] {currentIdsId}; 
     185    return new String[] {currentIdsId, currentIcsId}; 
    186186  } 
    187187 
  • trunk/loci/formats/in/LeicaReader.java

    r1947 r1959  
    194194    if (!id.equals(currentId)) initFile(id); 
    195195    Vector v = new Vector(); 
    196     v.add(getMappedId(id)); 
     196    v.add(id); 
    197197    for (int i=0; i<files.length; i++) { 
    198198      for (int j=0; j<files[i].size(); j++) { 
  • trunk/loci/formats/in/OIFReader.java

    r1947 r1959  
    202202    if (!id.equals(currentId)) initFile(id); 
    203203    String[] s = new String[tiffs.size() + 1]; 
    204     s[0] = getMappedId(currentId); 
    205     for (int i=1; i<s.length; i++) s[i] = getMappedId((String) tiffs.get(i-1)); 
     204    s[0] = currentId; 
     205    for (int i=1; i<s.length; i++) s[i] = (String) tiffs.get(i-1); 
    206206    return s; 
    207207  } 
  • trunk/loci/formats/in/PerkinElmerReader.java

    r1947 r1959  
    177177    String[] ls = workingDir.list(); 
    178178 
    179     allFiles.add(getMappedId(id)); 
     179    allFiles.add(id); 
    180180 
    181181    // check if we have any of the required header file types 
Note: See TracChangeset for help on using the changeset viewer.