diff options
author | mconway <michael.c.conway@gmail.com> | 2013-05-29 12:59:19 (GMT) |
---|---|---|
committer | mconway <michael.c.conway@gmail.com> | 2013-05-29 12:59:19 (GMT) |
commit | add5cc3b9b8286e6e1e561a60149a8363dda6bc6 (patch) | |
tree | e8bf7fd57178883e4deacc1770f3729123ba5e95 /idrop-swing | |
parent | 1637eae271099005fb9d7547ac75bbefc669b630 (diff) | |
download | QCG-Data-add5cc3b9b8286e6e1e561a60149a8363dda6bc6.zip QCG-Data-add5cc3b9b8286e6e1e561a60149a8363dda6bc6.tar.gz QCG-Data-add5cc3b9b8286e6e1e561a60149a8363dda6bc6.tar.bz2 |
[#1441] add diff view to idrop
Diffstat (limited to 'idrop-swing')
7 files changed, 262 insertions, 31 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 f53240c..715d52c 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 @@ -3,7 +3,17 @@ <Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> <Properties> <Property name="defaultCloseOperation" type="int" value="2"/> + <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="DiffViewDialog.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + <Property name="modal" type="boolean" value="true"/> + <Property name="name" type="java.lang.String" value="DiffViewDialog" noResource="true"/> </Properties> + <AccessibilityProperties> + <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="DiffViewDialog.AccessibleContext.accessibleDescription" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + </AccessibilityProperties> <SyntheticProperties> <SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="generateCenter" type="boolean" value="false"/> @@ -18,18 +28,131 @@ <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> + <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-50,0,0,2,-97"/> </AuxValues> - <Layout> - <DimensionLayout dim="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="400" max="32767" attributes="0"/> - </Group> - </DimensionLayout> - <DimensionLayout dim="1"> - <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="300" max="32767" attributes="0"/> - </Group> - </DimensionLayout> - </Layout> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Container class="javax.swing.JPanel" name="pnlTop"> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="North"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JLabel" name="lblDiffResult"> + <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.lblDiffResult.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </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="5" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="lblLocalAbsPathLabel"> + <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.lblLocalAbsPathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </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="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="5" 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="lblLocalAbsPath"> + <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.lblLocalAbsPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </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="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="lblIrodsPathLabel"> + <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.lblIrodsPathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </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="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="5" 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="lblIrodsPath"> + <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.lblIrodsPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </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="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> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="pnlCenter"> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout"> + <Property name="columns" type="int" value="0"/> + <Property name="rows" type="int" value="1"/> + </Layout> + <SubComponents> + <Container class="javax.swing.JScrollPane" name="scrollPaneDiff"> + <AuxValues> + <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> + <SubComponents> + <Component class="javax.swing.JTree" name="treeDiff"> + <Properties> + <Property name="model" type="javax.swing.tree.TreeModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> + <Connection code="this.getFileTreeModel()" type="code"/> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="pnlBottom"> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="South"/> + </Constraint> + </Constraints> + + <Layout> + <DimensionLayout dim="0"> + <Group type="103" groupAlignment="0" attributes="0"> + <EmptySpace min="0" pref="671" max="32767" attributes="0"/> + </Group> + </DimensionLayout> + <DimensionLayout dim="1"> + <Group type="103" groupAlignment="0" attributes="0"> + <EmptySpace min="0" pref="100" max="32767" attributes="0"/> + </Group> + </DimensionLayout> + </Layout> + </Container> + </SubComponents> </Form> 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 da836e5..11030d7 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,9 +4,10 @@ */ package org.irods.jargon.idrop.desktop.systraygui; +import org.irods.jargon.datautils.tree.FileTreeModel; import org.irods.jargon.idrop.desktop.systraygui.viscomponents.DiffViewData; import org.slf4j.LoggerFactory; - + /** * * @author Mike @@ -17,12 +18,15 @@ public class DiffViewDialog extends javax.swing.JDialog { private DiffViewData diffViewData; public static org.slf4j.Logger log = LoggerFactory .getLogger(ToolsDialog.class); + private final FileTreeModel fileTreeModel; public DiffViewDialog(final iDrop parent, final boolean modal, final DiffViewData diffViewData) { super(parent, modal); initComponents(); idropGui = parent; this.diffViewData = diffViewData; + this.fileTreeModel = diffViewData.getFileTreeModel(); + this.treeDiff.setModel(fileTreeModel); initialzeDiffView(); } @@ -34,30 +38,122 @@ public class DiffViewDialog extends javax.swing.JDialog { @SuppressWarnings("unchecked") // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents private void initComponents() { + java.awt.GridBagConstraints gridBagConstraints; + + pnlTop = new javax.swing.JPanel(); + lblDiffResult = new javax.swing.JLabel(); + lblLocalAbsPathLabel = new javax.swing.JLabel(); + lblLocalAbsPath = new javax.swing.JLabel(); + lblIrodsPathLabel = new javax.swing.JLabel(); + lblIrodsPath = new javax.swing.JLabel(); + pnlCenter = new javax.swing.JPanel(); + scrollPaneDiff = new javax.swing.JScrollPane(); + treeDiff = new javax.swing.JTree(); + pnlBottom = new javax.swing.JPanel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); + setTitle(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.title")); // NOI18N + setModal(true); + setName("DiffViewDialog"); // NOI18N + + pnlTop.setLayout(new java.awt.GridBagLayout()); + + lblDiffResult.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblDiffResult.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.ipady = 5; + pnlTop.add(lblDiffResult, gridBagConstraints); + + lblLocalAbsPathLabel.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblLocalAbsPathLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.ipady = 5; + gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END; + pnlTop.add(lblLocalAbsPathLabel, gridBagConstraints); + + lblLocalAbsPath.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblLocalAbsPath.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 1; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START; + pnlTop.add(lblLocalAbsPath, gridBagConstraints); + + lblIrodsPathLabel.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblIrodsPathLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.ipady = 5; + gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END; + pnlTop.add(lblIrodsPathLabel, gridBagConstraints); + + lblIrodsPath.setText(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.lblIrodsPath.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; + pnlTop.add(lblIrodsPath, gridBagConstraints); + + getContentPane().add(pnlTop, java.awt.BorderLayout.NORTH); + + pnlCenter.setLayout(new java.awt.GridLayout()); + + treeDiff.setModel(this.getFileTreeModel()); + scrollPaneDiff.setViewportView(treeDiff); - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 400, Short.MAX_VALUE) + pnlCenter.add(scrollPaneDiff); + + getContentPane().add(pnlCenter, java.awt.BorderLayout.CENTER); + + javax.swing.GroupLayout pnlBottomLayout = new javax.swing.GroupLayout(pnlBottom); + pnlBottom.setLayout(pnlBottomLayout); + pnlBottomLayout.setHorizontalGroup( + pnlBottomLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 671, Short.MAX_VALUE) ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 300, Short.MAX_VALUE) + pnlBottomLayout.setVerticalGroup( + pnlBottomLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 100, Short.MAX_VALUE) ); + getContentPane().add(pnlBottom, java.awt.BorderLayout.SOUTH); + + getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(DiffViewDialog.class, "DiffViewDialog.AccessibleContext.accessibleDescription")); // NOI18N + pack(); }// </editor-fold>//GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JLabel lblDiffResult; + private javax.swing.JLabel lblIrodsPath; + private javax.swing.JLabel lblIrodsPathLabel; + private javax.swing.JLabel lblLocalAbsPath; + private javax.swing.JLabel lblLocalAbsPathLabel; + private javax.swing.JPanel pnlBottom; + private javax.swing.JPanel pnlCenter; + private javax.swing.JPanel pnlTop; + private javax.swing.JScrollPane scrollPaneDiff; + private javax.swing.JTree treeDiff; // End of variables declaration//GEN-END:variables /** * Initialize the components for the diff view */ private void initialzeDiffView() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + this.lblIrodsPath.setText(diffViewData.getIrodsAbsolutePath()); + this.lblLocalAbsPath.setText(diffViewData.getLocalAbsolutePath()); + } + + public DiffViewData getDiffViewData() { + return diffViewData; + } + + public void setDiffViewData(DiffViewData diffViewData) { + this.diffViewData = diffViewData; + } + + public FileTreeModel getFileTreeModel() { + return this.fileTreeModel; } } diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ToolsDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ToolsDialog.java index a76adb5..1ef0b6a 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ToolsDialog.java +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ToolsDialog.java @@ -14,6 +14,7 @@ import org.irods.jargon.datautils.tree.FileTreeDiffUtilityImpl; import org.irods.jargon.datautils.tree.FileTreeModel; import org.irods.jargon.idrop.desktop.systraygui.services.IRODSFileService; import org.irods.jargon.idrop.desktop.systraygui.utils.MessageUtil; +import org.irods.jargon.idrop.desktop.systraygui.viscomponents.DiffViewData; import org.irods.jargon.idrop.desktop.systraygui.viscomponents.IRODSNode; import org.irods.jargon.idrop.desktop.systraygui.viscomponents.IRODSOutlineModel; import org.irods.jargon.idrop.desktop.systraygui.viscomponents.LocalFileNode; @@ -54,7 +55,6 @@ public class ToolsDialog extends javax.swing.JDialog { setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL); setName("ToolsDialog"); // NOI18N setResizable(false); - setType(java.awt.Window.Type.POPUP); getContentPane().setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT, 0, 0)); pnlButtons.setLayout(new java.awt.GridBagLayout()); @@ -155,6 +155,12 @@ public class ToolsDialog extends javax.swing.JDialog { try { FileTreeModel diffModel = fileTreeDiffUtility.generateDiffLocalToIRODS(localFile, irodsAbsPath, 0L, 0L); log.info("diffModel:{}", diffModel); + DiffViewData diffViewData = new DiffViewData(); + diffViewData.setFileTreeModel(diffModel); + diffViewData.setIrodsAbsolutePath(irodsAbsPath); + diffViewData.setLocalAbsolutePath(localAbsPath); + DiffViewDialog diffViewDialog = new DiffViewDialog(this.idropGui, true, diffViewData); + diffViewDialog.setVisible(true); } catch (JargonException ex) { log.error("Error generating diff", ex); MessageUtil.showError(this, "An error occurred generating the diff:\n" + ex.getMessage(), MessageUtil.ERROR_MESSAGE); diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form index 56f1ee4..64a9a4b 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form @@ -167,7 +167,7 @@ </Events> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="7" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="9" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -250,9 +250,7 @@ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> <Image iconType="3" name="/icon_editmetadata.png"/> </Property> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="null"/> - </Property> + <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarInfo.label" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> @@ -338,7 +336,7 @@ </Events> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="11" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="11" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" 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/iDrop.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java index 14ec96e..243dc6f 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java @@ -1456,7 +1456,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, } }); gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 7; + gridBagConstraints.gridx = 9; gridBagConstraints.gridy = 1; gridBagConstraints.ipadx = 2; pnlMainToolbarIcons.add(btnMainToolbarTools, gridBagConstraints); @@ -1506,7 +1506,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, pnlMainToolbarIcons.add(btnMainToolbarDelete, gridBagConstraints); btnMainToolbarInfo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_editmetadata.png"))); // NOI18N - btnMainToolbarInfo.setBorder(null); + btnMainToolbarInfo.setBorderPainted(false); btnMainToolbarInfo.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnMainToolbarInfo.setLabel(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarInfo.label")); // NOI18N btnMainToolbarInfo.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); @@ -1563,6 +1563,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, gridBagConstraints.gridx = 11; gridBagConstraints.gridy = 1; gridBagConstraints.ipadx = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START; pnlMainToolbarIcons.add(btnMainToolbarSettings, gridBagConstraints); btnMainToolbarSearchFiles.setIcon(new javax.swing.ImageIcon(getClass().getResource("/search_files.png"))); // NOI18N 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 fee1a38..1c0659c 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="20130528-1120"; + public static String BUILD_TIME="20130528-1330"; } 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 9083b49..b10c5ce 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 @@ -315,3 +315,10 @@ ToolsDialog.AccessibleContext.accessibleName=Tools Dialog ToolsDialog.AccessibleContext.accessibleDescription=Additional Tools ToolsDialog.btnToolbarDiff.toolTipText=Diff a local and an iRODS file or collection ToolsDialog.btnToolbarDiff.text=Diff +DiffViewDialog.title=iDrop - Diff View +DiffViewDialog.AccessibleContext.accessibleDescription=View the results of a diff between a local and an iRODS tree +DiffViewDialog.lblDiffResult.text=Diff Result View +DiffViewDialog.lblLocalAbsPathLabel.text=Local File: +DiffViewDialog.lblLocalAbsPath.text=localabspathtext +DiffViewDialog.lblIrodsPathLabel.text=IRODS File: +DiffViewDialog.lblIrodsPath.text=irodspathhere |