Changeset 10555

Timestamp:

2005-08-24T15:11:34+12:00 (19 years ago)

Author:

mdewsnip

Message:

Opening files in an external program is now done in a separate thread, so the progress bar works when using a remote Greenstone server.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -143 +143 @@
 
 
-    public void openFileInExternalApplication(File file)
-    {
-    // If we're using a remote Greenstone server, we need to download the file before viewing it...
-    if (Gatherer.isGsdlRemote) {
-        // ... but only if it is inside the collection and we haven't already downloaded it
-        if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
-        RemoteGreenstoneServer.downloadCollectionFile(Gatherer.c_man.getCollection().getName(), file);
-        }
-    }
-
-    Gatherer.spawnApplication(file);
-    }
-
-
     private class FileTask
     extends Thread
@@ -197 +183 @@
         progress_bar.setIndeterminate(false);
         progress_bar.clear();
+    }
+    }
+
+
+    public void openFileInExternalApplication(File file)
+    {
+    // This must go in a separate thread because we need the progress bar to work (remote Greenstone server)
+    new OpenFileInExternalApplicationTask(file).start();
+    }
+
+
+    private class OpenFileInExternalApplicationTask
+    extends Thread
+    {
+    private File file = null;
+
+    public OpenFileInExternalApplicationTask(File file)
+    {
+        this.file = file;
+    }
+
+    public void run()
+    {
+        // If we're using a remote Greenstone server, we need to download the file before viewing it...
+        if (Gatherer.isGsdlRemote) {
+        // ... but only if it is inside the collection and we haven't already downloaded it
+        if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
+            RemoteGreenstoneServer.downloadCollectionFile(Gatherer.c_man.getCollection().getName(), file);
+        }
+        }
+
+        // View the file in an external application
+        Gatherer.spawnApplication(file);
     }
     }