Changeset 6756


Ignore:
Timestamp:
08/02/10 12:33:38 (9 years ago)
Author:
melissa
Message:

Always reinitialize the 'core' variable; this prevents tests in components/test-suite from inappropriately failing.

File:
1 edited

Legend:

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

    r6446 r6756  
    5252  private CoreMetadata[] core; 
    5353 
     54  private String[] outputOrder; 
     55 
    5456  // -- Constructors -- 
    5557 
     
    5961  /** Constructs a DimensionSwapper with the given reader. */ 
    6062  public DimensionSwapper(IFormatReader r) { super(r); } 
    61  
    62   private String[] outputOrder; 
    6363 
    6464  // -- DimensionSwapper API methods -- 
     
    276276  /* @see IFormatHandler#setId(String) */ 
    277277  public void setId(String id) throws FormatException, IOException { 
    278     String oldFile = getCurrentFile(); 
    279278    super.setId(id); 
    280     if (!id.equals(oldFile) || outputOrder == null || 
    281       outputOrder.length != getSeriesCount()) 
    282     { 
    283       outputOrder = new String[getSeriesCount()]; 
    284  
    285       // NB: Create our own copy of the CoreMetadata, 
    286       // which we can manipulate safely. 
    287       core = copyCoreMetadata(reader); 
    288     } 
     279    outputOrder = new String[getSeriesCount()]; 
     280 
     281    // NB: Create our own copy of the CoreMetadata, 
     282    // which we can manipulate safely. 
     283    core = copyCoreMetadata(reader); 
    289284  } 
    290285 
Note: See TracChangeset for help on using the changeset viewer.