diff options
author | mconway <michael.c.conway@gmail.com> | 2013-05-30 11:35:43 (GMT) |
---|---|---|
committer | mconway <michael.c.conway@gmail.com> | 2013-05-30 11:35:43 (GMT) |
commit | 54876a7a242944b23ff9141d88eb905b738fdb8a (patch) | |
tree | 2b9f9447b53a6f5453e56b686995d86fa555e0fa | |
parent | f82a2a33f38a585cddf5ad4810818b25687b9711 (diff) | |
download | QCG-Data-54876a7a242944b23ff9141d88eb905b738fdb8a.zip QCG-Data-54876a7a242944b23ff9141d88eb905b738fdb8a.tar.gz QCG-Data-54876a7a242944b23ff9141d88eb905b738fdb8a.tar.bz2 |
[#1441] add diff view to idrop
4 files changed, 16 insertions, 9 deletions
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt index bc3a0b5..1c14b1d 100644 --- a/idrop-swing/release_notes.txt +++ b/idrop-swing/release_notes.txt @@ -27,9 +27,12 @@ Note that the following bug and feature requests are logged in GForge with relat *[#1092] add reconnect option to iDrop **Added preferences panel option and idrop.properties to set reconnect to 'true'. Emulates -T option for put/get -[#983] iDrop swing '2.0' development +*[#983] iDrop swing '2.0' development **Phase I of iDrop swing GUI redesign effort. This collaboration with iPlant is a GUI refactoring and redesign phase. +*[#1441] add diff view to idrop +**Added a tools menu and a diff view dialog to compare local and iRODS directories, viewing differences + ==Bug Fixes== * [#1093] Broken pipe error did not propogate in parallel transfer **Minor fixes to better propogate errors to queue manager 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 f1bf3d8..11dbb88 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 @@ -4,6 +4,7 @@ */ package org.irods.jargon.idrop.desktop.systraygui; +import javax.swing.ToolTipManager; import org.irods.jargon.datautils.tree.FileTreeModel; import org.irods.jargon.idrop.desktop.systraygui.viscomponents.DiffTreeCustomRenderer; import org.irods.jargon.idrop.desktop.systraygui.viscomponents.DiffViewData; @@ -146,6 +147,8 @@ public class DiffViewDialog extends javax.swing.JDialog { this.lblLocalAbsPath.setText(diffViewData.getLocalAbsolutePath()); DiffTreeCustomRenderer renderer = new DiffTreeCustomRenderer(); treeDiff.setCellRenderer(renderer); + ToolTipManager.sharedInstance().registerComponent(treeDiff); + } public DiffViewData getDiffViewData() { 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 5c3bd03..d7dec85 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="20130529-1121"; + public static String BUILD_TIME="20130530-0729"; } diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/DiffTreeCustomRenderer.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/DiffTreeCustomRenderer.java index 74f7378..66cbbf2 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/DiffTreeCustomRenderer.java +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/DiffTreeCustomRenderer.java @@ -24,16 +24,17 @@ public class DiffTreeCustomRenderer extends DefaultTreeCellRenderer { boolean leaf, int row, boolean hasFocus) { - // Allow the original renderer to set up the label - Component c = super.getTreeCellRendererComponent( - tree, value, selected, - expanded, leaf, row, - hasFocus); - + FileTreeNode fileTreeNode = (FileTreeNode) value; FileTreeDiffEntry diffEntry = (FileTreeDiffEntry) fileTreeNode.getUserObject(); StringBuilder sb = new StringBuilder(); sb.append(diffEntry.getCollectionAndDataObjectListingEntry().getNodeLabelDisplayValue()); + + // Allow the original renderer to set up the label + Component c = super.getTreeCellRendererComponent( + tree, value, selected, + expanded, diffEntry.getCollectionAndDataObjectListingEntry().isDataObject(), row, + hasFocus); if (diffEntry.isCountAsDiff()) { @@ -67,5 +68,5 @@ public class DiffTreeCustomRenderer extends DefaultTreeCellRenderer { return c; } private Color diffForeground = Color.RED; - private Color diffChildForeground = Color.CYAN; + private Color diffChildForeground = Color.BLUE; } |