Changeset 4018


Ignore:
Timestamp:
05/07/08 14:27:07 (12 years ago)
Author:
melissa
Message:

Removed setId(String, boolean).

Location:
trunk/loci/formats
Files:
11 edited

Legend:

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

    r4001 r4018  
    6161  public void setId(String id) throws FormatException, IOException { 
    6262    super.setId(id); 
    63  
    64     // clear last image cache 
    65     lastImage = null; 
    66     lastImageIndex = -1; 
    67     lastImageSeries = -1; 
    68   } 
    69  
    70   /* @see IFormatReader#setId(id, force) */ 
    71   public void setId(String id, boolean force) 
    72     throws FormatException, IOException 
    73   { 
    74     super.setId(id, force); 
    7563 
    7664    // clear last image cache 
  • trunk/loci/formats/FileStitcher.java

    r4017 r4018  
    794794  } 
    795795 
    796   /* @see IFormatHandler#setId(String, boolean) */ 
    797   public void setId(String id, boolean force) 
    798     throws FormatException, IOException 
    799   { 
    800     if (!id.equals(currentId) || force) initFile(id); 
    801   } 
    802  
    803796  /* @see IFormatHandler#close() */ 
    804797  public void close() throws IOException { close(false); } 
  • trunk/loci/formats/FormatHandler.java

    r3781 r4018  
    130130  public String[] getSuffixes() { return suffixes; } 
    131131 
    132   /* @see IFormatHandler#setId(String) */ 
    133   public void setId(String id) throws FormatException, IOException { 
    134     setId(id, false); 
    135   } 
    136  
    137132  // -- StatusReporter API methods -- 
    138133 
  • trunk/loci/formats/FormatReader.java

    r3737 r4018  
    213213  // -- IFormatReader API methods -- 
    214214 
     215  /* @see IFormatReader#setId(String) */ 
     216  public void setId(String id) throws FormatException, IOException { 
     217    close(); 
     218    initFile(id); 
     219  } 
     220 
    215221  /** 
    216222   * Checks if a file matches the type of this format reader. 
     
    627633  } 
    628634 
    629   /* @see IFormatHandler#setId(String, boolean) */ 
    630   public void setId(String id, boolean force) 
    631     throws FormatException, IOException 
    632   { 
    633     if (!id.equals(currentId) || force) initFile(id); 
    634   } 
    635  
    636635  /* @see IFormatHandler#close() */ 
    637636  public void close() throws IOException { 
  • trunk/loci/formats/FormatWriter.java

    r3692 r4018  
    172172  // -- IFormatHandler API methods -- 
    173173 
    174   /* @see IFormatHandler#setId(String, boolean) */ 
    175   public void setId(String id, boolean force) 
    176     throws FormatException, IOException 
    177   { 
    178     if (id.equals(currentId) && !force) return; 
     174  /* @see IFormatHandler#setId(String) */ 
     175  public void setId(String id) throws FormatException, IOException { 
     176    if (id.equals(currentId)) return; 
    179177    close(); 
    180178    currentId = id; 
  • trunk/loci/formats/IFormatHandler.java

    r3683 r4018  
    4848  void setId(String id) throws FormatException, IOException; 
    4949 
    50   /** 
    51    * Sets the current file name. 
    52    * @param force If set, the handler will be re-initialized no matter what. 
    53    */ 
    54   void setId(String id, boolean force) throws FormatException, IOException; 
    55  
    5650  /** Closes currently open file(s) and frees allocated memory. */ 
    5751  void close() throws IOException; 
  • trunk/loci/formats/ImageReader.java

    r4017 r4018  
    566566  } 
    567567 
    568   /* @see IFormatHandler#setId(String, boolean) */ 
    569   public void setId(String id, boolean force) 
    570     throws FormatException, IOException 
    571   { 
    572     getReader(id).setId(id, force); 
    573   } 
    574  
    575568  /* @see IFormatHandler#close() */ 
    576569  public void close() throws IOException { close(false); } 
  • trunk/loci/formats/ImageWriter.java

    r3692 r4018  
    309309  } 
    310310 
    311   /* @see IFormatHandler#setId(String, boolean) */ 
    312   public void setId(String id, boolean force) 
    313     throws FormatException, IOException 
    314   { 
    315     getWriter(id).setId(id, force); 
    316   } 
    317  
    318311  /* @see IFormatHandler#close() */ 
    319312  public void close() throws IOException { 
  • trunk/loci/formats/ReaderWrapper.java

    r3692 r4018  
    7373  } 
    7474 
    75   public void setId(String id, boolean force) 
    76     throws FormatException, IOException 
    77   { 
    78     reader.setId(id, force); 
    79   } 
    80  
    8175  public int getImageCount() { 
    8276    return reader.getImageCount(); 
  • trunk/loci/formats/in/ND2Reader.java

    r4003 r4018  
    354354 
    355355    if (legacy) { 
    356       legacyReader.setId(id, true); 
     356      legacyReader.close(); 
     357      legacyReader.setId(id); 
    357358      core = legacyReader.getCoreMetadata(); 
    358359      metadataStore = legacyReader.getMetadataStore(); 
  • trunk/loci/formats/in/QTReader.java

    r3842 r4018  
    348348      useLegacy = true; 
    349349      legacy = createLegacyReader(); 
    350       legacy.setId(id, true); 
     350      legacy.setId(id); 
    351351      core = legacy.getCoreMetadata(); 
    352352      return; 
Note: See TracChangeset for help on using the changeset viewer.