Changeset 2766


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

More OME Notebook renaming.

Location:
trunk
Files:
2 added
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/gui/ImageViewer.java

    r2687 r2766  
    164164    fileSave.addActionListener(this); 
    165165    file.add(fileSave); 
    166     boolean canDoNotebook = false; 
     166    boolean canDoNotes = false; 
    167167    try { 
    168       Class c = Class.forName("loci.ome.notebook.Notebook"); 
    169       if (c != null) canDoNotebook = true; 
     168      Class c = Class.forName("loci.ome.notes.Notes"); 
     169      if (c != null) canDoNotes = true; 
    170170    } 
    171171    catch (Throwable t) { } 
    172     if (canDoNotebook) { 
     172    if (canDoNotes) { 
    173173      JMenuItem fileView = new JMenuItem("View Metadata..."); 
    174174      fileView.setMnemonic('m'); 
     
    367367    } 
    368368    else if ("view".equals(cmd)) { 
    369       // NB: avoid dependencies on optional loci.ome.notebook package 
     369      // NB: avoid dependencies on optional loci.ome.notes package 
    370370      ReflectedUniverse r = new ReflectedUniverse(); 
    371371      try { 
    372         r.exec("import loci.ome.notebook.Notebook"); 
     372        r.exec("import loci.ome.notes.Notes"); 
    373373        r.setVar("filename", filename); 
    374         r.exec("new Notebook(null, filename)"); 
     374        r.exec("new Notes(null, filename)"); 
    375375      } 
    376376      catch (ReflectException exc) { exc.printStackTrace(); } 
  • trunk/loci/plugins/browser/CustomWindow.java

    r2705 r2766  
    3939import javax.swing.event.ChangeListener; 
    4040import loci.formats.*; 
    41 //import loci.ome.notebook.Notebook; 
     41//import loci.ome.notes.Notes; 
    4242import org.openmicroscopy.xml.OMENode; 
    4343 
     
    171171      // disable XML button if proper libraries are not installed 
    172172      Class.forName("org.openmicroscopy.xml.OMENode"); // ome-java.jar 
    173       Class.forName("loci.ome.notebook.MetadataNotebook"); // ome-notebook.jar 
     173      Class.forName("loci.ome.notes.Notes"); // ome-notes.jar 
    174174      Class.forName("com.jgoodies.forms.layout.FormLayout"); // forms-1.0.4.jar 
    175175    } 
     
    182182      xml.addActionListener(this); 
    183183      xml.setActionCommand("xml"); 
     184      xml.setEnabled(false);//TEMP 
    184185    } 
    185186 
     
    513514    Object src = e.getSource(); 
    514515    String cmd = e.getActionCommand(); 
    515     if (cmd == null) cmd = ""; // prevent NullPointer 
    516     if (cmd.equals("xml")) { 
    517       String[] args = (String[]) null; 
    518  
     516    if ("xml".equals(cmd)) { 
    519517      String title = db.id; 
    520518      try { 
    521         OMENode ome = (OMENode)(db.reader.getMetadataStoreRoot()); 
     519        OMENode ome = (OMENode) db.reader.getMetadataStoreRoot(); 
    522520 
    523521        ReflectedUniverse r = new ReflectedUniverse(); 
    524         r.exec("import loci.ome.notebook.MetadataNotebook"); 
    525         r.setVar("args", args); 
     522        r.exec("import loci.ome.notes.Notes"); 
    526523        r.setVar("ome", ome); 
    527524        r.setVar("title", title); 
    528         r.setVar("false", false); 
    529         r.exec("new MetadataNotebook(args, ome, title, false, false)"); 
     525        r.exec("new Notes(ome, title)"); 
    530526      } 
    531527      catch (ReflectException exc) { 
    532528        JOptionPane.showMessageDialog(this, 
    533           "Sorry, there has been an error creating the metadata editor.", 
     529          "Sorry, there has been an error creating the metadata window.", 
    534530          "4D Data Browser", JOptionPane.ERROR_MESSAGE); 
    535531        LociDataBrowser.dumpException(exc); 
    536532      } 
    537533    } 
    538     else if (cmd.equals("options")) { 
    539       if (ow == null) ow = new OptionsWindow(db.hasZ ? db.numZ : 1, 
    540         db.hasT ? db.numT : 1, this); 
     534    else if ("options".equals(cmd)) { 
     535      if (ow == null) { 
     536        ow = new OptionsWindow(db.hasZ ? db.numZ : 1, 
     537          db.hasT ? db.numT : 1, this); 
     538      } 
    541539      ow.setVisible(true); 
    542540    } 
    543541    else if (src instanceof Timer) { 
    544           t = tSliceSel.getValue() + 1; 
    545           if ((t > db.numT)) t = 1; 
    546           tSliceSel.setValue(t); 
     542      t = tSliceSel.getValue() + 1; 
     543      if ((t > db.numT)) t = 1; 
     544      tSliceSel.setValue(t); 
    547545    } 
    548546    else if (src instanceof JButton) { 
  • trunk/tools/notes

    r2515 r2766  
    11#!/bin/bash 
    22 
    3 # notebook: a script for launching the OME Metadata Notebook 
     3# notes: a script for launching OME Notes 
    44 
    55# Required JARs: loci_tools.jar 
     
    1212# LOCI_DEVEL environment variable to use them instead. 
    1313 
    14 PROG=loci.ome.notebook.Notebook 
     14PROG=loci.ome.notes.Notes 
    1515 
    1616if [ $LOCI_DEVEL ] 
  • trunk/tools/notes.bat

    r2515 r2766  
    11@echo off 
    22 
    3 rem notebook: a script for launching the OME Metadata Notebook 
     3rem notes: a batch file for launching OME Notes 
    44 
    55rem Required JARs: loci_tools.jar 
     
    1212rem LOCI_DEVEL environment variable to use them instead. 
    1313 
    14 set PROG=loci.ome.notebook.Notebook 
     14set PROG=loci.ome.notes.Notes 
    1515 
    1616if "%LOCI_DEVEL%" == "" ( 
Note: See TracChangeset for help on using the changeset viewer.