summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael_conway@unc.edu>2013-05-30 20:58:37 (GMT)
committer mconway <michael_conway@unc.edu>2013-05-30 20:58:37 (GMT)
commit4802d805a03ca6d4fa6c03a33d5e612a79cebe55 (patch)
tree1d2a91d257342ff1c0a83b42200971a63999bc7b
parentde6443aa3366afa36ba4d79723949e9434686672 (diff)
downloadQCG-Data-4802d805a03ca6d4fa6c03a33d5e612a79cebe55.zip
QCG-Data-4802d805a03ca6d4fa6c03a33d5e612a79cebe55.tar.gz
QCG-Data-4802d805a03ca6d4fa6c03a33d5e612a79cebe55.tar.bz2
[#1441] add diff view to idrop
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.java20
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
2 files changed, 15 insertions, 7 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 2e01542..681fbc3 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
@@ -12,9 +12,11 @@ import org.irods.jargon.datautils.tree.FileTreeDiffEntry;
import org.irods.jargon.datautils.tree.FileTreeDiffEntry.DiffType;
import org.irods.jargon.datautils.tree.FileTreeModel;
import org.irods.jargon.datautils.tree.FileTreeNode;
+import org.irods.jargon.idrop.desktop.systraygui.utils.MessageUtil;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.DiffTreeCustomRenderer;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.DiffViewData;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.LocalFileTree;
+import org.openide.util.Exceptions;
import org.slf4j.LoggerFactory;
/**
@@ -270,17 +272,23 @@ public class DiffViewDialog extends javax.swing.JDialog {
if (entry.getDiffType() == DiffType.LEFT_HAND_PLUS) {
log.info("schedule a put");
-
+ try {
idropGui.getiDropCore()
.getTransferManager()
.enqueueAPut(
- entry.getCollectionAndDataObjectListingEntry(),
- "",
+ entry.getCollectionAndDataObjectListingEntry().getFormattedAbsolutePath(),
+ entry.getAbsPathOppositeFile(),
idropGui.getIrodsAccount().getDefaultStorageResource(),
idropGui.getIrodsAccount());
-
-
-
+ } catch (JargonException ex) {
+ log.error("error checking is strict, warn and set to false");
+ MessageUtil
+ .showWarning(
+ this,
+ ex.getMessage(),
+ "");
+ }
+
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index d82f434..627e063 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.desktop.systraygui.utils;
public final class Version {
public static String VERSION="2.0.1-SNAPSHOT";
- public static String BUILD_TIME="20130530-1053";
+ public static String BUILD_TIME="20130530-1645";
}