Changeset 7045


Ignore:
Timestamp:
10/07/10 17:30:37 (9 years ago)
Author:
curtis
Message:

Merge latest LOCI Common trunk to Maven branch.

Location:
branches/maven/projects/loci-common/src/main/java/loci/common
Files:
44 edited

Legend:

Unmodified
Added
Removed
  • branches/maven/projects/loci-common/src/main/java/loci/common

  • branches/maven/projects/loci-common/src/main/java/loci/common/AbstractNIOHandle.java

    r6155 r7045  
    3030 * 
    3131 * <dl><dt><b>Source code:</b></dt> 
    32  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/AbstractNIOHandle.java">Trac</a>, 
    33  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/AbstractNIOHandle.java">SVN</a></dd></dl> 
     32 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/AbstractNIOHandle.java">Trac</a>, 
     33 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/AbstractNIOHandle.java">SVN</a></dd></dl> 
    3434 * 
    3535 * @see IRandomAccess 
     
    6060    if (!(mode.equals("r") || mode.equals("rw"))) { 
    6161      throw new IllegalArgumentException( 
    62           String.format("%s mode not in supported modes ('r', 'rw')")); 
     62        String.format("%s mode not in supported modes ('r', 'rw')", mode)); 
    6363    } 
    6464  } 
  • branches/maven/projects/loci-common/src/main/java/loci/common/BZip2Handle.java

    r6495 r7045  
    3636 * 
    3737 * <dl><dt><b>Source code:</b></dt> 
    38  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/BZip2Handle.java">Trac</a>, 
    39  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/BZip2Handle.java">SVN</a></dd></dl> 
     38 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/BZip2Handle.java">Trac</a>, 
     39 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/BZip2Handle.java">SVN</a></dd></dl> 
    4040 * 
    4141 * @author Melissa Linkert melissa at glencoesoftware.com 
  • branches/maven/projects/loci-common/src/main/java/loci/common/ByteArrayHandle.java

    r6128 r7045  
    3434 * 
    3535 * <dl><dt><b>Source code:</b></dt> 
    36  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/ByteArrayHandle.java">Trac</a>, 
    37  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/ByteArrayHandle.java">SVN</a></dd></dl> 
     36 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/ByteArrayHandle.java">Trac</a>, 
     37 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/ByteArrayHandle.java">SVN</a></dd></dl> 
    3838 * 
    3939 * @see IRandomAccess 
  • branches/maven/projects/loci-common/src/main/java/loci/common/CBZip2InputStream.java

    r6155 r7045  
    7171 * 
    7272 * <dl><dt><b>Source code:</b></dt> 
    73  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/CBZip2InputStream.java">Trac</a>, 
    74  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/CBZip2InputStream.java">SVN</a></dd></dl> 
     73 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/CBZip2InputStream.java">Trac</a>, 
     74 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/CBZip2InputStream.java">SVN</a></dd></dl> 
    7575 */ 
    7676public class CBZip2InputStream extends InputStream { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/CRC.java

    r6050 r7045  
    5151 * 
    5252 * <dl><dt><b>Source code:</b></dt> 
    53  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/codec/CRC.java">Trac</a>, 
    54  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/codec/CRC.java">SVN</a></dd></dl> 
     53 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/codec/CRC.java">Trac</a>, 
     54 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/codec/CRC.java">SVN</a></dd></dl> 
    5555 */ 
    5656public class CRC { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/DataTools.java

    r6737 r7045  
    3232 * 
    3333 * <dl><dt><b>Source code:</b></dt> 
    34  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/DataTools.java">Trac</a>, 
    35  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/DataTools.java">SVN</a></dd></dl> 
     34 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/DataTools.java">Trac</a>, 
     35 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/DataTools.java">SVN</a></dd></dl> 
    3636 * 
    3737 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/DateTools.java

    r6495 r7045  
    3333 * 
    3434 * <dl><dt><b>Source code:</b></dt> 
    35  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/DateTools.java">Trac</a>, 
    36  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/DateTools.java">SVN</a></dd></dl> 
     35 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/DateTools.java">Trac</a>, 
     36 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/DateTools.java">SVN</a></dd></dl> 
    3737 * 
    3838 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/DebugTools.java

    r6722 r7045  
    3232 * 
    3333 * <dl><dt><b>Source code:</b></dt> 
    34  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/DebugTools.java">Trac</a>, 
    35  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/DebugTools.java">SVN</a></dd></dl> 
     34 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/DebugTools.java">Trac</a>, 
     35 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/DebugTools.java">SVN</a></dd></dl> 
    3636 * 
    3737 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/FileHandle.java

    r6155 r7045  
    3535 * 
    3636 * <dl><dt><b>Source code:</b></dt> 
    37  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/FileHandle.java">Trac</a>, 
    38  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/FileHandle.java">SVN</a></dd></dl> 
     37 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/FileHandle.java">Trac</a>, 
     38 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/FileHandle.java">SVN</a></dd></dl> 
    3939 * 
    4040 * @see IRandomAccess 
  • branches/maven/projects/loci-common/src/main/java/loci/common/GZipHandle.java

    r6495 r7045  
    3737 * 
    3838 * <dl><dt><b>Source code:</b></dt> 
    39  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/GZipHandle.java">Trac</a>, 
    40  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/GZipHandle.java">SVN</a></dd></dl> 
     39 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/GZipHandle.java">Trac</a>, 
     40 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/GZipHandle.java">SVN</a></dd></dl> 
    4141 * 
    4242 * @author Melissa Linkert melissa at glencoesoftware.com 
  • branches/maven/projects/loci-common/src/main/java/loci/common/HandleException.java

    r6050 r7045  
    3131 * 
    3232 * <dl><dt><b>Source code:</b></dt> 
    33  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/HandleException.java">Trac</a>, 
    34  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/HandleException.java">SVN</a></dd></dl> 
     33 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/HandleException.java">Trac</a>, 
     34 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/HandleException.java">SVN</a></dd></dl> 
    3535 */ 
    3636public class HandleException extends IOException { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/IRandomAccess.java

    r6155 r7045  
    3434 * 
    3535 * <dl><dt><b>Source code:</b></dt> 
    36  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/IRandomAccess.java">Trac</a>, 
    37  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/IRandomAccess.java">SVN</a></dd></dl> 
     36 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/IRandomAccess.java">Trac</a>, 
     37 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/IRandomAccess.java">SVN</a></dd></dl> 
    3838 * 
    3939 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/IniList.java

    r6050 r7045  
    2525 
    2626import java.util.ArrayList; 
     27import java.util.HashMap; 
    2728 
    2829/** 
     
    3031 * 
    3132 * <dl><dt><b>Source code:</b></dt> 
    32  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/IniList.java">Trac</a>, 
    33  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/IniList.java">SVN</a></dd></dl> 
     33 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/IniList.java">Trac</a>, 
     34 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/IniList.java">SVN</a></dd></dl> 
    3435 * 
    3536 * @author Curtis Rueden ctrueden at wisc.edu 
     
    4849  } 
    4950 
     51  /** 
     52   * Flattens all of the INI tables into a single HashMap whose keys are 
     53   * of the format "[table name] table key". 
     54   */ 
     55  public HashMap<String, String> flattenIntoHashMap() { 
     56    HashMap<String, String> h = new HashMap<String, String>(); 
     57    for (IniTable table : this) { 
     58      String tableName = table.get(IniTable.HEADER_KEY); 
     59      for (String key : table.keySet()) { 
     60        if (!key.equals(IniTable.HEADER_KEY)) { 
     61          h.put("[" + tableName + "] " + key, table.get(key)); 
     62        } 
     63      } 
     64    } 
     65    return h; 
     66  } 
     67 
    5068} 
  • branches/maven/projects/loci-common/src/main/java/loci/common/IniParser.java

    r6155 r7045  
    3333 * 
    3434 * <dl><dt><b>Source code:</b></dt> 
    35  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/IniParser.java">Trac</a>, 
    36  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/IniParser.java">SVN</a></dd></dl> 
     35 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/IniParser.java">Trac</a>, 
     36 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/IniParser.java">SVN</a></dd></dl> 
    3737 * 
    3838 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/IniTable.java

    r6050 r7045  
    3030 * 
    3131 * <dl><dt><b>Source code:</b></dt> 
    32  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/IniTable.java">Trac</a>, 
    33  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/IniTable.java">SVN</a></dd></dl> 
     32 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/IniTable.java">Trac</a>, 
     33 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/IniTable.java">SVN</a></dd></dl> 
    3434 * 
    3535 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/Location.java

    r6121 r7045  
    4444 * 
    4545 * <dl><dt><b>Source code:</b></dt> 
    46  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/Location.java">Trac</a>, 
    47  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/Location.java">SVN</a></dd></dl> 
     46 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/Location.java">Trac</a>, 
     47 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/Location.java">SVN</a></dd></dl> 
    4848 */ 
    4949public class Location { 
     
    197197      } 
    198198    } 
    199     LOGGER.debug("Location.getHandle: {} -> {}", id, handle); 
     199    LOGGER.trace("Location.getHandle: {} -> {}", id, handle); 
    200200    return handle; 
    201201  } 
  • branches/maven/projects/loci-common/src/main/java/loci/common/NIOByteBufferProvider.java

    r6228 r7045  
    4545 * 
    4646 * <dl><dt><b>Source code:</b></dt> 
    47  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/NIOByteBufferProvider.java">Trac</a>, 
    48  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/NIOByteBufferProvider.java">SVN</a></dd></dl> 
     47 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/NIOByteBufferProvider.java">Trac</a>, 
     48 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/NIOByteBufferProvider.java">SVN</a></dd></dl> 
    4949 */ 
    5050public class NIOByteBufferProvider { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/NIOFileHandle.java

    r6155 r7045  
    3737 * 
    3838 * <dl><dt><b>Source code:</b></dt> 
    39  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/NIOFileHandle.java">Trac</a>, 
    40  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/NIOFileHandle.java">SVN</a></dd></dl> 
     39 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/NIOFileHandle.java">Trac</a>, 
     40 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/NIOFileHandle.java">SVN</a></dd></dl> 
    4141 * 
    4242 * @see IRandomAccess 
  • branches/maven/projects/loci-common/src/main/java/loci/common/NIOInputStream.java

    r6155 r7045  
    3737 * 
    3838 * <dl><dt><b>Source code:</b></dt> 
    39  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/NIOInputStream.java">Trac</a>, 
    40  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/NIOInputStream.java">SVN</a></dd></dl> 
     39 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/NIOInputStream.java">Trac</a>, 
     40 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/NIOInputStream.java">SVN</a></dd></dl> 
    4141 * 
    4242 */ 
  • branches/maven/projects/loci-common/src/main/java/loci/common/RandomAccessInputStream.java

    r6612 r7045  
    3434 * 
    3535 * <dl><dt><b>Source code:</b></dt> 
    36  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/RandomAccessInputStream.java">Trac</a>, 
    37  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/RandomAccessInputStream.java">SVN</a></dd></dl> 
     36 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/RandomAccessInputStream.java">Trac</a>, 
     37 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/RandomAccessInputStream.java">SVN</a></dd></dl> 
    3838 * 
    3939 * @author Melissa Linkert melissa at glencoesoftware.com 
  • branches/maven/projects/loci-common/src/main/java/loci/common/RandomAccessOutputStream.java

    r6294 r7045  
    3535 * 
    3636 * <dl><dt><b>Source code:</b></dt> 
    37  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/RandomAccessOutputStream.java">Trac</a>, 
    38  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/RandomAccessOutputStream.java">SVN</a></dd></dl> 
     37 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/RandomAccessOutputStream.java">Trac</a>, 
     38 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/RandomAccessOutputStream.java">SVN</a></dd></dl> 
    3939 */ 
    4040public class RandomAccessOutputStream extends OutputStream implements DataOutput 
  • branches/maven/projects/loci-common/src/main/java/loci/common/ReflectException.java

    r6050 r7045  
    2929 * 
    3030 * <dl><dt><b>Source code:</b></dt> 
    31  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/ReflectException.java">Trac</a>, 
    32  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/ReflectException.java">SVN</a></dd></dl> 
     31 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/ReflectException.java">Trac</a>, 
     32 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/ReflectException.java">SVN</a></dd></dl> 
    3333 */ 
    3434public class ReflectException extends Exception { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/ReflectedUniverse.java

    r6155 r7045  
    4343 * 
    4444 * <dl><dt><b>Source code:</b></dt> 
    45  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/ReflectedUniverse.java">Trac</a>, 
    46  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/ReflectedUniverse.java">SVN</a></dd></dl> 
     45 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/ReflectedUniverse.java">Trac</a>, 
     46 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/ReflectedUniverse.java">SVN</a></dd></dl> 
    4747 */ 
    4848public class ReflectedUniverse { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/Region.java

    r6246 r7045  
    3030 * 
    3131 * <dl><dt><b>Source code:</b></dt> 
    32  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/Region.java">Trac</a>, 
    33  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/Region.java">SVN</a></dd></dl> 
     32 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/Region.java">Trac</a>, 
     33 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/Region.java">SVN</a></dd></dl> 
    3434 */ 
    3535public class Region { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/StatusEvent.java

    r6696 r7045  
    2828 * 
    2929 * <dl><dt><b>Source code:</b></dt> 
    30  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/StatusEvent.java">Trac</a>, 
    31  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/StatusEvent.java">SVN</a></dd></dl> 
     30 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/StatusEvent.java">Trac</a>, 
     31 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/StatusEvent.java">SVN</a></dd></dl> 
    3232 */ 
    3333public class StatusEvent { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/StatusListener.java

    r6132 r7045  
    3030 * 
    3131 * <dl><dt><b>Source code:</b></dt> 
    32  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/StatusListener.java">Trac</a>, 
    33  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/StatusListener.java">SVN</a></dd></dl> 
     32 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/StatusListener.java">Trac</a>, 
     33 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/StatusListener.java">SVN</a></dd></dl> 
    3434 */ 
    3535public interface StatusListener extends EventListener { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/StatusReporter.java

    r6132 r7045  
    2828 * 
    2929 * <dl><dt><b>Source code:</b></dt> 
    30  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/StatusReporter.java">Trac</a>, 
    31  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/StatusReporter.java">SVN</a></dd></dl> 
     30 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/StatusReporter.java">Trac</a>, 
     31 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/StatusReporter.java">SVN</a></dd></dl> 
    3232 * 
    3333 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/StreamHandle.java

    r6495 r7045  
    3838 * 
    3939 * <dl><dt><b>Source code:</b></dt> 
    40  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/StreamHandle.java">Trac</a>, 
    41  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/StreamHandle.java">SVN</a></dd></dl> 
     40 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/StreamHandle.java">Trac</a>, 
     41 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/StreamHandle.java">SVN</a></dd></dl> 
    4242 * 
    4343 * @author Melissa Linkert melissa at glencoesoftware.com 
  • branches/maven/projects/loci-common/src/main/java/loci/common/URLHandle.java

    r6495 r7045  
    3535 * 
    3636 * <dl><dt><b>Source code:</b></dt> 
    37  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/URLHandle.java">Trac</a>, 
    38  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/URLHandle.java">SVN</a></dd></dl> 
     37 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/URLHandle.java">Trac</a>, 
     38 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/URLHandle.java">SVN</a></dd></dl> 
    3939 * 
    4040 * @see IRandomAccess 
  • branches/maven/projects/loci-common/src/main/java/loci/common/ZipHandle.java

    r6495 r7045  
    4040 * 
    4141 * <dl><dt><b>Source code:</b></dt> 
    42  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/ZipHandle.java">Trac</a>, 
    43  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/ZipHandle.java">SVN</a></dd></dl> 
     42 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/ZipHandle.java">Trac</a>, 
     43 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/ZipHandle.java">SVN</a></dd></dl> 
    4444 * 
    4545 * @author Melissa Linkert melissa at glencoesoftware.com 
  • branches/maven/projects/loci-common/src/main/java/loci/common/enumeration/CodedEnum.java

    r6050 r7045  
    2727 * 
    2828 * <dl><dt><b>Source code:</b></dt> 
    29  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/enumeration/CodedEnum.java">Trac</a>, 
    30  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/enumeration/CodedEnum.java">SVN</a></dd></dl> 
     29 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/enumeration/CodedEnum.java">Trac</a>, 
     30 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/enumeration/CodedEnum.java">SVN</a></dd></dl> 
    3131 */ 
    3232public interface CodedEnum { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/enumeration/EnumException.java

    r6050 r7045  
    2929 * 
    3030 * <dl><dt><b>Source code:</b></dt> 
    31  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/EnumException.java">Trac</a>, 
    32  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/EnumException.java">SVN</a></dd></dl> 
     31 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/EnumException.java">Trac</a>, 
     32 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/EnumException.java">SVN</a></dd></dl> 
    3333 */ 
    3434public class EnumException extends RuntimeException { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/services/AbstractService.java

    r6050 r7045  
    3030 * 
    3131 * <dl><dt><b>Source code:</b></dt> 
    32  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/AbstractService.java">Trac</a>, 
    33  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/AbstractService.java">SVN</a></dd></dl> 
     32 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/AbstractService.java">Trac</a>, 
     33 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/AbstractService.java">SVN</a></dd></dl> 
    3434 */ 
    3535public abstract class AbstractService implements Service { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/services/DependencyException.java

    r6155 r7045  
    3232 * 
    3333 * <dl><dt><b>Source code:</b></dt> 
    34  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/DependencyException.java">Trac</a>, 
    35  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/DependencyException.java">SVN</a></dd></dl> 
     34 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/DependencyException.java">Trac</a>, 
     35 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/DependencyException.java">SVN</a></dd></dl> 
    3636 */ 
    3737public class DependencyException extends Exception 
  • branches/maven/projects/loci-common/src/main/java/loci/common/services/OMENotesService.java

    r6050 r7045  
    2828 *  
    2929 * <dl><dt><b>Source code:</b></dt> 
    30  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/OMENotesService.java">Trac</a>, 
    31  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/OMENotesService.java">SVN</a></dd></dl> 
     30 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/OMENotesService.java">Trac</a>, 
     31 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/OMENotesService.java">SVN</a></dd></dl> 
    3232 */ 
    3333public interface OMENotesService extends Service { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/services/Service.java

    r6050 r7045  
    2929 * 
    3030 * <dl><dt><b>Source code:</b></dt> 
    31  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/Service.java">Trac</a>, 
    32  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/Service.java">SVN</a></dd></dl> 
     31 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/Service.java">Trac</a>, 
     32 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/Service.java">SVN</a></dd></dl> 
    3333 */ 
    3434public interface Service { 
  • branches/maven/projects/loci-common/src/main/java/loci/common/services/ServiceException.java

    r6050 r7045  
    3131 * 
    3232 * <dl><dt><b>Source code:</b></dt> 
    33  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/DependencyException.java">Trac</a>, 
    34  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/DependencyException.java">SVN</a></dd></dl> 
     33 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/DependencyException.java">Trac</a>, 
     34 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/DependencyException.java">SVN</a></dd></dl> 
    3535 */ 
    3636public class ServiceException extends Exception 
  • branches/maven/projects/loci-common/src/main/java/loci/common/services/ServiceFactory.java

    r6155 r7045  
    2424package loci.common.services; 
    2525 
     26import java.io.IOException; 
    2627import java.io.InputStream; 
    2728import java.lang.reflect.Constructor; 
     
    3940 * 
    4041 * <dl><dt><b>Source code:</b></dt> 
    41  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/ServiceFactory.java">Trac</a>, 
    42  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/ServiceFactory.java">SVN</a></dd></dl> 
     42 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/in/ServiceFactory.java">Trac</a>, 
     43 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/in/ServiceFactory.java">SVN</a></dd></dl> 
    4344 */ 
    4445public class ServiceFactory { 
     
    8889      throw new DependencyException(t); 
    8990    } 
     91    finally { 
     92      try { 
     93        stream.close(); 
     94      } 
     95      catch (IOException e) { 
     96        LOGGER.warn("Error closing properties file stream.", e); 
     97      } 
     98    } 
    9099    Set<Entry<Object, Object>> entries = properties.entrySet(); 
    91100    for (Entry<Object, Object> entry : entries) { 
     
    99108      } 
    100109      catch (Throwable t) { 
    101         LOGGER.warn("CLASSPATH missing interface: {}", interfaceName, t); 
     110        LOGGER.debug("CLASSPATH missing interface: {}", interfaceName, t); 
    102111        continue; 
    103112      } 
  • branches/maven/projects/loci-common/src/main/java/loci/common/xml

    • Property svn:mergeinfo deleted
  • branches/maven/projects/loci-common/src/main/java/loci/common/xml/MetadataHandler.java

    r6495 r7045  
    3333 * 
    3434 * <dl><dt><b>Source code:</b></dt> 
    35  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/xml/MetadataHandler.java">Trac</a>, 
    36  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/xml/MetadataHandler.java">SVN</a></dd></dl> 
     35 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/xml/MetadataHandler.java">Trac</a>, 
     36 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/xml/MetadataHandler.java">SVN</a></dd></dl> 
    3737 * 
    3838 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/xml/ValidationErrorHandler.java

    r6717 r7045  
    3131 * 
    3232 * <dl><dt><b>Source code:</b></dt> 
    33  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/xml/ValidationErrorHandler.java">Trac</a>, 
    34  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/xml/ValidationErrorHandler.java">SVN</a></dd></dl> 
     33 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/xml/ValidationErrorHandler.java">Trac</a>, 
     34 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/xml/ValidationErrorHandler.java">SVN</a></dd></dl> 
    3535 * 
    3636 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/xml/ValidationSAXHandler.java

    r6495 r7045  
    3434 * 
    3535 * <dl><dt><b>Source code:</b></dt> 
    36  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/xml/ValidationSAXHandler.java">Trac</a>, 
    37  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/xml/ValidationSAXHandler.java">SVN</a></dd></dl> 
     36 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/xml/ValidationSAXHandler.java">Trac</a>, 
     37 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/xml/ValidationSAXHandler.java">SVN</a></dd></dl> 
    3838 * 
    3939 * @author Curtis Rueden ctrueden at wisc.edu 
  • branches/maven/projects/loci-common/src/main/java/loci/common/xml/XMLTools.java

    r6990 r7045  
    7474 * 
    7575 * <dl><dt><b>Source code:</b></dt> 
    76  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/xml/XMLTools.java">Trac</a>, 
    77  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/common/src/loci/common/xml/XMLTools.java">SVN</a></dd></dl> 
     76 * <dd><a href="http://dev.loci.wisc.edu/trac/java/browser/trunk/components/common/src/loci/common/xml/XMLTools.java">Trac</a>, 
     77 * <a href="http://dev.loci.wisc.edu/svn/java/trunk/components/common/src/loci/common/xml/XMLTools.java">SVN</a></dd></dl> 
    7878 * 
    7979 * @author Curtis Rueden ctrueden at wisc.edu 
     
    150150  /** Remove invalid characters from an XML string. */ 
    151151  public static String sanitizeXML(String s) { 
     152    final char[] c = s.toCharArray(); 
    152153    for (int i=0; i<s.length(); i++) { 
    153       char c = s.charAt(i); 
    154       if (Character.isISOControl(c) || !Character.isDefined(c) || c > '~') { 
    155         s = s.replace(c, ' '); 
    156       } 
    157     } 
    158     return s; 
     154      if (Character.isISOControl(c[i]) || 
     155        !Character.isDefined(c[i]) || c[i] > '~') 
     156      { 
     157        c[i] = ' '; 
     158      } 
     159      // eliminate invalid &# sequences 
     160      if (i > 0 && c[i - 1] == '&' && c[i] == '#') c[i - 1] = ' '; 
     161    } 
     162    return new String(c); 
    159163  } 
    160164 
Note: See TracChangeset for help on using the changeset viewer.