summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-05-30 18:52:54 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-05-30 18:52:54 (GMT)
commitde6443aa3366afa36ba4d79723949e9434686672 (patch)
tree760241aa35aabc43f9670d64b2663498fd09936b
parent4134fd60976672104c6d9f1f42cad55fad3b3bd6 (diff)
downloadQCG-Data-de6443aa3366afa36ba4d79723949e9434686672.zip
QCG-Data-de6443aa3366afa36ba4d79723949e9434686672.tar.gz
QCG-Data-de6443aa3366afa36ba4d79723949e9434686672.tar.bz2
[#1441] actions from diff dialog
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.java19
1 files changed, 5 insertions, 14 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.java
index 7ff8f78..2e01542 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.java
@@ -267,31 +267,22 @@ public class DiffViewDialog extends javax.swing.JDialog {
FileTreeDiffEntry entry = (FileTreeDiffEntry) node.getUserObject();
log.info("entry:{}", entry);
-/*
+
if (entry.getDiffType() == DiffType.LEFT_HAND_PLUS) {
log.info("schedule a put");
- try {
+
idropGui.getiDropCore()
.getTransferManager()
.enqueueAPut(
entry.getCollectionAndDataObjectListingEntry(),
- targetIrodsFileAbsolutePath,
- idropGui.getIrodsAccount().getd,
+ "",
+ idropGui.getIrodsAccount().getDefaultStorageResource(),
idropGui.getIrodsAccount());
- } catch (JargonException ex) {
- java.util.logging.Logger.getLogger(
- LocalFileTree.class.getName()).log(
- java.util.logging.Level.SEVERE, null, ex);
- idropGui.showIdropException(ex);
- }
-
+
}
-*/
-
-
}//GEN-LAST:event_btnResolveActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables