Changeset 2307 for branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/importer/ImportHandler.java

Timestamp:

03/21/08 13:53:11 (9 months ago)

Author:

brain

Message:

closing out old tickets. Fixing a few bugs

Files:

• branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/importer/ImportHandler.java (modified) (4 diffs)

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

@@ -43 +43 @@
     private Thread runThread;
     HistoryDB db = null;
+    private ImportContainer[] fads = null;
 
     
@@ -60 +61 @@
             OMEROWrapper reader, ImportContainer[] fads)
     {
+        this.fads = fads;
         db = HistoryDB.getHistoryDB();
         
@@ -73 +75 @@
             this.store = store;
             this.qTable = qTable;
-            this.library = new ImportLibrary(store, reader, fads);
+            this.library = new ImportLibrary(store, reader);
             library.addObserver(qTable);
             library.addObserver(viewer);
@@ -119 +121 @@
         viewer.appendToOutputLn("> Starting import at: " + myDate + "\n");
         viewer.statusBar.setStatusIcon("gfx/import_icon_16.png", "Now importing.");
-        
-        ImportContainer[] fads = library.getFilesAndDatasets();
+
         qTable.importBtn.setText("Cancel");
         qTable.importing = true;