summaryrefslogtreecommitdiffstats
path: root/idrop-swing
diff options
context:
space:
mode:
authorLisa Stillwell <lisa@renci.org>2012-11-27 16:54:26 (GMT)
committer Lisa Stillwell <lisa@renci.org>2012-11-27 16:54:26 (GMT)
commit946a41e2060eb7bbf55a34de100f05a7cccfa2fe (patch)
treee0c4c8b5014480629216b52c62374049d90688e6 /idrop-swing
parentd090ae25e66cde194bcea5f55267535afdc66a13 (diff)
downloadQCG-Data-946a41e2060eb7bbf55a34de100f05a7cccfa2fe.zip
QCG-Data-946a41e2060eb7bbf55a34de100f05a7cccfa2fe.tar.gz
QCG-Data-946a41e2060eb7bbf55a34de100f05a7cccfa2fe.tar.bz2
[#983] fixed Upload dialog get target path from last upload to check for user name, host, port, and zone
Diffstat (limited to 'idrop-swing')
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java
index eb0d765..1c15e43 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java
@@ -396,7 +396,12 @@ public class UploadDialog extends javax.swing.JDialog {
// assuming most recent first
for (LocalIRODSTransfer transfer: transfers) {
- if (transfer.getTransferType() == TransferType.PUT) {
+ // must check to match type, user, host, zone, & port
+ if ((transfer.getTransferType() == TransferType.PUT) &&
+ (transfer.getTransferUserName().equals(idropGUI.getiDropCore().getIrodsAccount().getUserName())) &&
+ (transfer.getTransferZone().equals(idropGUI.getiDropCore().getIrodsAccount().getZone())) &&
+ (transfer.getTransferPort() == idropGUI.getiDropCore().getIrodsAccount().getPort()) &&
+ (transfer.getTransferHost().equals(idropGUI.getiDropCore().getIrodsAccount().getHost()))) {
target = transfer.getIrodsAbsolutePath();
break;
}