• Views
  • Iteration Report
  • My Iteration Report
  •  
OMERO.server
  • Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Changeset
  • Next Changeset →

Changeset 1195

Show
Ignore:
Timestamp:
01/17/07 16:06:15 (20 months ago)
Author:
TheBrain
Message:

Synchronize with bioformats-omero branch.

Location:
trunk/components/bioformats-omero
Files:
1 removed
44 modified
2 copied

  • . (modified) (1 prop)
  • .classpath (modified) (1 diff)
  • README.txt (modified) (1 diff)
  • build.xml (modified) (1 prop)
  • classpath.xml (modified) (1 prop)
  • lib/client-3.0-TRUNK.jar (modified) (previous)
  • lib/common-3.0-TRUNK.jar (modified) (previous)
  • pom.xml (modified) (2 diffs, 1 prop)
  • src/ch/randelshofer/quaqua/jaguar/filechooser/QuaquaJaguarFileChooserPanel.java (modified) (11 diffs, 1 prop)
  • src/ch/randelshofer/quaqua/panther/QuaquaPantherFileChooserUI.java (modified) (75 diffs, 1 prop)
  • src/ome/formats/EnumerationException.java (modified) (3 diffs, 1 prop)
  • src/ome/formats/OMEROMetadataStore.java (modified) (34 diffs, 1 prop)
  • src/ome/formats/importer/About.java (modified) (5 diffs, 1 prop)
  • src/ome/formats/importer/CommentMessenger.java (modified) (5 diffs, 1 prop)
  • src/ome/formats/importer/DebugMessenger.java (modified) (7 diffs, 1 prop)
  • src/ome/formats/importer/FileQueueChooser.java (modified) (6 diffs, 1 prop)
  • src/ome/formats/importer/FileQueueHandler.java (modified) (4 diffs, 1 prop)
  • src/ome/formats/importer/FileQueueTable.java (modified) (17 diffs, 1 prop)
  • src/ome/formats/importer/FindAccessory.java (deleted)
  • src/ome/formats/importer/ImportContainer.java (modified) (2 diffs, 1 prop)
  • src/ome/formats/importer/ImportDialog.java (modified) (27 diffs, 1 prop)
  • src/ome/formats/importer/ImportFixture.java (modified) (6 diffs, 1 prop)
  • src/ome/formats/importer/ImportHandler.java (modified) (11 diffs, 1 prop)
  • src/ome/formats/importer/ImportLibrary.java (modified) (19 diffs, 1 prop)
  • src/ome/formats/importer/LogAppender.java (modified) (4 diffs, 1 prop)
  • src/ome/formats/importer/LogAppenderProxy.java (modified) (3 diffs, 1 prop)
  • src/ome/formats/importer/LoginDialog.java (modified) (10 diffs, 1 prop)
  • src/ome/formats/importer/LoginHandler.java (modified) (9 diffs, 1 prop)
  • src/ome/formats/importer/Main.java (modified) (19 diffs, 1 prop)
  • src/ome/formats/importer/SplashWindow.java (modified) (11 diffs, 1 prop)
  • src/ome/formats/importer/Splasher.java (modified) (1 diff, 1 prop)
  • src/ome/formats/importer/StatusBar.java (modified) (10 diffs, 1 prop)
  • src/ome/formats/importer/gfx/config.png (copied) (copied from branches/bioformats-omero/src/ome/formats/importer/gfx/config.png)
  • src/ome/formats/importer/gfx/config_pressed.png (copied) (copied from branches/bioformats-omero/src/ome/formats/importer/gfx/config_pressed.png)
  • src/ome/formats/importer/util/Actions.java (modified) (1 diff, 1 prop)
  • src/ome/formats/importer/util/ETable.java (modified) (12 diffs, 1 prop)
  • src/ome/formats/importer/util/Grid.java (modified) (3 diffs, 1 prop)
  • src/ome/formats/importer/util/GuiCommonElements.java (modified) (13 diffs, 1 prop)
  • src/ome/formats/importer/util/HtmlMessenger.java (modified) (3 diffs, 1 prop)
  • src/ome/formats/importer/util/HtmlMessengerException.java (modified) (1 diff, 1 prop)
  • src/ome/formats/importer/util/ProjectCreator.java (modified) (3 diffs, 1 prop)
  • src/ome/formats/importer/util/TinyImportFixture.java (modified) (3 diffs, 1 prop)
  • test/integration.testng.xml (modified) (1 prop)
  • test/ome/formats/testclient/ExampleUnitTest.java (modified) (2 diffs, 1 prop)
  • test/ome/formats/testclient/StatefulServiceTest.java (modified) (4 diffs, 1 prop)
  • test/ome/formats/testclient/ThumbnailServiceTest.java (modified) (2 diffs, 1 prop)
  • test/unit.testng.xml (modified) (1 prop)

Legend:

Unmodified
Added
Removed
  • trunk/components/bioformats-omero

    • Property svn:ignore
      •  

        old new  
        11bin 
         2Test Images 
  • trunk/components/bioformats-omero/.classpath

    r1115 r1195  
    44        <classpathentry kind="src" path="src"/> 
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    6         <classpathentry kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    7         <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> 
    8         <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> 
    9         <classpathentry kind="var" path="M2_REPO/omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 
    10         <classpathentry kind="var" path="M2_REPO/omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    11         <classpathentry sourcepath="/USER_HOME/code/jboss-4.0.x" kind="var" path="M2_REPO/omero/jboss-ejb3/4.0.4.GA/jboss-ejb3-4.0.4.GA.jar"/> 
    12         <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    13         <classpathentry kind="var" path="M2_REPO/omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    14         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
    15         <classpathentry sourcepath="/SPRING_HOME" kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    16         <classpathentry kind="var" path="M2_REPO/omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
    176        <classpathentry kind="src" path="resources"/> 
    18         <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    19         <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> 
    20         <classpathentry kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    21         <classpathentry kind="lib" path="lib/TableLayout.jar"/> 
    22         <classpathentry kind="lib" path="lib/quaqua-filechooser-only.jar"> 
     7        <classpathentry kind="lib" path="lib/TableLayout.jar"> 
    238                <attributes> 
    24                         <attribute value="/workspace/OMERO Import/lib" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> 
     9                        <attribute value="OMERO Import/lib" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> 
    2510                </attributes> 
    2611        </classpathentry> 
     12        <classpathentry kind="lib" path="lib/spring-2.0-m3.jar"/> 
     13        <classpathentry kind="lib" path="lib/quaqua-filechooser-only.jar"/> 
     14        <classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/> 
     15        <classpathentry kind="lib" path="lib/jboss-ejb3x-4.0.4.GA.jar"/> 
     16        <classpathentry kind="lib" path="lib/jboss-ejb3-4.0.4.GA.jar"/> 
     17        <classpathentry kind="lib" path="lib/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
     18        <classpathentry kind="lib" path="lib/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 
     19        <classpathentry kind="lib" path="lib/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
     20        <classpathentry kind="lib" path="lib/jbossall-client-4.0.4.GA.jar"/> 
     21        <classpathentry kind="lib" path="lib/hibernate-3.1.2.jar"/> 
     22        <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/> 
     23        <classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/> 
     24        <classpathentry kind="lib" path="lib/common-3.0-TRUNK.jar"/> 
     25        <classpathentry kind="lib" path="lib/client-3.0-TRUNK.jar"/> 
     26        <classpathentry kind="lib" path="/Library/Java/Extensions/postgresql-8.1-407.jdbc3.jar"/> 
    2727        <classpathentry kind="output" path="bin"/> 
    2828</classpath> 
  • trunk/components/bioformats-omero/README.txt

    r1158 r1195  
    11README (OMERO Import Test Client) 
    22 
    3 Last Updated: July 31st, 2006 
     3Last Updated: December 5th, 2006 
    44 
    5 Please note that portions of this software are copyrighted under the GNU General Public License. Details for this license can be found at in the gpl.txt file included with this software, or from http://www.gnu.org/licenses/gpl.html. 
     5Please note that portions of this software are copyrighted under the GNU Lesser General Public License. Details for this license can be found at in the lglp.txt file included with this software, or from http://www.gnu.org/licenses/lgpl.html. 
    66 
    77----- 
    88 
    9 The current implementation of the OMERO import engine is a client side application which allows you to import microscopy imaging data into an OMERO server environment. Technically, the client application will allow you to import any file format into OMERO, however in its current state, only DeltaVision (.dv) files are supported. 
     9The current implementation of the OMERO import engine is a client side application which allows you to import microscopy imaging data into an OMERO server environment. Technically, the client application will allow you to import any file format into OMERO, however in its current state, only DeltaVision (.dv) and Metamorph (.stk), and single plane Tiff (.tif) files are supported. 
    1010 
    1111Please note that this application has limited functionality and is for testing purposes only. While it has been tested in a few live environments, it is by no means well tested, and at some point you will probably find a bug which is unaccounted for - Caveat Emptor! 
    1212 
    13 To use this applicaton, you must have access to an existing and fully functional OMERO server, and you must know your username, password, URL, and port for logging into it. After entering this data into the test client, files may be imported into OMERO by selecting the import option into the client, locating your .dv file for import, and choosing a OMERO dataset to import them into. By selecting more then one file in the file chooser you may also import multiple files at the same time. 
     13To use this applicaton, you must have access to an existing and fully functional OMERO server, and you must know your username, password, URL, and port for logging into it. After logging into the importer, files can be imported by going to the "file viewer" tab, locating your .dv/.stk file(s) for import and adding them to the queue (which will prompt you to choose an OMERO project/dataset to import them into). By selecting more then one file in the file chooser you may also add multiple files to the queue at the same time. Once you are happy with your queue, click import. After the import has started, you may continue to add files to the import queue, (but you cannot delete them). Once the import is started, you will need to click the import button again to restart the import for any new files. 
     14 
     15Please note: this software requires that you use Java version 1.5.0 or higher. 
     16 
     17----- 
     18 
     19NEW FEATURES: 
     20 
     21(Changeset Version 1115) 
     22- Fixed a few minor bugs to improve UI usability 
     23 
     24(Changeset Version 1095) 
     25- Added a debug messaging system that allows you to send us bugs when the importer crashes. 
     26- Added a comment feedback system that allows you to send us comments from the help menu. 
     27- The import dialog now memorizes what options you select for file naming (so you don't have to keep changing it) 
     28- The archive feature has been temporarily disabled until archive file retrieval is added to Shoola 
     29- Fixed a login bug that didn't allow you to log out and back in correctly 
     30- Fixed an import bug that didn't allow you to import the same image twice. 
     31 
     32(Changeset Version 1072) 
     33- In anticipation of our RC1 release, this build addresses a number of minor bug fixes and improves on feedback to the user when or if they run into trouble. Expect to see more popup messages and the like when something goes wrong. 
     34 
     35(Changeset Version 1066) 
     36- Added the abilty during import to limit the length of the file path. You may now choose to use the single file name (such as "myimage.dv"), the full file path (such as "\users\swedlow\images\myimage.dv") or any combination of file name + partial path (such as "\images\myimage.dv" -- leaving out the "\users\swedlow" at the front). 
     37- You can now archive the original file on the server during the import process by selecting the archive file option (this is turned on by default). NOTE: The shoola client does not handle file retrieval yet, so HANG ONTO YOUR ORIGINAL FILES! 
    1438 
    1539----- 
    1640 
    1741KNOWN BUGS:  
     42(Changeset Version 1072) 
     43- There is a bug when importing an image twice. To fix this problem, shut down the importer before attempting the second import. If you do not, the image will overwrite the first and you will only see one image imported into OMERO. 
     44 
     45(Changeset Version 1066) 
     46- No known bugs *crosses fingers* 
     47 
     48(Changeset Version 1048) 
     49 - Added support for single plane tiff images. NOTE: You CANNOT currently import multi-plane tiffs as this will trigger a debug exception and stop the importer (if this occurs you will need to restart the application). 
     50 
     51(Changeset Version 1008) 
     52 - While importing, you cannot delete files from the file queue 
     53 - For very large files, there is a small pause just before the import begins that could be mistaken as the importing hanging. Give it time and it should start importing after a few moments. 
     54 - Currently, nothing is stopping you from shutting down the importer in the middle of an import will. This will result in an incomplete import. Don't do this! 
     55 
     56(Changeset Version 900) 
     57 - Changed the order of the buttons used by the import dialog to reflect the order used in the directory chooser 
     58 - Stripped out any unused file formats (now only displays .dv and .stk files). 
     59 - The file chooser now memorizes the last directory you used, (or defaults to your home directory). 
     60 - Added funcionality to handle a rounding error in GobalMin and GlobalMax 
     61 - Updated the functionality of the login/logoff dialog. This dialog can now be dismissed in case of an error so you may view the application windows below. 
     62 - The application now correctly handles errors in the login process and allows you to relog in by selecting the File/Login option. 
     63 - You may now logoff from the File/Logoff menu option without exiting the application. 
     64 
     65(Changeset Version 893) 
     66 
     67 - There have been a number of UI and functional changes to the importer. The most important addition is the ability to import metamorph .STK files. 
     68 - The login bug from the pervious version has also been fixed. You can now log in after a login error without restarting the application. 
     69 
    1870 
    1971(Changeset Version 818) 
  • trunk/components/bioformats-omero/build.xml

    • Property svn:keywords deleted
  • trunk/components/bioformats-omero/classpath.xml

    • Property svn:keywords deleted
  • trunk/components/bioformats-omero/pom.xml

    • Property svn:keywords deleted
    r1167 r1195  
    99  </parent> 
    1010  <name>BioFormats Extension for Omero</name> 
    11   <artifactId>bioformats-omero</artifactId> 
     11  <artifactId>client</artifactId> 
    1212  <packaging>pom</packaging> 
    1313  <dependencies> 
    … …  
    1818    </dependency> 
    1919  </dependencies> 
    20 </project> 
     20/project> 
  • trunk/components/bioformats-omero/src/ch/randelshofer/quaqua/jaguar/filechooser/QuaquaJaguarFileChooserPanel.java

    • Property svn:keywords deleted
    r1167 r1195  
    1616package ch.randelshofer.quaqua.jaguar.filechooser; 
    1717 
     18import ch.randelshofer.quaqua.*; 
    1819import ch.randelshofer.quaqua.util.*; 
    1920 
    2021import javax.swing.*; 
    21  
    2222/** 
    2323 * QuaquaFileChooserPanel (This class is needed only to design the UI of the 
    2424 * QuaquaFileChooserUI in the NetBeans form editor). 
    25  *  
     25 * 
    2626 * @author Werner Randelshofer 
    27  * @version 1.0.1 2005-11-07 Get "Labels" resource bundle from UIManager. <br> 
    28  *          1.0 July 24, 2003 Created. 
     27 * @version 1.0.1 2005-11-07 Get "Labels" resource bundle from UIManager. 
     28 * <br>1.0 July 24, 2003 Created. 
    2929 */ 
    3030public class QuaquaJaguarFileChooserPanel extends javax.swing.JPanel { 
    31     /** 
    32      *  
    33      */ 
    34     private static final long serialVersionUID = 1032262073563287646L; 
    35  
    36     private ResourceBundleUtil labels = (ResourceBundleUtil) UIManager 
    37             .get("Labels"); 
    38  
     31    private ResourceBundleUtil labels = (ResourceBundleUtil) UIManager.get("Labels"); 
     32     
    3933    /** Creates a new instance. */ 
    4034    public QuaquaJaguarFileChooserPanel() { 
    4135        initComponents(); 
    4236    } 
    43  
     37     
    4438    public static void main(String[] args) { 
    4539        JFrame f = new JFrame("Open Frame"); 
    … …  
    4741        f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); 
    4842        f.setVisible(true); 
    49  
     43         
    5044        JDialog d = new JDialog(f, "Open Dialog"); 
    51         // d.getContentPane().add(new QuaquaJaguarFileChooserPanel()); 
     45        //d.getContentPane().add(new QuaquaJaguarFileChooserPanel()); 
    5246        JPanel p = new JPanel(); 
    5347        QuaquaJaguarFileChooserPanel fp; 
    … …  
    5751        d.show(); 
    5852    } 
    59  
    60     /** 
    61      * This method is called from within the constructor to initialize the form. 
    62      * WARNING: Do NOT modify this code. The content of this method is always 
    63      * regenerated by the Form Editor. 
     53     
     54    /** This method is called from within the constructor to 
     55     * initialize the form. 
     56     * WARNING: Do NOT modify this code. The content of this method is 
     57     * always regenerated by the Form Editor. 
    6458     */ 
    65     private void initComponents() {// GEN-BEGIN:initComponents 
     59    private void initComponents() {//GEN-BEGIN:initComponents 
    6660        java.awt.GridBagConstraints gridBagConstraints; 
    6761 
    … …  
    9589        fromPanel.setLayout(new java.awt.GridBagLayout()); 
    9690 
    97         fileNameLabel 
    98                 .setText(labels.getString("FileChooser.fileNameLabelText")); 
     91        fileNameLabel.setText(labels.getString("FileChooser.fileNameLabelText")); 
    9992        gridBagConstraints = new java.awt.GridBagConstraints(); 
    10093        gridBagConstraints.gridx = 0; 
    … …  
    152145        separatorPanel1.setLayout(new java.awt.BorderLayout()); 
    153146 
    154         separatorPanel1.setBackground(javax.swing.UIManager.getDefaults() 
    155                 .getColor("Separator.foreground")); 
     147        separatorPanel1.setBackground(javax.swing.UIManager.getDefaults().getColor("Separator.foreground")); 
    156148        gridBagConstraints = new java.awt.GridBagConstraints(); 
    157149        gridBagConstraints.gridx = 0; 
    … …  
    165157        separatorPanel2.setLayout(new java.awt.BorderLayout()); 
    166158 
    167         separatorPanel2.setBackground(javax.swing.UIManager.getDefaults() 
    168                 .getColor("Separator.foreground")); 
     159        separatorPanel2.setBackground(javax.swing.UIManager.getDefaults().getColor("Separator.foreground")); 
    169160        gridBagConstraints = new java.awt.GridBagConstraints(); 
    170161        gridBagConstraints.gridx = 3; 
    … …  
    181172        fc.add(fromPanel, gridBagConstraints); 
    182173 
    183         browserScrollPane 
    184                 .setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); 
    185         browserScrollPane 
    186                 .setVerticalScrollBarPolicy(javax.swing.JScrollPane.VERTICAL_SCROLLBAR_NEVER); 
     174        browserScrollPane.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); 
     175        browserScrollPane.setVerticalScrollBarPolicy(javax.swing.JScrollPane.VERTICAL_SCROLLBAR_NEVER); 
    187176        browserScrollPane.setViewportView(browser); 
    188177 
    … …  
    196185        fc.add(browserScrollPane, gridBagConstraints); 
    197186 
    198         newFolderButton.setText(labels 
    199                 .getString("FileChooser.newFolderButtonText")); 
     187        newFolderButton.setText(labels.getString("FileChooser.newFolderButtonText")); 
    200188        gridBagConstraints = new java.awt.GridBagConstraints(); 
    201189        gridBagConstraints.gridx = 0; 
    … …  
    207195        separatorPanel.setLayout(new java.awt.BorderLayout()); 
    208196 
    209         separatorPanel.setBackground(javax.swing.UIManager.getDefaults() 
    210                 .getColor("Separator.foreground")); 
     197        separatorPanel.setBackground(javax.swing.UIManager.getDefaults().getColor("Separator.foreground")); 
    211198        gridBagConstraints = new java.awt.GridBagConstraints(); 
    212199        gridBagConstraints.gridx = 0; 
    … …  
    222209        formatPanel2.setLayout(new java.awt.BorderLayout(2, 0)); 
    223210 
    224         filesOfTypeLabel.setText(labels 
    225                 .getString("FileChooser.filesOfTypeLabelText")); 
     211        filesOfTypeLabel.setText(labels.getString("FileChooser.filesOfTypeLabelText")); 
    226212        formatPanel2.add(filesOfTypeLabel, java.awt.BorderLayout.WEST); 
    227213 
    … …  
    275261        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; 
    276262        gridBagConstraints.insets = new java.awt.Insets(14, 0, 0, 0); 
    277         // fc.add(buttonPanel, gridBagConstraints); 
     263        //fc.add(buttonPanel, gridBagConstraints); 
    278264 
    279265        add(fc, java.awt.BorderLayout.CENTER); 
    280266 
    281     }// GEN-END:initComponents 
    282  
     267    }//GEN-END:initComponents 
     268     
     269     
    283270    // Variables declaration - do not modify//GEN-BEGIN:variables 
    284271    private javax.swing.JPanel accessoryPanel; 
    285  
    286272    private javax.swing.JButton approveButton; 
    287  
    288273    private ch.randelshofer.quaqua.JBrowser browser; 
    289  
    290274    private javax.swing.JScrollPane browserScrollPane; 
    291  
    292275    private javax.swing.JPanel buttonPanel; 
    293  
    294276    private javax.swing.JButton cancelButton; 
    295  
    296277    private javax.swing.JComboBox directoryComboBox; 
    297  
    298278    private javax.swing.JPanel fc; 
    299  
    300279    private javax.swing.JLabel fileNameLabel; 
    301  
    302280    private javax.swing.JTextField fileNameTextField; 
    303  
    304281    private javax.swing.JLabel filesOfTypeLabel; 
    305  
    306282    private javax.swing.JComboBox filterComboBox; 
    307  
    308283    private javax.swing.JPanel formatPanel; 
    309  
    310284    private javax.swing.JPanel formatPanel2; 
    311  
    312285    private javax.swing.JPanel fromPanel; 
    313  
    314286    private javax.swing.JLabel lookInLabel; 
    315  
    316287    private javax.swing.JButton newFolderButton; 
    317  
    318288    private javax.swing.JPanel separatorPanel; 
    319  
    320289    private javax.swing.JPanel separatorPanel1; 
    321  
    322290    private javax.swing.JPanel separatorPanel2; 
    323  
    324291    private javax.swing.JPanel strutPanel1; 
    325  
    326292    private javax.swing.JPanel strutPanel2; 
    327293    // End of variables declaration//GEN-END:variables 
    328  
     294     
    329295} 
  • trunk/components/bioformats-omero/src/ch/randelshofer/quaqua/panther/QuaquaPantherFileChooserUI.java

    • Property svn:keywords deleted
    r1167 r1195  
    2121import ch.randelshofer.quaqua.util.*; 
    2222 
    23 // import ch.randelshofer.gui.*; 
     23//import ch.randelshofer.gui.*; 
    2424import javax.swing.*; 
    2525import javax.swing.border.*; 
    … …  
    3434import java.beans.*; 
    3535import java.io.File; 
     36import java.io.IOException; 
    3637import java.util.*; 
    37  
    38 // import java.util.regex.*; 
     38//import java.util.regex.*; 
    3939 
    4040/** 
    41  * A replacement for the AquaFileChooserUI. Provides a column view similar to 
    42  * the one provided with the native Aqua user interface on Mac OS X 10.3 
     41 * A replacement for the AquaFileChooserUI. Provides a column view similar 
     42 * to the one provided with the native Aqua user interface on Mac OS X 10.3 
    4343 * (Panther). 
    44  *  
     44 * 
    4545 * @author Werner Randelshofer 
    46  * @version 1.7 2006-04-08 Use BasicFileView when UIManager property 
    47  *          FileChooser.speed is set to true. <br> 
    48  *          1.6.6 2006-03-28 Update approve button state on text change in 
    49  *          filename field. <br> 
    50  *          1.6.5 2006-03-22 New folder was created in parent directory when a 
    51  *          folder was selected. <br> 
    52  *          1.6.4 2006-03-15 Couldn't save a new file. <br> 
    53  *          1.6.3 2006-03-14 Name of non-existing file was not written into 
    54  *          filename field. <br> 
    55  *          1.6.2 2006-03-05 Approve button did not work properly for multiple 
    56  *          selection. Disallow approval on double clicks on a directory. <br> 
    57  *          1.6.1 2006-02-06 Take infos from AliasFileSystemTreeModel.Node 
    58  *          instead of from File objects to reduce the amount of IO operations. 
    59  *          <br> 
    60  *          1.6 2005-11-26 VolumesRenderer retrieves file icons from the 
    61  *          SidebarListModel. <br> 
    62  *          1.5.2 2005-11-13 Don't change text of fileNameTextField, when it has 
    63  *          focus. <br> 
    64  *          1.5.1 2005-11-07 Get "Labels" resource bundle from UIManager. <br> 
    65  *          1.5 2005-09-11 Celltips for browser added. Allways display 
    66  *          horizontal scroll bar of JBrowser. <br> 
    67  *          1.4.4 2005-08-25 Fixed a null pointer exception. <br> 
    68  *          1.4.3 2005-06-21 SplitPane divider size configurable by LookAndFeel. 
    69  *          <br> 
    70  *          1.4.2 2005-06-05 Moved calls to System.getProperty into 
    71  *          QuaquaManager. <br> 
    72  *          1.4.1 2005-04-22 Tweaked the layout. <br> 
    73  *          1.4 2005-03-22 Show as much path components as possible of 
    74  *          non-existent files in the directory combo box. Use 
    75  *          Locale.getDefault() in case the JFileChooser component can not 
    76  *          provide a locale. <br> 
    77  *          1.3.1 2004-12-28 Call clearIconCache() on the IconView, if this 
    78  *          method is available. <br> 
    79  *          1.3 2004-11-01 Support for dropping files on the file chooser added. 
    80  *          File and directory selection is now handled in a more 
    81  *          straightforward way - this may affect code that depends on the 
    82  *          values returned by methods JFileChooser.getSelectedFiles(), 
    83  *          JFileChooser.getSelectedFile() while the file chooser is being 
    84  *          shown. 1.2.2 2004-10-26 setFileSelected had no effect, when a file 
    85  *          with a relative path was used. <br> 
    86  *          1.2.1 2004-10-21 Double clicking the browsers approves the 
    87  *          selection. When there is an approvable selection, the approve button 
    88  *          is made the default button. <br> 
    89  *          1.2 2004-10-17 Resolve alias files. Do not clear fileName text 
    90  *          field, when the user selects a directory. Volumes list did not 
    91  *          update properly when a volume was added/removed. Handle relative 
    92  *          path names. Display the real name of a file in the file name text 
    93  *          field. Enable the approve button only, when the right kind of file 
    94  *          (or directory) is selected. Treat non-traversable directories like 
    95  *          files. Selecting a file in the volumes list, sets the current 
    96  *          directory to that file. Fixed a bug where the file name in the file 
    97  *          name field was used to determine the approved file altough the field 
    98  *          was not visible. <br> 
    99  *          1.1.2 2004-09-11 Fixed IndexOutOfBoundsException caused by method 
    100  *          addItem of inner class DirectoryComboBoxModel. Replaced all method 
    101  *          invocations to method QuaquaManager.getProperty to 
    102  *          QuaquaManager.getProperty. <br> 
    103  *          1.1.1 2004-08-28 Set the FileView of the JFileChooser. <br> 
    104  *          1.1 2004-07-31 Set the text of the approve button to "Choose", when 
    105  *          directory selection is enabled. Fixed layout issue with 
    106  *          fileNameTextField. 1.0 2004-07-04 Created. 
     46 * @version 1.7 2006-04-08 Use BasicFileView when UIManager property  
     47 * FileChooser.speed is set to true. 
     48 * <br>1.6.6 2006-03-28 Update approve button state on text change in 
     49 * filename field. 
     50 * <br>1.6.5 2006-03-22 New folder was created in parent directory 
     51 * when a folder was selected. 
     52 * <br>1.6.4 2006-03-15 Couldn't save a new file. 
     53 * <br>1.6.3 2006-03-14 Name of non-existing file was not written into 
     54 * filename field. 
     55 * <br>1.6.2 2006-03-05 Approve button did not work properly for multiple 
     56 * selection. Disallow approval on double clicks on a directory. 
     57 * <br>1.6.1 2006-02-06 Take infos from AliasFileSystemTreeModel.Node 
     58 * instead of from File objects to reduce the amount of IO operations. 
     59 * <br>1.6 2005-11-26 VolumesRenderer retrieves file icons from the 
     60 * SidebarListModel. 
     61 * <br>1.5.2 2005-11-13 Don't change text of fileNameTextField, when it 
     62 * has focus. 
     63 * <br>1.5.1 2005-11-07 Get "Labels" resource bundle from UIManager. 
     64 * <br>1.5 2005-09-11 Celltips for browser added. Allways display 
     65 * horizontal scroll bar of JBrowser. 
     66 * <br>1.4.4 2005-08-25 Fixed a null pointer exception. 
     67 * <br>1.4.3 2005-06-21 SplitPane divider size configurable by LookAndFeel. 
     68 * <br>1.4.2 2005-06-05 Moved calls to System.getProperty into QuaquaManager. 
     69 * <br>1.4.1 2005-04-22 Tweaked the layout. 
     70 * <br>1.4 2005-03-22 Show as much path components as possible of 
     71 * non-existent files in the directory combo box. Use Locale.getDefault() 
     72 * in case the JFileChooser component can not provide a locale. 
     73 * <br>1.3.1 2004-12-28 Call clearIconCache() on the IconView, if this 
     74 * method is available. 
     75 * <br>1.3 2004-11-01 Support for dropping files on the file chooser 
     76 * added. File and directory selection is now handled in a more straightforward 
     77 * way - this may affect code that depends on the values returned by methods 
     78 * JFileChooser.getSelectedFiles(), JFileChooser.getSelectedFile() while the 
     79 * file chooser is being shown. 
     80 * 1.2.2 2004-10-26 setFileSelected had no effect, when a file with 
     81 * a relative path was used. 
     82 * <br>1.2.1 2004-10-21 Double clicking the browsers approves the selection. 
     83 * When there is an approvable selection, the approve button is made the default 
     84 * button. 
     85 * <br>1.2 2004-10-17 Resolve alias files. Do not clear fileName text 
     86 * field, when the user selects a directory. Volumes list did not update 
     87 * properly when a volume was added/removed. Handle relative path names. 
     88 * Display the real name of a file in the file name text field. Enable the 
     89 * approve button only, when the right kind of file (or directory) is selected.