From 72bc500b615cd421f81a40b798e5007db76efd8a Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Tue, 3 Apr 2007 09:18:30 +0000
Subject: [PATCH] fix for save all entries
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@5859 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../artemis/util/RemoteFileDocument.java | 33 ++++++++-----------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/uk/ac/sanger/artemis/util/RemoteFileDocument.java b/uk/ac/sanger/artemis/util/RemoteFileDocument.java
index e8a516516..e619c3ade 100644
--- a/uk/ac/sanger/artemis/util/RemoteFileDocument.java
+++ b/uk/ac/sanger/artemis/util/RemoteFileDocument.java
@@ -27,7 +27,6 @@ package uk.ac.sanger.artemis.util;
import java.io.*;
import javax.swing.JOptionPane;
import uk.ac.sanger.artemis.components.filetree.*;
-import uk.ac.sanger.artemis.components.SwingWorker;
import uk.ac.sanger.artemis.j2ssh.FileTransferProgressMonitor;
import uk.ac.sanger.artemis.j2ssh.FTProgress;
@@ -167,27 +166,21 @@ public class RemoteFileDocument extends Document
*/
public void saveEntry(final File local_file)
{
- SwingWorker putWorker = new SwingWorker()
+ FileTransferProgressMonitor monitor = null;
+ try
{
- FileTransferProgressMonitor monitor;
- public Object construct()
- {
- monitor = new FileTransferProgressMonitor(null);
- FTProgress progress = monitor.add(local_file.getName());
-
- getRemoteFileNode().put(local_file, progress);
- getRemoteFileNode().stat();
+ monitor = new FileTransferProgressMonitor(null);
+ FTProgress progress = monitor.add(local_file.getName());
+
+ getRemoteFileNode().put(local_file, progress);
+ getRemoteFileNode().stat();
+ monitor.close();
+ }
+ finally
+ {
+ if(monitor != null)
monitor.close();
- return null;
- }
-
- public void finished()
- {
- if(monitor != null)
- monitor.close();
- }
- };
- putWorker.start();
+ }
}
/**
--
GitLab