Changeset 2763


Ignore:
Timestamp:
05/08/07 16:07:47 (13 years ago)
Author:
curtis
Message:

Rename OME Notebook to OME Notes; rename MetadataNotebook to MetadataEditor.

Location:
trunk
Files:
6 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/build.properties

    r2644 r2763  
    3939 
    4040tools.jar         = loci_tools.jar 
    41 tools.main        = loci.ome.notebook.Notebook 
     41tools.main        = loci.ome.notes.Notes 
    4242tools.dir         = ${build.dir}/tools 
    4343tools.libraries   = bio-formats.jar \ 
     
    4949                    mdbtools-java.jar \ 
    5050                    ome-java.jar \ 
    51                     ome-notebook.jar \ 
     51                    ome-notes.jar \ 
    5252                    poi-loci.jar \ 
    5353                    xmlrpc-1.2-b1.jar 
     
    132132                 loci/ome/util/** 
    133133 
    134 ### OME Metadata Notebook ### 
    135  
    136 notebook.jar       = ome-notebook.jar 
    137 notebook.main      = loci.ome.notebook.Notebook 
    138 notebook.source    = loci/ome/notebook/**/*.java 
    139 notebook.classpath = bio-formats.jar \ 
    140                      commons-httpclient-2.0-rc2.jar \ 
    141                      commons-logging.jar \ 
    142                      forms-1.0.4.jar \ 
    143                      ij.jar \ 
    144                      jai_imageio.jar \ 
    145                      mdbtools-java.jar \ 
    146                      ome-java.jar \ 
    147                      poi-loci.jar \ 
    148                      QTJava.zip \ 
    149                      xmlrpc-1.2-b1.jar 
    150 notebook.files     = loci/ome/notebook/** 
    151 notebook.resources = loci/ome/notebook/templates/* \ 
    152                      loci/ome/notebook/editor/*  
     134### OME Notes ### 
     135 
     136notes.jar       = ome-notes.jar 
     137notes.main      = loci.ome.notes.Notes 
     138notes.source    = loci/ome/notes/**/*.java 
     139notes.classpath = bio-formats.jar \ 
     140                  commons-httpclient-2.0-rc2.jar \ 
     141                  commons-logging.jar \ 
     142                  forms-1.0.4.jar \ 
     143                  ij.jar \ 
     144                  jai_imageio.jar \ 
     145                  mdbtools-java.jar \ 
     146                  ome-java.jar \ 
     147                  poi-loci.jar \ 
     148                  QTJava.zip \ 
     149                  xmlrpc-1.2-b1.jar 
     150notes.files     = loci/ome/notes/** 
     151notes.resources = loci/ome/notes/templates/* \ 
     152                  loci/ome/notes/editor/*  
    153153 
    154154### OME Metadata Editor ### 
    155155 
    156156editor.jar       = ome-editor.jar 
    157 editor.main      = loci.ome.editor.MetadataNotebook 
     157editor.main      = loci.ome.editor.MetadataEditor 
    158158editor.source    = loci/ome/editor/**/*.java \ 
    159159                   loci/ome/viewer/**/*.java 
  • trunk/build.xml

    r2644 r2763  
    1515    Main class:    loci.formats.ImageViewer 
    1616    Dependencies:  jai_imageio.jar (reflected) 
     17                   mdbtools-java.jar (reflected) 
    1718                   ome-java.jar (reflected) 
    1819                   poi-loci.jar (reflected) 
     
    3435                   jai_imageio.jar (bio-formats.jar) 
    3536                   looks-1.2.2.jar 
     37                   mdbtools-java.jar (bio-formats.jar) 
    3638                   ome-java.jar 
    3739                   poi-loci.jar (bio-formats.jar) 
     
    4951    JAR file:      loci_plugins.jar 
    5052    Folders:       loci/plugins 
    51                    loci/plugins/* 
    52                    loci/ome/viewer (temporary) 
     53                   loci/plugins/browser 
    5354                   loci/ome/upload 
     55                   loci/ome/util 
    5456    Main class:    loci.plugins.About 
    5557    IJ plugins:    loci.plugins.browser.LociDataBrowser 
     
    6264                   commons-logging.jar (ome-java.jar) 
    6365                   jai_imageio.jar (bio-formats.jar) 
     66                   mdbtools-java.jar (bio-formats.jar) 
    6467                   ome-java.jar (bio-formats.jar) 
    6568                   poi-loci.jar (bio-formats.jar) 
     
    7073    License:       LGPL 
    7174 
    72 OME Notebook 
    73     JAR file:      ome-notebook.jar 
    74     Folder:        loci/ome/notebook 
    75     Main class:    loci.ome.editor.MetadataNotebook 
     75OME Notes 
     76    JAR file:      ome-notes.jar 
     77    Folder:        loci/ome/notes 
     78    Main class:    loci.ome.notes.Notes 
    7679    Dependencies:  bio-formats.jar 
    7780                   commons-httpclient-2.0-rc2.jar (ome-java.jar) 
     
    7982                   forms-1.0.4.jar 
    8083                   jai_imageio.jar (bio-formats.jar) 
     84                   mdbtools-java.jar (bio-formats.jar) 
    8185                   ome-java.jar 
    8286                   poi-loci.jar (bio-formats.jar) 
    8387                   xmlrpc-1.2-b1.jar (ome-java.jar) 
    84     Targets:       style-notebook 
    85                    compile-notebook 
    86                    jar-notebook 
     88    Targets:       style-notes 
     89                   compile-notes 
     90                   jar-notes 
    8791    License:       LGPL 
    8892 
     
    9195    Folders:       loci/ome/editor 
    9296                   loci/ome/viewer 
    93     Main class:    loci.ome.editor.MetadataNotebook 
     97    Main class:    loci.ome.editor.MetadataEditor 
    9498    Dependencies:  bio-formats.jar 
    9599                   commons-httpclient-2.0-rc2.jar (ome-java.jar) 
     
    97101                   forms-1.0.4.jar 
    98102                   jai_imageio.jar (bio-formats.jar) 
     103                   mdbtools-java.jar (bio-formats.jar) 
    99104                   ome-java.jar 
    100105                   poi-loci.jar (bio-formats.jar) 
     
    176181    JAR file:  forms-1.0.4.jar 
    177182    URL:       http://www.jgoodies.com/freeware/forms/index.html 
    178     Notes:     Used for layout by VisBio and OME Metadata Notebook 
     183    Notes:     Used for layout by VisBio, 4D Data Browser and OME Notes 
    179184    License:   BSD 
    180185 
     
    194199    JAR file:  looks-1.2.2.jar 
    195200    URL:       http://www.jgoodies.com/freeware/looks/index.html 
    196     Notes:     Used for a nicer Look & Feel by VisBio and OME Metadata Notebook 
     201    Notes:     Used for a nicer Look & Feel by VisBio and OME Metadata Editor 
    197202    License:   BSD 
     203 
     204MDB Tools (Java port) 
     205    JAR file:  mdbtools-java.jar 
     206    URLs:      http://mdbtools.sourceforge.net/ 
     207               http://sourceforge.net/forum/message.php?msg_id=2550619 
     208    Notes:     Used by Bio-Formats for Zeiss LSM metadata in MDB database files 
     209    License:   LGPL 
    198210 
    199211L-M Fit 
     
    208220    URL:       http://openmicroscopy.org/api/java/ 
    209221    Notes:     Used by VisBio and the OME Plugin for ImageJ to connect to OME; 
    210                used by Bio-Formats and the OME Notebook to work with OME-XML 
     222               used by Bio-Formats and the OME Notes to work with OME-XML 
    211223    License:   LGPL 
    212224 
     
    264276 
    265277  <target name="style" 
    266     depends="style-formats, style-visbio, style-plugins, style-notebook, 
     278    depends="style-formats, style-visbio, style-plugins, style-notes, 
    267279      style-editor, style-stitcher, style-slim, style-checks" 
    268280    description="check source code style for LOCI software packages"/> 
     
    278290  <target name="compile" 
    279291    depends="compile-formats, compile-visbio, compile-plugins, 
    280       compile-notebook, compile-editor, compile-stitcher, compile-slim" 
     292      compile-notes, compile-editor, compile-stitcher, compile-slim" 
    281293    description="compile classes for LOCI software packages"/> 
    282294 
    283295  <target name="jars" 
    284     depends="jar-formats, jar-visbio, jar-plugins, jar-notebook, 
     296    depends="jar-formats, jar-visbio, jar-plugins, jar-notes, 
    285297      jar-editor, jar-stitcher, jar-slim, jar-checks" 
    286298    description="generate JAR files for LOCI software packages"/> 
     
    644656  </target> 
    645657 
    646   <!-- OME Notebook --> 
    647  
    648   <target name="style-notebook" depends="copy-source, jar-checks" 
    649     description="check source code style for OME Notebook"> 
     658  <!-- OME Notes --> 
     659 
     660  <target name="style-notes" depends="copy-source, jar-checks" 
     661    description="check source code style for OME Notes"> 
    650662    <checkstyle config="checkstyle.xml" failOnViolation="false"> 
    651       <fileset dir="${dest.dir}" includes="${notebook.source}"/> 
     663      <fileset dir="${dest.dir}" includes="${notes.source}"/> 
    652664    </checkstyle> 
    653665  </target> 
    654666 
    655   <target name="compile-notebook" depends="copy-source" 
    656     description="compile classes for OME Notebook"> 
     667  <target name="compile-notes" depends="copy-source" 
     668    description="compile classes for OME Notes"> 
    657669    <mkdir dir="${classes.dir}"/> 
    658670    <javac srcdir="${dest.dir}" destdir="${classes.dir}" 
    659       includes="${notebook.source}" classpath="${ext.jars}" 
     671      includes="${notes.source}" classpath="${ext.jars}" 
    660672      debug="true" deprecation="true" source="1.4" target="1.4"/> 
    661673  </target> 
    662674 
    663   <target name="jar-notebook" 
    664     depends="compile-notebook, copy-jars, jar-formats" 
    665     description="generate JAR file for OME Notebook"> 
     675  <target name="jar-notes" 
     676    depends="compile-notes, copy-jars, jar-formats" 
     677    description="generate JAR file for OME Notes"> 
    666678    <copy todir="${classes.dir}" preservelastmodified="true"> 
    667       <fileset dir="${src.dir}" includes="${notebook.resources}"/> 
    668     </copy> 
    669     <jar jarfile="${jar.dir}/${notebook.jar}" basedir="${classes.dir}" 
    670       includes="${notebook.files}"> 
    671       <manifest> 
    672         <attribute name="Main-Class" value="${notebook.main}"/> 
    673         <attribute name="Class-Path" value="${notebook.classpath}"/> 
     679      <fileset dir="${src.dir}" includes="${notes.resources}"/> 
     680    </copy> 
     681    <jar jarfile="${jar.dir}/${notes.jar}" basedir="${classes.dir}" 
     682      includes="${notes.files}"> 
     683      <manifest> 
     684        <attribute name="Main-Class" value="${notes.main}"/> 
     685        <attribute name="Class-Path" value="${notes.classpath}"/> 
    674686      </manifest> 
    675687    </jar> 
  • trunk/loci/ome/editor/MetadataEditor.java

    r2644 r2763  
    11// 
    2 // MetadataNotebook.java 
     2// MetadataEditor.java 
    33// 
    44 
     
    4343 * @author Christopher Peterson crpeterson2 at wisc.edu 
    4444 */ 
    45 public class MetadataNotebook extends JFrame 
     45public class MetadataEditor extends JFrame 
    4646  implements ActionListener, ItemListener, Runnable 
    4747{ 
     
    9696  // -- Constructors -- 
    9797 
    98   public MetadataNotebook() { 
     98  public MetadataEditor() { 
    9999    this((String[]) null); 
    100100  } 
    101101 
    102   /** Create a default notebook window with save function and editing enabled.*/ 
    103   public MetadataNotebook(String[] args) { 
     102  /** Create a default editor window with save function and editing enabled.*/ 
     103  public MetadataEditor(String[] args) { 
    104104    this(args, (OMENode) null, (String) null, true, true); 
    105105  } 
    106106 
    107107  /** 
    108   * Create a notebook window with specified save and editing policies. 
     108  * Create an editor window with specified save and editing policies. 
    109109  * @param args an array of strings the first entry of which should be a 
    110110  * filename, otherwise, send a (String[]) null as this parameter. 
     
    115115  * to be a problem if saving is enabled and you try to save to it, since 
    116116  * we're circumventing the code that flags TIFF files. 
    117   * @param title Sets the title of the notebook window, which is done by 
     117  * @param title Sets the title of the editor window, which is done by 
    118118  * default if a file URL is given in args, but otherwise should be set 
    119119  * using this String parameter. 
     
    121121  * @param editable whether or not users should be able to edit the xml 
    122122  */ 
    123   public MetadataNotebook(String[] args, OMENode ome, String title, 
     123  public MetadataEditor(String[] args, OMENode ome, String title, 
    124124    boolean addSave, boolean editable) 
    125125  { 
     
    175175    contentPanel.setLayout(new CardLayout()); 
    176176    contentPanel.setBorder((EmptyBorder) null); 
    177     contentPanel.add("notebook", metadata); 
     177    contentPanel.add("editor", metadata); 
    178178    contentPanel.add("viewer", mdp); 
    179179    contentPanel.add("notes", noteP); 
     
    336336  } 
    337337 
    338   // -- MetadataNotebook API methods -- 
     338  // -- MetadataEditor API methods -- 
    339339 
    340340  /** Sets the current file being displayed to this file. */ 
     
    445445          int rval = opener.showOpenDialog(this); 
    446446          if (rval == JFileChooser.APPROVE_OPTION) { 
    447             new Thread(this, "MetadataNotebook-Opener").start(); 
     447            new Thread(this, "MetadataEditor-Opener").start(); 
    448448          } 
    449449        } 
     
    453453        int rval = opener.showOpenDialog(this); 
    454454        if (rval == JFileChooser.APPROVE_OPTION) { 
    455           new Thread(this, "MetadataNotebook-Opener").start(); 
     455          new Thread(this, "MetadataEditor-Opener").start(); 
    456456        } 
    457457      } 
     
    463463      int rval = saver.showSaveDialog(this); 
    464464      if (rval == JFileChooser.APPROVE_OPTION) { 
    465         new Thread(this, "MetadataNotebook-Saver").start(); 
     465        new Thread(this, "MetadataEditor-Saver").start(); 
    466466        metadata.stateChanged(false); 
    467467      } 
     
    504504        "The OME Metadata Editor is LOCI software written by\n" + 
    505505        "Christopher Peterson.\n" + 
    506         "http://www.loci.wisc.edu/software/#notebook", 
     506        "http://www.loci.wisc.edu/software/#editor", 
    507507        "OME Metadata Editor", JOptionPane.INFORMATION_MESSAGE); 
    508508    } 
     
    661661  // -- Main method -- 
    662662 
    663   /**Test method for debug uses, or simply to bring up a notebook window 
     663  /**Test method for debug uses, or simply to bring up an editor window 
    664664  *  from the console or whatever. 
    665665  */ 
    666   public static void main(String[] args) { new MetadataNotebook(args); } 
     666  public static void main(String[] args) { new MetadataEditor(args); } 
    667667 
    668668} 
  • trunk/loci/ome/editor/MetadataPane.java

    r2725 r2763  
    4848 * Most of the gui code is in here. 
    4949 * If you want a panel instead of a window, instantiate this 
    50  * instead of MetadataNotebook. 
     50 * instead of MetadataEditor. 
    5151 * Sadly you lose quite a bit of functionality such as the 
    5252 * various views if you choose to directly instatiate. 
     
    245245    if (file != null) { 
    246246      setOMEXML(file); 
    247       if (getTopLevelAncestor() instanceof MetadataNotebook) { 
    248         MetadataNotebook mn = (MetadataNotebook) getTopLevelAncestor(); 
     247      if (getTopLevelAncestor() instanceof MetadataEditor) { 
     248        MetadataEditor mn = (MetadataEditor) getTopLevelAncestor(); 
    249249        mn.setCurrentFile(file); 
    250250      } 
     
    311311    int n = JOptionPane.showOptionDialog(getTopLevelAncestor(), 
    312312            "The file you are trying to save to is a third-party format." 
    313             + " Currently Notebook can only save to TIFF or OMEXML files." 
     313            + " Currently only TIFF or OME-XML files can be saved." 
    314314            + " Would you like to save to a companion file instead?", 
    315315            "Can't Save to Third-Party Format", 
     
    348348      else { 
    349349        thisOmeNode.writeOME(file, false); 
    350         if (getTopLevelAncestor() instanceof MetadataNotebook) { 
    351           MetadataNotebook mdn = (MetadataNotebook) getTopLevelAncestor(); 
     350        if (getTopLevelAncestor() instanceof MetadataEditor) { 
     351          MetadataEditor mdn = (MetadataEditor) getTopLevelAncestor(); 
    352352          mdn.setTitle("OME Metadata Editor - " + file); 
    353353        } 
     
    430430      } 
    431431      currentFile = new File(outId); 
    432       if (getTopLevelAncestor() instanceof MetadataNotebook) { 
    433         MetadataNotebook mn = (MetadataNotebook) getTopLevelAncestor(); 
     432      if (getTopLevelAncestor() instanceof MetadataEditor) { 
     433        MetadataEditor mn = (MetadataEditor) getTopLevelAncestor(); 
    434434        mn.setCurrentFile(file); 
    435435      } 
     
    487487    } 
    488488    currentFile = new File(outId); 
    489     if (getTopLevelAncestor() instanceof MetadataNotebook) { 
    490       MetadataNotebook mn = (MetadataNotebook) getTopLevelAncestor(); 
     489    if (getTopLevelAncestor() instanceof MetadataEditor) { 
     490      MetadataEditor mn = (MetadataEditor) getTopLevelAncestor(); 
    491491      mn.setCurrentFile(file); 
    492492    } 
     
    520520        JOptionPane.showMessageDialog(this, 
    521521            "No companion file found to merge!!", 
    522             "MetadataNotebook Error", JOptionPane.ERROR_MESSAGE); 
     522            "MetadataEditor Error", JOptionPane.ERROR_MESSAGE); 
    523523      } 
    524524    } 
     
    526526      JOptionPane.showMessageDialog(this, 
    527527            "You have not saved or opened a file to merge yet!", 
    528             "MetadataNotebook Error", JOptionPane.ERROR_MESSAGE); 
     528            "MetadataEditor Error", JOptionPane.ERROR_MESSAGE); 
    529529    } 
    530530  } 
     
    866866             + " unsupported by bioformats.\nYour metadata will not" 
    867867             + " populate correctly, our apologies.", 
    868           "MetadataNotebook Error", JOptionPane.ERROR_MESSAGE); 
     868          "MetadataEditor Error", JOptionPane.ERROR_MESSAGE); 
    869869        } 
    870870        img = null; 
     
    898898      JOptionPane.showMessageDialog(this, 
    899899          "Document is NULL.", 
    900           "MetadataNotebook Error", JOptionPane.ERROR_MESSAGE); 
     900          "MetadataEditor Error", JOptionPane.ERROR_MESSAGE); 
    901901      System.out.println("Document is NULL."); 
    902902      return; 
     
    11381138    //change the "Tabs" menu in the original window to reflect the actual tabs 
    11391139    //created (duplicate tabs are the reason for this) 
    1140     if (getTopLevelAncestor() instanceof MetadataNotebook) { 
    1141       MetadataNotebook mn = (MetadataNotebook) getTopLevelAncestor(); 
     1140    if (getTopLevelAncestor() instanceof MetadataEditor) { 
     1141      MetadataEditor mn = (MetadataEditor) getTopLevelAncestor(); 
    11421142      mn.changeTabMenu(tabNames); 
    11431143    } 
     
    19331933            "Thumbnails disabled due to multiple pixels with unsupported" 
    19341934              + " ID naming scheme.", 
    1935             "MetadataNotebook Error", JOptionPane.ERROR_MESSAGE); 
     1935            "MetadataEditor Error", JOptionPane.ERROR_MESSAGE); 
    19361936        } 
    19371937        else { 
  • trunk/loci/ome/editor/Template.xml

    r2522 r2763  
    11<?xml version="1.0" ?> 
    2 <NotebookTemplate Version="1.0"> 
     2<EditorTemplate Version="1.0"> 
    33        <OMEElement XMLName="Project" Description="Data having to do with this project." RefVars="%Name: $Name%"> 
    44          <OMEAttribute XMLName="ID"  Type="ID"/> 
     
    119119          <OMEAttribute XMLName="Filter" Type="Ref"/>    
    120120        </OMEElement> 
    121 </NotebookTemplate> 
     121</EditorTemplate> 
  • trunk/loci/ome/editor/TemplateParser.java

    r2522 r2763  
    3030 
    3131/** 
    32  * A simple xml parser to help set up the MetadataNotebook's gui 
     32 * A simple xml parser to help set up the MetadataEditor's gui 
    3333 * based on the commonly used data specified in Template.xml 
    3434 * 
     
    109109  } 
    110110 
    111   /** Returns an array of Elements representing the tabs in the notebook. */ 
     111  /** Returns an array of Elements representing the tabs in the editor. */ 
    112112  public Element[] getTabs() { 
    113113    return tabList; 
  • trunk/loci/ome/editor/editor.bat

    r2644 r2763  
    1 @java loci.ome.editor.MetadataNotebook %1 %2 %3 %4 %5 %6 %7 %8 %9 
     1@java loci.ome.editor.MetadataEditor %1 %2 %3 %4 %5 %6 %7 %8 %9 
Note: See TracChangeset for help on using the changeset viewer.