summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-05-31 15:11:34 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-05-31 15:11:34 (GMT)
commit379c8df2edec4547148d04ed068242b075dfb8eb (patch)
tree5672736475531076ca4d73a90d8cfadb38e4010b
parent4802d805a03ca6d4fa6c03a33d5e612a79cebe55 (diff)
downloadQCG-Data-379c8df2edec4547148d04ed068242b075dfb8eb.zip
QCG-Data-379c8df2edec4547148d04ed068242b075dfb8eb.tar.gz
QCG-Data-379c8df2edec4547148d04ed068242b075dfb8eb.tar.bz2
[#1441] actions from diff dialog
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.form69
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.java108
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties8
4 files changed, 147 insertions, 40 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.form
index 1f11302..4aa83fa 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DiffViewDialog.form
@@ -37,11 +37,6 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="pnlTop">
- <Properties>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="null"/>
- </Property>
- </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="North"/>
@@ -162,19 +157,19 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JLabel" name="lblSelectedPath">
+ <Component class="javax.swing.JLabel" name="lblLocalSelectedPath">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="DiffViewDialog.lblSelectedPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="DiffViewDialog.lblLocalSelectedPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="2" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -205,7 +200,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="3" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -217,7 +212,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="7" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -236,7 +231,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -255,7 +250,55 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblIrodsSelectedPathLabel">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="DiffViewDialog.lblIrodsSelectedPathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblIrodsSelectedPath">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="DiffViewDialog.lblIrodsSelectedPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="1" gridY="3" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblTypeLabel">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="DiffViewDialog.lblTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblType">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="DiffViewDialog.lblType.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
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 681fbc3..92bcd79 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
@@ -8,6 +8,8 @@ import java.awt.Color;
import javax.swing.ToolTipManager;
import javax.swing.tree.TreeSelectionModel;
import org.irods.jargon.core.exception.JargonException;
+import org.irods.jargon.core.utils.CollectionAndPath;
+import org.irods.jargon.core.utils.MiscIRODSUtils;
import org.irods.jargon.datautils.tree.FileTreeDiffEntry;
import org.irods.jargon.datautils.tree.FileTreeDiffEntry.DiffType;
import org.irods.jargon.datautils.tree.FileTreeModel;
@@ -45,9 +47,8 @@ public class DiffViewDialog extends javax.swing.JDialog {
}
/**
- * This method is called from within the constructor to initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is always
- * regenerated by the Form Editor.
+ * This method is called from within the constructor to initialize the form. WARNING: Do NOT
+ * modify this code. The content of this method is always regenerated by the Form Editor.
*/
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
@@ -65,12 +66,16 @@ public class DiffViewDialog extends javax.swing.JDialog {
treeDiff = new javax.swing.JTree();
pnlSelectionInfo = new javax.swing.JPanel();
lblSelectedPathLabel = new javax.swing.JLabel();
- lblSelectedPath = new javax.swing.JLabel();
+ lblLocalSelectedPath = new javax.swing.JLabel();
lblDescriptionOfDiffInfo = new javax.swing.JLabel();
btnResolve = new javax.swing.JButton();
lblSuggestedResolution = new javax.swing.JLabel();
btnResolveGet = new javax.swing.JButton();
btnResolvePut = new javax.swing.JButton();
+ lblIrodsSelectedPathLabel = new javax.swing.JLabel();
+ lblIrodsSelectedPath = new javax.swing.JLabel();
+ lblTypeLabel = new javax.swing.JLabel();
+ lblType = new javax.swing.JLabel();
pnlBottom = new javax.swing.JPanel();
pnlUploadDownloadButtons = new javax.swing.JPanel();
btnOK = new javax.swing.JButton();
@@ -81,7 +86,6 @@ public class DiffViewDialog extends javax.swing.JDialog {
setName("DiffViewDialog"); // NOI18N
setPreferredSize(new java.awt.Dimension(800, 600));
- pnlTop.setPreferredSize(null);
pnlTop.setLayout(new java.awt.GridBagLayout());
lblDiffResult.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblDiffResult.text")); // NOI18N
@@ -139,14 +143,19 @@ public class DiffViewDialog extends javax.swing.JDialog {
lblSelectedPathLabel.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblSelectedPathLabel.text")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.insets = new java.awt.Insets(3, 0, 3, 0);
pnlSelectionInfo.add(lblSelectedPathLabel, gridBagConstraints);
- lblSelectedPath.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblSelectedPath.text")); // NOI18N
+ lblLocalSelectedPath.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblLocalSelectedPath.text")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 2;
+ gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
- pnlSelectionInfo.add(lblSelectedPath, gridBagConstraints);
+ pnlSelectionInfo.add(lblLocalSelectedPath, gridBagConstraints);
lblDescriptionOfDiffInfo.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblDescriptionOfDiffInfo.text")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -167,15 +176,16 @@ public class DiffViewDialog extends javax.swing.JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.gridheight = 3;
+ gridBagConstraints.gridy = 5;
gridBagConstraints.insets = new java.awt.Insets(3, 0, 3, 0);
pnlSelectionInfo.add(btnResolve, gridBagConstraints);
lblSuggestedResolution.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblSuggestedResolution.text")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
+ gridBagConstraints.gridy = 7;
+ gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
gridBagConstraints.insets = new java.awt.Insets(3, 0, 3, 0);
pnlSelectionInfo.add(lblSuggestedResolution, gridBagConstraints);
@@ -189,7 +199,7 @@ public class DiffViewDialog extends javax.swing.JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 5;
+ gridBagConstraints.gridy = 6;
gridBagConstraints.insets = new java.awt.Insets(3, 0, 3, 0);
pnlSelectionInfo.add(btnResolveGet, gridBagConstraints);
@@ -203,15 +213,45 @@ public class DiffViewDialog extends javax.swing.JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 5;
+ gridBagConstraints.gridy = 6;
gridBagConstraints.insets = new java.awt.Insets(3, 0, 3, 0);
pnlSelectionInfo.add(btnResolvePut, gridBagConstraints);
+ lblIrodsSelectedPathLabel.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblIrodsSelectedPathLabel.text")); // NOI18N
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ gridBagConstraints.insets = new java.awt.Insets(3, 0, 3, 0);
+ pnlSelectionInfo.add(lblIrodsSelectedPathLabel, gridBagConstraints);
+
+ lblIrodsSelectedPath.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblIrodsSelectedPath.text")); // NOI18N
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 3;
+ gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
+ pnlSelectionInfo.add(lblIrodsSelectedPath, gridBagConstraints);
+
+ lblTypeLabel.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblTypeLabel.text")); // NOI18N
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ pnlSelectionInfo.add(lblTypeLabel, gridBagConstraints);
+
+ lblType.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblType.text")); // NOI18N
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
+ pnlSelectionInfo.add(lblType, gridBagConstraints);
+
pnlCenter.add(pnlSelectionInfo, java.awt.BorderLayout.SOUTH);
getContentPane().add(pnlCenter, java.awt.BorderLayout.CENTER);
- pnlBottom.setLayout(new java.awt.GridLayout());
+ pnlBottom.setLayout(new java.awt.GridLayout(1, 0));
pnlUploadDownloadButtons.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT));
@@ -272,23 +312,28 @@ public class DiffViewDialog extends javax.swing.JDialog {
if (entry.getDiffType() == DiffType.LEFT_HAND_PLUS) {
log.info("schedule a put");
- try {
+
+ // the diff shows the full computed path, you want to use the parent name for the target so that /x/y doesnt get put to x/y/y
+ CollectionAndPath collectionAndPath = MiscIRODSUtils.separateCollectionAndPathFromGivenAbsolutePath(entry.getAbsPathOppositeFile());
+
+
+ try {
idropGui.getiDropCore()
.getTransferManager()
.enqueueAPut(
entry.getCollectionAndDataObjectListingEntry().getFormattedAbsolutePath(),
- entry.getAbsPathOppositeFile(),
+ collectionAndPath.getCollectionParent(),
idropGui.getIrodsAccount().getDefaultStorageResource(),
idropGui.getIrodsAccount());
} catch (JargonException ex) {
- log.error("error checking is strict, warn and set to false");
- MessageUtil
- .showWarning(
- this,
- ex.getMessage(),
- "");
+ log.error("error checking is strict, warn and set to false");
+ MessageUtil
+ .showWarning(
+ this,
+ ex.getMessage(),
+ "");
}
-
+
}
@@ -302,11 +347,15 @@ public class DiffViewDialog extends javax.swing.JDialog {
private javax.swing.JLabel lblDiffResult;
private javax.swing.JLabel lblIrodsPath;
private javax.swing.JLabel lblIrodsPathLabel;
+ private javax.swing.JLabel lblIrodsSelectedPath;
+ private javax.swing.JLabel lblIrodsSelectedPathLabel;
private javax.swing.JLabel lblLocalAbsPath;
private javax.swing.JLabel lblLocalAbsPathLabel;
- private javax.swing.JLabel lblSelectedPath;
+ private javax.swing.JLabel lblLocalSelectedPath;
private javax.swing.JLabel lblSelectedPathLabel;
private javax.swing.JLabel lblSuggestedResolution;
+ private javax.swing.JLabel lblType;
+ private javax.swing.JLabel lblTypeLabel;
private javax.swing.JPanel pnlBottom;
private javax.swing.JPanel pnlCenter;
private javax.swing.JPanel pnlSelectionInfo;
@@ -346,7 +395,7 @@ public class DiffViewDialog extends javax.swing.JDialog {
return;
}
- lblSelectedPath.setText(diffEntry.getCollectionAndDataObjectListingEntry().getFormattedAbsolutePath());
+ lblType.setText(diffEntry.getCollectionAndDataObjectListingEntry().getObjectType().name());
StringBuilder sb = new StringBuilder();
if (diffEntry.getDiffType() == DiffType.DIRECTORY_NO_DIFF) {
@@ -364,6 +413,9 @@ public class DiffViewDialog extends javax.swing.JDialog {
btnResolvePut.setVisible(false);
lblSuggestedResolution.setText("");
lblDescriptionOfDiffInfo.setText(sb.toString());
+ lblLocalSelectedPath.setText(diffEntry.getCollectionAndDataObjectListingEntry().getFormattedAbsolutePath());
+ lblIrodsSelectedPath.setText(diffEntry.getAbsPathOppositeFile());
+
} else if (diffEntry.getDiffType() == DiffType.FILE_NAME_DIR_NAME_COLLISION) {
lblDescriptionOfDiffInfo.setForeground(Color.RED);
lblDescriptionOfDiffInfo.setText("A data object name collided with a collection name");
@@ -371,6 +423,8 @@ public class DiffViewDialog extends javax.swing.JDialog {
btnResolve.setVisible(false);
btnResolveGet.setVisible(false);
btnResolvePut.setVisible(false);
+ lblLocalSelectedPath.setText(diffEntry.getCollectionAndDataObjectListingEntry().getFormattedAbsolutePath());
+ lblIrodsSelectedPath.setText(diffEntry.getAbsPathOppositeFile());
} else if (diffEntry.getDiffType() == DiffType.FILE_OUT_OF_SYNCH) {
lblDescriptionOfDiffInfo.setForeground(Color.RED);
lblDescriptionOfDiffInfo.setText("A file is out of synch");
@@ -385,6 +439,8 @@ public class DiffViewDialog extends javax.swing.JDialog {
btnResolve.setVisible(true);
btnResolveGet.setVisible(false);
btnResolvePut.setVisible(false);
+ lblLocalSelectedPath.setText(diffEntry.getCollectionAndDataObjectListingEntry().getFormattedAbsolutePath());
+ lblIrodsSelectedPath.setText(diffEntry.getAbsPathOppositeFile());
} else if (diffEntry.getDiffType() == DiffType.RIGHT_HAND_PLUS) {
lblDescriptionOfDiffInfo.setForeground(Color.RED);
lblDescriptionOfDiffInfo.setText("The iRODS file or collection does not exist in the local directory");
@@ -392,6 +448,8 @@ public class DiffViewDialog extends javax.swing.JDialog {
btnResolve.setVisible(true);
btnResolveGet.setVisible(false);
btnResolvePut.setVisible(false);
+ lblLocalSelectedPath.setText(diffEntry.getCollectionAndDataObjectListingEntry().getFormattedAbsolutePath());
+ lblIrodsSelectedPath.setText(diffEntry.getAbsPathOppositeFile());
} else {
lblDescriptionOfDiffInfo.setForeground(Color.RED);
lblDescriptionOfDiffInfo.setText(diffEntry.getDiffType().toString());
@@ -399,6 +457,8 @@ public class DiffViewDialog extends javax.swing.JDialog {
btnResolve.setVisible(false);
btnResolveGet.setVisible(false);
btnResolvePut.setVisible(false);
+ lblLocalSelectedPath.setText(diffEntry.getCollectionAndDataObjectListingEntry().getFormattedAbsolutePath());
+ lblIrodsSelectedPath.setText(diffEntry.getAbsPathOppositeFile());
}
}
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 627e063..79524d2 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-1645";
+ public static String BUILD_TIME="20130531-1101";
}
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
index 7d60b23..2f78ea9 100644
--- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
@@ -324,8 +324,7 @@ DiffViewDialog.lblIrodsPathLabel.text=IRODS File:
DiffViewDialog.lblIrodsPath.text=irodspathhere
DiffViewDialog.btnOK.text=OK
DiffViewDialog.btnOK.toolTipText=Dismiss the dialog
-DiffViewDialog.lblSelectedPathLabel.text=Selected Path:
-DiffViewDialog.lblSelectedPath.text=
+DiffViewDialog.lblSelectedPathLabel.text=Local Path:
DiffViewDialog.lblDescriptionOfDiffInfo.text=
DiffViewDialog.btnResolve.text=Resolve
DiffViewDialog.btnResolve.toolTipText=Do a put or get as appropriate to resolve the diff
@@ -334,3 +333,8 @@ DiffViewDialog.btnResolveGet.text=Resolve <<<
DiffViewDialog.btnResolveGet.toolTipText=Resolve by downloading and replacing a file
DiffViewDialog.btnResolvePut.toolTipText=Resolve by uploading and replacing a file
DiffViewDialog.btnResolvePut.text=Resolve >>>
+DiffViewDialog.lblLocalSelectedPath.text=
+DiffViewDialog.lblIrodsSelectedPathLabel.text=iRODS Path:
+DiffViewDialog.lblIrodsSelectedPath.text=
+DiffViewDialog.lblTypeLabel.text=Type:
+DiffViewDialog.lblType.text=