Changeset 2295 for branches

Timestamp:

03/12/08 12:10:08 (9 months ago)

Author:

brain

Message:

Cleaning up and removing omero.importer branch

Location:

branches/3.0-Beta2.3/components/bioformats-omero

Files:

• .classpath (modified) (3 diffs)
• lib/jcalendar-1.3.2.jar (deleted)
• lib/swingx-2007_09_16.jar (added)
• src/ome/formats/importer/HistoryTable.java (modified) (1 diff)
• src/omero (deleted)

branches/3.0-Beta2.3/components/bioformats-omero/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-        <classpathentry kind="src" path="test"/>
-        <classpathentry kind="src" path="target/generated/resources"/>
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry kind="src" path="resources"/>
         <classpathentry kind="lib" path="lib/TableLayout.jar"/>
         <classpathentry kind="lib" path="lib/spring-2.0.6.jar"/>
@@ -26 +23 @@
         <classpathentry kind="lib" path="lib/common-3.0-Beta2.3.jar"/>
         <classpathentry kind="lib" path="lib/client-3.0-Beta2.3.jar"/>
-        <classpathentry kind="lib" path="lib/jcalendar-1.3.2.jar"/>
         <classpathentry kind="lib" path="lib/hsqldb.jar"/>
         <classpathentry kind="lib" path="lib/jai_imageio.jar"/>
@@ -34 +30 @@
         <classpathentry kind="lib" path="lib/swing-layout.jar"/>
         <classpathentry kind="lib" path="lib/netcdf-4.0.jar"/>
+        <classpathentry kind="lib" path="lib/bufr-1.1.00.jar"/>
+        <classpathentry kind="lib" path="lib/grib-5.1.03.jar"/>
+        <classpathentry kind="lib" path="lib/slf4j-jdk14.jar"/>
+        <classpathentry kind="lib" path="lib/swingx-2007_09_16.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/importer/HistoryTable.java

@@ -516 +516 @@
                 if (oldDatasetID != datasetID)
                 {
-                    oldDatasetID = datasetID;
-                    datasetName = store.getDatasetName(rs.getLong("datasetID"));                    
+                    try 
+                    {
+                        oldDatasetID = datasetID;
+                        datasetName = store.getDatasetName(rs.getLong("datasetID")); 
+                    } catch (ome.conditions.InternalException e)
+                    {
+                        String message = "There was an error accessing one of the dataset/projects\n" +
+                                                 "you requested on the OMERO server. Your connection to the\n" +
+                                                 "server may have been severed, or your dataset/project may\n" +
+                                                 "have been deleted.";
+                        JOptionPane.showMessageDialog(this, message, "Unable to Complete Request", JOptionPane.WARNING_MESSAGE);
+                    }
                 }