Changeset 5111


Ignore:
Timestamp:
05/14/09 16:36:07 (11 years ago)
Author:
curtis
Message:

Minor progress on LOCI plugins refactoring.

Location:
trunk/components/loci-plugins/src/loci/plugins
Files:
6 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/loci-plugins/src/loci/plugins/LociExporter.java

    r5102 r5111  
    3737/** 
    3838 * ImageJ plugin for writing files using the LOCI Bio-Formats package. 
    39  * Wraps core logic in {@link loci.plugins.Exporter}, to avoid direct 
    40  * references to classes in the external Bio-Formats library. 
     39 * Wraps core logic in {@link loci.plugins.exporter.Exporter}, to avoid 
     40 * direct references to classes in the external Bio-Formats library. 
    4141 * 
    4242 * <dl><dt><b>Source code:</b></dt> 
  • trunk/components/loci-plugins/src/loci/plugins/LociImporter.java

    r5102 r5111  
    3535/** 
    3636 * ImageJ plugin for reading files using the LOCI Bio-Formats package. 
    37  * Wraps core logic in {@link loci.plugins.Importer}, to avoid direct 
    38  * references to classes in the external Bio-Formats library. 
     37 * Wraps core logic in {@link loci.plugins.importer.Importer}, to avoid 
     38 * direct references to classes in the external Bio-Formats library. 
    3939 * 
    4040 * <dl><dt><b>Source code:</b></dt> 
  • trunk/components/loci-plugins/src/loci/plugins/config/ConfigWindow.java

    r5093 r5111  
    4141import java.lang.reflect.Method; 
    4242import java.util.Date; 
    43 import java.util.Hashtable; 
     43import java.util.HashMap; 
    4444 
    4545import javax.imageio.spi.IIORegistry; 
     
    294294      Class irClass = Class.forName("loci.formats.ImageReader"); 
    295295      Object ir = irClass.newInstance(); 
    296       Method getClasses = irClass.getMethod("getReaders", null); 
    297       Object[] readers = (Object[]) getClasses.invoke(ir, null); 
     296      Method getClasses = irClass.getMethod("getReaders"); 
     297      Object[] readers = (Object[]) getClasses.invoke(ir); 
    298298      for (int i=0; i<readers.length; i++) { 
    299299        FormatEntry entry = new FormatEntry(log, readers[i]); 
     
    326326      Class qtToolsClass = Class.forName("loci.formats.LegacyQTTools"); 
    327327      Object qtTools = qtToolsClass.newInstance(); 
    328       Method getQTVersion = qtToolsClass.getMethod("getQTVersion", null); 
    329       qtVersion = (String) getQTVersion.invoke(qtTools, null); 
     328      Method getQTVersion = qtToolsClass.getMethod("getQTVersion"); 
     329      qtVersion = (String) getQTVersion.invoke(qtTools); 
    330330    } 
    331331    catch (Throwable t) { 
     
    372372    } 
    373373 
    374     Hashtable versions = new Hashtable(); 
     374    HashMap<String, String> versions = new HashMap<String, String>(); 
    375375    if (javaVersion != null) versions.put("javaVersion", javaVersion); 
    376376    if (bfVersion != null) versions.put("bfVersion", bfVersion); 
     
    380380 
    381381    // parse libraries 
    382     Hashtable props = null; 
     382    HashMap<String, String> props = null; 
    383383    String propKey = null; 
    384384    StringBuffer propValue = new StringBuffer(); 
     
    409409      if (line.startsWith("[")) { 
    410410        // new entry 
    411         if (props == null) props = new Hashtable(); 
     411        if (props == null) props = new HashMap<String, String>(); 
    412412        else { 
    413413          addProp(props, propKey, propValue.toString(), versions); 
     
    475475  // -- Helper methods -- 
    476476 
    477   private void addProp(Hashtable props, 
    478     String key, String value, Hashtable versions) 
     477  private void addProp(HashMap<String, String> props, 
     478    String key, String value, HashMap versions) 
    479479  { 
    480480    if (key == null) return; 
  • trunk/components/loci-plugins/src/loci/plugins/config/FormatEntry.java

    r4953 r5111  
    5858    readerName = n.substring(n.lastIndexOf(".") + 1, n.length() - 6); 
    5959    try { 
    60       Method getFormat = readerClass.getMethod("getFormat", null); 
    61       formatName = (String) getFormat.invoke(reader, null); 
    62       Method getSuffixes = readerClass.getMethod("getSuffixes", null); 
    63       suffixes = (String[]) getSuffixes.invoke(reader, null); 
     60      Method getFormat = readerClass.getMethod("getFormat"); 
     61      formatName = (String) getFormat.invoke(reader); 
     62      Method getSuffixes = readerClass.getMethod("getSuffixes"); 
     63      suffixes = (String[]) getSuffixes.invoke(reader); 
    6464      log.println("Successfully queried " + readerName + " reader."); 
    6565    } 
  • trunk/components/loci-plugins/src/loci/plugins/config/LibraryEntry.java

    r4953 r5111  
    2929import java.io.PrintWriter; 
    3030import java.net.URLDecoder; 
    31 import java.util.Hashtable; 
     31import java.util.HashMap; 
    3232 
    3333/** 
     
    6969  // -- Constructor -- 
    7070 
    71   public LibraryEntry(PrintWriter log, Hashtable props) { 
     71  public LibraryEntry(PrintWriter log, HashMap<String, String> props) { 
    7272    this(log, 
    7373      (String) props.get("name"), 
  • trunk/components/loci-plugins/src/loci/plugins/util/LociPrefs.java

    r5092 r5111  
    3333 * 
    3434 * <dl><dt><b>Source code:</b></dt> 
    35  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/loci-plugins/src/loci/plugins/util/ImagePlusReader.java">Trac</a>, 
    36  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/loci-plugins/src/loci/plugins/util/ImagePlusReader.java">SVN</a></dd></dl> 
     35 * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/loci-plugins/src/loci/plugins/util/LociPrefs.java">Trac</a>, 
     36 * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/loci-plugins/src/loci/plugins/util/LociPrefs.java">SVN</a></dd></dl> 
    3737 */ 
    3838public class LociPrefs { 
Note: See TracChangeset for help on using the changeset viewer.