Changeset 6058


Ignore:
Timestamp:
03/22/10 08:46:15 (10 years ago)
Author:
melissa
Message:

Eliminated a few deprecation warnings.

Location:
trunk/components/bio-formats/src/loci/formats/in
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/in/L2DReader.java

    r6051 r6058  
    2525 
    2626import java.io.IOException; 
     27import java.util.Hashtable; 
    2728import java.util.StringTokenizer; 
    2829import java.util.Vector; 
     
    164165      core = r.getCoreMetadata(); 
    165166      metadataStore = r.getMetadataStore(); 
    166       metadata = r.getMetadata(); 
     167 
     168      Hashtable globalMetadata = r.getGlobalMetadata(); 
     169      for (Object key : globalMetadata.keySet()) { 
     170        addGlobalMeta(key.toString(), globalMetadata.get(key)); 
     171      } 
    167172      r.close(); 
    168173      reader = new MinimalTiffReader(); 
  • trunk/components/bio-formats/src/loci/formats/in/LeicaReader.java

    r6055 r6058  
    357357 
    358358      core = r.getCoreMetadata(); 
    359       metadata = r.getMetadata(); 
    360359      metadataStore = r.getMetadataStore(); 
     360 
     361      Hashtable globalMetadata = r.getGlobalMetadata(); 
     362      for (Object key : globalMetadata.keySet()) { 
     363        addGlobalMeta(key.toString(), globalMetadata.get(key)); 
     364      } 
     365 
    361366      r.close(); 
    362367 
  • trunk/components/bio-formats/src/loci/formats/in/MIASReader.java

    r6055 r6058  
    293293      r.setId(tiffs[0][0]); 
    294294      core = r.getCoreMetadata(); 
    295       metadata = r.getMetadata(); 
    296295      metadataStore = r.getMetadataStore(); 
     296 
     297      Hashtable globalMetadata = r.getGlobalMetadata(); 
     298      for (Object key : globalMetadata.keySet()) { 
     299        addGlobalMeta(key.toString(), globalMetadata.get(key)); 
     300      } 
     301 
    297302      r.close(); 
    298303 
  • trunk/components/bio-formats/src/loci/formats/in/PrairieReader.java

    r6055 r6058  
    359359        core = tiff.getCoreMetadata(); 
    360360        metadataStore = tiff.getMetadataStore(); 
    361         metadata = tiff.getMetadata(); 
     361 
     362        Hashtable globalMetadata = tiff.getGlobalMetadata(); 
     363        for (Object key : globalMetadata.keySet()) { 
     364          addGlobalMeta(key.toString(), globalMetadata.get(key)); 
     365        } 
    362366      } 
    363367    } 
  • trunk/components/bio-formats/src/loci/formats/in/ScanrReader.java

    r6055 r6058  
    202202      r.setId(id); 
    203203      core = r.getCoreMetadata(); 
    204       metadata = r.getMetadata(); 
    205204      metadataStore = r.getMetadataStore(); 
     205 
     206      Hashtable globalMetadata = r.getGlobalMetadata(); 
     207      for (Object key : globalMetadata.keySet()) { 
     208        addGlobalMeta(key.toString(), globalMetadata.get(key)); 
     209      } 
     210 
    206211      r.close(); 
    207212      tiffs = new String[] {id}; 
Note: See TracChangeset for help on using the changeset viewer.