Changeset 5989


Ignore:
Timestamp:
03/04/10 10:27:46 (10 years ago)
Author:
curtis
Message:

More cleanup of URLs.

Location:
trunk/components
Files:
13 edited

Legend:

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

    r5987 r5989  
    211211  public static final String URL_OME_TIFF = 
    212212    "http://ome-xml.org/wiki/OmeTiff"; 
    213  
    214   /** URL of direct LOCI JAR downloads. */ 
    215   public static final String URL_JAR_DOWNLOADS = 
    216     "http://skyking.microscopy.wisc.edu/svn/java/trunk/jar/"; 
    217213 
    218214  // -- Constructor -- 
  • trunk/components/checkstyle/src/loci/checks/About.java

    r4584 r5989  
    2121public final class About { 
    2222 
     23  /** URL of LOCI Software web page. */ 
     24  public static final String URL_LOCI_SOFTWARE = 
     25    "http://www.loci.wisc.edu/software"; 
     26 
     27  /** URL of Checkstyle web page. */ 
     28  public static final String URL_CHECKSTYLE = 
     29    "http://checkstyle.sourceforge.net/"; 
     30 
    2331  private About() { } 
    2432 
     
    2634    JOptionPane.showMessageDialog(null, 
    2735      "LOCI Checkstyle checks, revision @svn.revision@, built @date@\n" + 
    28       "Download Checkstyle from http://checkstyle.sourceforge.net/\n" + 
    29       "Download LOCI software from http://www.loci.wisc.edu/software/", 
     36      "Download Checkstyle from " + URL_CHECKSTYLE + "\n" + 
     37      "Download LOCI software from " + URL_LOCI_SOFTWARE, 
    3038      "LOCI Checkstyle checks", JOptionPane.INFORMATION_MESSAGE); 
    3139    System.exit(0); 
  • trunk/components/legacy/ome-editor/src/loci/ome/editor/MetadataEditor.java

    r5191 r5989  
    7070 
    7171  // -- Constants -- 
     72 
     73  /** URL of OME Metadata Editor web page. */ 
     74  public static final String URL_OME_METADATA_EDITOR = 
     75    "http://www.loci.wisc.edu/software/ome-metadata-editor"; 
    7276 
    7377  /** Key mask for use with keyboard shortcuts on this operating system. */ 
     
    526530        "The OME Metadata Editor is LOCI software written by\n" + 
    527531        "Christopher Peterson.\n" + 
    528         "http://www.loci.wisc.edu/software/#editor", 
     532        URL_OME_METADATA_EDITOR, 
    529533        "OME Metadata Editor", JOptionPane.INFORMATION_MESSAGE); 
    530534    } 
  • trunk/components/loci-plugins/src/loci/plugins/About.java

    r5987 r5989  
    4242public final class About implements PlugIn { 
    4343 
     44  // -- Constants -- 
     45 
     46  /** URL of LOCI Software web page. */ 
     47  public static final String URL_LOCI_SOFTWARE = 
     48    "http://www.loci.wisc.edu/software"; 
     49 
     50  /** URL of Bio-Formats ImageJ web page. */ 
     51  public static final String URL_BIO_FORMATS_IMAGEJ = 
     52    "http://www.loci.wisc.edu/bio-formats/imagej"; 
     53 
     54  /** URL of Data Browser web page. */ 
     55  public static final String URL_DATA_BROWSER = 
     56    "http://www.loci.wisc.edu/software/data-browser"; 
     57 
    4458  // -- PlugIn API methods -- 
    4559 
     
    5569      "<br>Release: @release.version@" + 
    5670      "<br>Copyright 2005-@year@ UW-Madison LOCI" + 
    57       "<br><i>http://www.loci.wisc.edu/software</i>" + 
     71      "<br><i>" + URL_LOCI_SOFTWARE + "</i>" + 
    5872      "<br>" + 
    5973      "<br><b>Bio-Formats Importer</b> and <b>Bio-Formats Exporter</b>" + 
    6074      "<br>Authors: Melissa Linkert, Curtis Rueden" + 
    61       "<br><i>http://www.loci.wisc.edu/bio-formats/imagej</i>" + 
     75      "<br><i>" + URL_BIO_FORMATS_IMAGEJ + "</i>" + 
    6276      "<br>" + 
    6377      "<br><b>Data Browser</b>" + 
    6478      "<br>Authors: Curtis Rueden, Melissa Linkert, Chris Peterson" + 
    65       "<br><i>http://www.loci.wisc.edu/software/data-browser</i>" + 
     79      "<br><i>" + URL_DATA_BROWSER + "</i>" + 
    6680      "<br>" + 
    6781      "<br><b>Stack Colorizer</b> and <b>Stack Slicer</b>" + 
  • trunk/components/loci-plugins/src/loci/plugins/macro/LociFunctions.java

    r5911 r5989  
    5656 */ 
    5757public class LociFunctions extends MacroFunctions { 
     58 
     59  // -- Constants -- 
     60 
     61  /** URL for LOCI Software Javadocs. */ 
     62  public static final String URL_LOCI_SOFTWARE_JAVADOCS = 
     63    "http://hudson.openmicroscopy.org.uk/job/LOCI/javadoc/"; 
    5864 
    5965  // -- Fields -- 
     
    487493      IJ.write("for the loci.formats.IFormatReader and "); 
    488494      IJ.write("loci.formats.meta.MetadataRetrieve interfaces:"); 
    489       IJ.write("http://www.loci.wisc.edu/software/docs/"); 
     495      IJ.write(URL_LOCI_SOFTWARE_JAVADOCS); 
    490496    } 
    491497  } 
  • trunk/components/loci-plugins/src/loci/plugins/util/LibraryChecker.java

    r5133 r5989  
    5757  public static final String IMAGEJ_MSG = 
    5858    "Sorry, the LOCI plugins require ImageJ v" + IMAGEJ_VERSION + " or later."; 
     59 
     60  /** URL for LOCI Software web page. */ 
     61  public static final String URL_LOCI_SOFTWARE = 
     62    "http://www.loci.wisc.edu/software"; 
    5963 
    6064  // -- Constructor -- 
     
    175179    sb.append(them); 
    176180    sb.append(" from the LOCI website at"); 
    177     sb.append("\n    http://www.loci.wisc.edu/software/"); 
     181    sb.append("\n    " + URL_LOCI_SOFTWARE); 
    178182    sb.append("\nand place "); 
    179183    sb.append(them); 
  • trunk/components/ome-io/src/loci/ome/io/OMEReader.java

    r5987 r5989  
    5353public class OMEReader extends FormatReader { 
    5454 
    55   // -- Constants -- 
    56  
    57   /** Message to display if OME-Java is not found. */ 
    58   private static final String NO_OME_JAVA = 
    59     "OME-Java not found. " + 
    60     "Please download OME-Java from " + 
    61     "http://www.openmicroscopy.org/" + 
    62     "site/support/legacy/ome-server/developer/java-api"; 
    63  
    6455  // -- Fields -- 
    6556 
     
    10899    if (id.equals(currentId)) return; 
    109100 
    110     if (!hasOMEJava) throw new FormatException(NO_OME_JAVA); 
     101    if (!hasOMEJava) throw new FormatException(OMEUtils.NO_OME_MSG); 
    111102 
    112103    credentials = new OMECredentials(id); 
  • trunk/components/ome-io/src/loci/ome/io/OMEUtils.java

    r5987 r5989  
    4040 * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/ome-io/src/loci/ome/io/OMEUtils.java">SVN</a></dd></dl> 
    4141 */ 
    42 public class OMEUtils { 
     42public final class OMEUtils { 
    4343 
    4444  // -- Constants -- 
    4545 
    46   private static final String NO_OMERO_MSG = "OMERO client libraries not " + 
     46  /** URL of OMERO JAR downloads. */ 
     47  public static final String URL_OMERO_JARS = 
     48    "http://skyking.microscopy.wisc.edu/svn/java/trunk/jar/"; 
     49 
     50  /** URL of OME-Java web page. */ 
     51  public static final String URL_OME_JAVA = "http://www.openmicroscopy.org/" + 
     52    "site/support/legacy/ome-server/developer/java-api"; 
     53 
     54  static final String NO_OMERO_MSG = "OMERO client libraries not " + 
    4755    "found.  Please obtain omero-common.jar and omero-client.jar from " + 
    48     "http://skyking.microscopy.wisc.edu/svn/java/trunk/jar/"; 
    49  
    50   private static final String NO_OME_MSG = "OME-Java library not found.  " + 
    51     "Please obtain ome-java.jar from " + 
    52     "http://www.openmicroscopy.org/" + 
    53     "site/support/legacy/ome-server/developer/java-api"; 
     56    URL_OMERO_JARS; 
     57 
     58  static final String NO_OME_MSG = "OME-Java library not found.  " + 
     59    "Please obtain ome-java.jar from " + URL_OME_JAVA; 
    5460 
    5561  // -- Static fields -- 
     
    101107  private static boolean omeroPixelsInitialized = false; 
    102108 
    103   // -- Utils API methods -- 
     109  // -- Constructor -- 
     110 
     111  /** Disallow instantiation of utility class. */ 
     112  private OMEUtils() { } 
     113 
     114  // -- OMEUtils API methods -- 
    104115 
    105116  /** Login to an OME/OMERO server. */ 
  • trunk/components/ome-io/src/loci/ome/io/OMEWriter.java

    r5987 r5989  
    5353 */ 
    5454public class OMEWriter extends FormatWriter { 
    55  
    56   // -- Constants -- 
    57  
    58   /** Message to display if OME-Java is not found. */ 
    59   private static final String NO_OME_JAVA = 
    60     "OME-Java not found. " + 
    61     "Please download OME-Java from " + 
    62     "http://www.openmicroscopy.org/" + 
    63     "site/support/legacy/ome-server/developer/java-api"; 
    6455 
    6556  // -- Static fields -- 
     
    140131    throws FormatException, IOException 
    141132  { 
    142     if (!hasOMEJava) throw new FormatException(NO_OME_JAVA); 
     133    if (!hasOMEJava) throw new FormatException(OMEUtils.NO_OME_MSG); 
    143134    if (currentId != null && credentials == null) { 
    144135      // parse the ID string to get the server, user name and password 
  • trunk/components/ome-plugins/src/loci/plugins/ome/About.java

    r5987 r5989  
    4141public final class About implements PlugIn { 
    4242 
     43  // -- Constants -- 
     44 
     45  /** URL of LOCI Software web page. */ 
     46  public static final String URL_LOCI_SOFTWARE = 
     47    "http://www.loci.wisc.edu/software"; 
     48 
     49  /** URL of OME Plugins web page. */ 
     50  public static final String URL_OME_PLUGINS = 
     51    "http://ome-xml.org/wiki/OmePlugins"; 
     52 
    4353  // -- Runnable API methods -- 
    4454 
     
    5363      "OME Plugins for ImageJ, revision @svn.revision@, built @date@" + 
    5464      "<br>Copyright 2005-@year@ UW-Madison LOCI" + 
    55       "<br><i>http://www.loci.wisc.edu/software</i>" + 
     65      "<br><i>" + URL_LOCI_SOFTWARE + "</i>" + 
    5666      "<br>" + 
    5767      "<br><b>Download from OME</b> and <b>Upload to OME</b>" + 
    5868      "<br>Authors: Melissa Linkert, Philip Huettl" + 
    59       "<br><i>http://ome-xml.org/wiki/OmePlugins</i>"; 
     69      "<br><i>" + URL_OME_PLUGINS + "</i>"; 
    6070    ImageIcon omeLogo = new ImageIcon( 
    6171      OMEReader.class.getResource("ome-logo.png")); 
  • trunk/components/ome-xml/src/ome/xml/About.java

    r5987 r5989  
    4444public final class About { 
    4545 
     46  // -- Constants -- 
     47 
     48  /** URL for OME-XML Java library web page. */ 
     49  public static final String URL_OME_XML_LIBRARY = 
     50    "http://ome-xml.org/wiki/OmeXmlJava"; 
     51 
    4652  // -- Static utility methods -- 
    4753 
     
    5056      "revision @svn.revision@, built @date@"); 
    5157    System.out.println("Copyright 2005-@year@ Open Microscopy Environment"); 
    52     System.out.println("http://ome-xml.org/wiki/OmeXmlJava"); 
     58    System.out.println(URL_OME_XML_LIBRARY); 
    5359    System.out.println("Authors: Curtis Rueden, Chris Allan"); 
    5460  } 
  • trunk/components/visbio/src/loci/visbio/data/DataManager.java

    r5093 r5989  
    6868  /** URL prefix for sample datasets. */ 
    6969  protected static final String SAMPLE_PREFIX = 
    70     "http://www.loci.wisc.edu/software/visbio/data/"; 
     70    "http://www.loci.wisc.edu/files/software/data/"; 
    7171 
    7272  /** Default resolution for low-resolution thumbnails. */ 
  • trunk/components/visbio/src/loci/visbio/help/HelpManager.java

    r5093 r5989  
    6464  // -- Constants -- 
    6565 
     66  /** URL of VisBio web page. */ 
     67  public static final String URL_VISBIO = 
     68    "http://www.loci.wisc.edu/software/visbio"; 
     69 
    6670  /** String for displaying new data. */ 
    6771  public static final String DISPLAY_DATA = 
     
    236240    String about = VisBio.TITLE + " " + VisBio.VERSION + 
    237241      (VisBio.DATE.equals("@da" + "te@") ? "" : (", built " + VisBio.DATE)) + 
    238       "\nWritten by " + VisBio.AUTHOR + "\n" + 
    239       "http://www.loci.wisc.edu/visbio/"; 
     242      "\nWritten by " + VisBio.AUTHOR + "\n" + URL_VISBIO; 
    240243    JOptionPane.showMessageDialog(bio, about, 
    241244      "About VisBio", JOptionPane.INFORMATION_MESSAGE); 
Note: See TracChangeset for help on using the changeset viewer.