summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form51
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java333
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java11
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form35
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java170
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTreeTransferHandler.java12
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/InfoPanelTransferHandler.java6
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
8 files changed, 310 insertions, 312 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
index 6c022a9..3017524 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
@@ -37,17 +37,20 @@
</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="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="txtHost">
<Properties>
<Property name="columns" type="int" value="30"/>
+ <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.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="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -57,7 +60,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="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -65,10 +68,14 @@
<Properties>
<Property name="columns" type="int" value="8"/>
<Property name="text" type="java.lang.String" value="1247"/>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="null"/>
+ </Property>
+ <Property name="requestFocusEnabled" type="boolean" value="false"/>
</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="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -78,17 +85,21 @@
</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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="2" 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.JTextField" name="txtZone">
<Properties>
<Property name="columns" type="int" value="30"/>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="null"/>
+ </Property>
+ <Property name="requestFocusEnabled" type="boolean" value="false"/>
</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="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -98,7 +109,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="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="3" 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>
@@ -108,7 +119,7 @@
</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="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -118,17 +129,20 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="4" 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.JTextField" name="txtUserName">
<Properties>
<Property name="columns" type="int" value="30"/>
+ <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.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -138,17 +152,20 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="5" 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.JPasswordField" name="password">
<Properties>
<Property name="columns" type="int" value="30"/>
+ <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.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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -168,8 +185,11 @@
<SubComponents>
<Component class="javax.swing.JButton" name="btnOK">
<Properties>
- <Property name="mnemonic" type="int" value="111"/>
- <Property name="text" type="java.lang.String" value="OK"/>
+ <Property name="mnemonic" type="int" value="76"/>
+ <Property name="text" type="java.lang.String" value="Login"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 100]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnOKActionPerformed"/>
@@ -179,6 +199,9 @@
<Properties>
<Property name="mnemonic" type="int" value="99"/>
<Property name="text" type="java.lang.String" value="Cancel"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 100]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCancelActionPerformed"/>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
index 01cbcec..3230105 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
@@ -235,133 +235,157 @@ public class LoginDialog extends JDialog {
*/
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed"
- // desc="Generated Code">//GEN-BEGIN:initComponents
- private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
-
- pnlLoginInfo = new javax.swing.JPanel();
- lblHost = new javax.swing.JLabel();
- txtHost = new javax.swing.JTextField();
- lblPort = new javax.swing.JLabel();
- txtPort = new javax.swing.JTextField();
- lblZone = new javax.swing.JLabel();
- txtZone = new javax.swing.JTextField();
- lblResource = new javax.swing.JLabel();
- txtResource = new javax.swing.JTextField();
- lblUserName = new javax.swing.JLabel();
- txtUserName = new javax.swing.JTextField();
- lblPassword = new javax.swing.JLabel();
- password = new javax.swing.JPasswordField();
- pnlToolbar = new javax.swing.JPanel();
- btnOK = new javax.swing.JButton();
- btnCancel = new javax.swing.JButton();
- lblLogin = new javax.swing.JLabel();
-
- setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-
- pnlLoginInfo.setLayout(new java.awt.GridBagLayout());
-
- lblHost.setText("Host:");
- pnlLoginInfo.add(lblHost, new java.awt.GridBagConstraints());
-
- txtHost.setColumns(30);
- pnlLoginInfo.add(txtHost, new java.awt.GridBagConstraints());
-
- lblPort.setText("Port:");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- pnlLoginInfo.add(lblPort, gridBagConstraints);
-
- txtPort.setColumns(8);
- txtPort.setText("1247");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- pnlLoginInfo.add(txtPort, gridBagConstraints);
-
- lblZone.setText("Zone:");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
- pnlLoginInfo.add(lblZone, gridBagConstraints);
-
- txtZone.setColumns(30);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 2;
- pnlLoginInfo.add(txtZone, gridBagConstraints);
-
- lblResource.setText("Resource:");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 3;
- pnlLoginInfo.add(lblResource, gridBagConstraints);
-
- txtResource.setColumns(30);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 3;
- pnlLoginInfo.add(txtResource, gridBagConstraints);
-
- lblUserName.setText("User Name:");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 4;
- pnlLoginInfo.add(lblUserName, gridBagConstraints);
-
- txtUserName.setColumns(30);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 4;
- pnlLoginInfo.add(txtUserName, gridBagConstraints);
-
- lblPassword.setText("Password:");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 5;
- pnlLoginInfo.add(lblPassword, gridBagConstraints);
-
- password.setColumns(30);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 5;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- pnlLoginInfo.add(password, gridBagConstraints);
-
- this.getContentPane().add(pnlLoginInfo, java.awt.BorderLayout.CENTER);
-
- pnlToolbar.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT,
- 2, 5));
-
- btnOK.setMnemonic('o');
- btnOK.setText("OK");
- btnOK.addActionListener(new java.awt.event.ActionListener() {
- @Override
- public void actionPerformed(final java.awt.event.ActionEvent evt) {
- btnOKActionPerformed(evt);
- }
- });
- pnlToolbar.add(btnOK);
-
- btnCancel.setMnemonic('c');
- btnCancel.setText("Cancel");
- btnCancel.addActionListener(new java.awt.event.ActionListener() {
- @Override
- public void actionPerformed(final java.awt.event.ActionEvent evt) {
- btnCancelActionPerformed(evt);
- }
- });
- pnlToolbar.add(btnCancel);
-
- this.getContentPane().add(pnlToolbar, java.awt.BorderLayout.SOUTH);
-
- lblLogin.setText("Please log in to your iDrop data grid");
- this.getContentPane().add(lblLogin, java.awt.BorderLayout.PAGE_START);
-
- pack();
- }// </editor-fold>//GEN-END:initComponents
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+ private void initComponents() {
+ java.awt.GridBagConstraints gridBagConstraints;
+
+ pnlLoginInfo = new javax.swing.JPanel();
+ lblHost = new javax.swing.JLabel();
+ txtHost = new javax.swing.JTextField();
+ lblPort = new javax.swing.JLabel();
+ txtPort = new javax.swing.JTextField();
+ lblZone = new javax.swing.JLabel();
+ txtZone = new javax.swing.JTextField();
+ lblResource = new javax.swing.JLabel();
+ txtResource = new javax.swing.JTextField();
+ lblUserName = new javax.swing.JLabel();
+ txtUserName = new javax.swing.JTextField();
+ lblPassword = new javax.swing.JLabel();
+ password = new javax.swing.JPasswordField();
+ pnlToolbar = new javax.swing.JPanel();
+ btnOK = new javax.swing.JButton();
+ btnCancel = new javax.swing.JButton();
+ lblLogin = new javax.swing.JLabel();
+
+ setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+ pnlLoginInfo.setLayout(new java.awt.GridBagLayout());
+
+ lblHost.setText("Host:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
+ pnlLoginInfo.add(lblHost, gridBagConstraints);
+
+ txtHost.setColumns(30);
+ txtHost.setPreferredSize(null);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ pnlLoginInfo.add(txtHost, gridBagConstraints);
+
+ lblPort.setText("Port:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
+ pnlLoginInfo.add(lblPort, gridBagConstraints);
+
+ txtPort.setColumns(8);
+ txtPort.setText("1247");
+ txtPort.setPreferredSize(null);
+ txtPort.setRequestFocusEnabled(false);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ pnlLoginInfo.add(txtPort, gridBagConstraints);
+
+ lblZone.setText("Zone:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 2;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ pnlLoginInfo.add(lblZone, gridBagConstraints);
+
+ txtZone.setColumns(30);
+ txtZone.setPreferredSize(null);
+ txtZone.setRequestFocusEnabled(false);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 2;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ pnlLoginInfo.add(txtZone, gridBagConstraints);
+
+ lblResource.setText("Resource:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ pnlLoginInfo.add(lblResource, gridBagConstraints);
+
+ txtResource.setColumns(30);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 3;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ pnlLoginInfo.add(txtResource, gridBagConstraints);
+
+ lblUserName.setText("User Name:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 4;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ pnlLoginInfo.add(lblUserName, gridBagConstraints);
+
+ txtUserName.setColumns(30);
+ txtUserName.setPreferredSize(null);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 4;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ pnlLoginInfo.add(txtUserName, gridBagConstraints);
+
+ lblPassword.setText("Password:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 5;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ pnlLoginInfo.add(lblPassword, gridBagConstraints);
+
+ password.setColumns(30);
+ password.setPreferredSize(null);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 5;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ pnlLoginInfo.add(password, gridBagConstraints);
+
+ getContentPane().add(pnlLoginInfo, java.awt.BorderLayout.CENTER);
+
+ pnlToolbar.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT, 2, 5));
+
+ btnOK.setMnemonic('L');
+ btnOK.setText("Login");
+ btnOK.setMaximumSize(new java.awt.Dimension(100, 100));
+ btnOK.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnOKActionPerformed(evt);
+ }
+ });
+ pnlToolbar.add(btnOK);
+
+ btnCancel.setMnemonic('c');
+ btnCancel.setText("Cancel");
+ btnCancel.setMaximumSize(new java.awt.Dimension(100, 100));
+ btnCancel.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnCancelActionPerformed(evt);
+ }
+ });
+ pnlToolbar.add(btnCancel);
+
+ getContentPane().add(pnlToolbar, java.awt.BorderLayout.SOUTH);
+
+ lblLogin.setText("Please log in to your iDrop data grid");
+ getContentPane().add(lblLogin, java.awt.BorderLayout.PAGE_START);
+
+ pack();
+ }// </editor-fold>//GEN-END:initComponents
private void btnOKActionPerformed(final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnOKActionPerformed
processLogin();
@@ -370,40 +394,23 @@ public class LoginDialog extends JDialog {
private void btnCancelActionPerformed(final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnCancelActionPerformed
System.exit(0);
}// GEN-LAST:event_btnCancelActionPerformed
- // Variables declaration - do not modify//GEN-BEGIN:variables
-
- private javax.swing.JButton btnCancel;
-
- private javax.swing.JButton btnOK;
-
- private javax.swing.JLabel lblHost;
-
- private javax.swing.JLabel lblLogin;
-
- private javax.swing.JLabel lblPassword;
-
- private javax.swing.JLabel lblPort;
-
- private javax.swing.JLabel lblResource;
-
- private javax.swing.JLabel lblUserName;
-
- private javax.swing.JLabel lblZone;
-
- private javax.swing.JPasswordField password;
-
- private javax.swing.JPanel pnlLoginInfo;
-
- private javax.swing.JPanel pnlToolbar;
-
- private javax.swing.JTextField txtHost;
-
- private javax.swing.JTextField txtPort;
-
- private javax.swing.JTextField txtResource;
-
- private javax.swing.JTextField txtUserName;
-
- private javax.swing.JTextField txtZone;
- // End of variables declaration//GEN-END:variables
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton btnCancel;
+ private javax.swing.JButton btnOK;
+ private javax.swing.JLabel lblHost;
+ private javax.swing.JLabel lblLogin;
+ private javax.swing.JLabel lblPassword;
+ private javax.swing.JLabel lblPort;
+ private javax.swing.JLabel lblResource;
+ private javax.swing.JLabel lblUserName;
+ private javax.swing.JLabel lblZone;
+ private javax.swing.JPasswordField password;
+ private javax.swing.JPanel pnlLoginInfo;
+ private javax.swing.JPanel pnlToolbar;
+ private javax.swing.JTextField txtHost;
+ private javax.swing.JTextField txtPort;
+ private javax.swing.JTextField txtResource;
+ private javax.swing.JTextField txtUserName;
+ private javax.swing.JTextField txtZone;
+ // End of variables declaration//GEN-END:variables
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java
index cbd3caf..b232989 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java
@@ -148,11 +148,12 @@ public class StartupSequencer {
int y = (tk.getScreenSize().height - loginDialog.getHeight()) / 2;
loginDialog.setLocation(x, y);
- loginDialog.setAlwaysOnTop(true);
+ //loginDialog.setAlwaysOnTop(true);
+
- loginDialog.setVisible(true);
- loginDialog.toFront();
idropSplashWindow.toBack();
+ loginDialog.toFront();
+ loginDialog.setVisible(true);
if (idropCore.getIrodsAccount() == null) {
log.warn("no login account, exiting");
@@ -170,7 +171,7 @@ public class StartupSequencer {
idropSplashWindow.setStatus("Building transfer engine...", ++count);
log.info("building transfer manager...");
- // FIXME:rework engine config (into idrop core?) and allow changes while idrop is running
+ // FIXME:rework engine config (into idrop core?) and allow changes while idrop is running
try {
TransferOptions transferOptions = idropCore.getIrodsFileSystem().getIrodsSession().buildTransferOptionsBasedOnJargonProperties();
transferOptions.setComputeAndVerifyChecksumAfterTransfer(idropCore.getIdropConfig().isVerifyChecksum());
@@ -326,7 +327,7 @@ public class StartupSequencer {
idrop.setVisible(false);
SetupWizard setupWizard = new SetupWizard(idrop, true);
setupWizard.toFront();
- final Toolkit toolkit = Toolkit.getDefaultToolkit();
+ final Toolkit toolkit = Toolkit.getDefaultToolkit();
final Dimension screenSize = toolkit.getScreenSize();
final int x = (screenSize.width - setupWizard.getWidth()) / 2;
final int y = (screenSize.height - setupWizard.getHeight()) / 2;
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 e6c5a5c..d3b806d 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
@@ -856,12 +856,12 @@
</Border>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[100, 100]"/>
+ <Dimension value="[100, 50]"/>
</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="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.8" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
@@ -889,7 +889,7 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
- <Component class="javax.swing.JLabel" name="lblFileParent">
+ <Component class="javax.swing.JLabel" name="lblFileParentLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Parent path of file:"/>
</Properties>
@@ -902,36 +902,19 @@
</Constraint>
</Constraints>
</Component>
- <Container class="javax.swing.JScrollPane" name="scrollParentPath">
+ <Component class="javax.swing.JLabel" name="lblFileParent">
<Properties>
+ <Property name="text" type="java.lang.String" value=" "/>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[100, 100]"/>
+ <Dimension value="[80, 30]"/>
</Property>
</Properties>
- <AuxValues>
- <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
- </AuxValues>
<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.support.JScrollPaneSupportLayout"/>
- <SubComponents>
- <Component class="javax.swing.JTextArea" name="txtParentPath">
- <Properties>
- <Property name="editable" type="boolean" value="false"/>
- <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="null"/>
- </Property>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[600, 100]"/>
- </Property>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
+ </Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="pnlInfoComment">
@@ -1148,7 +1131,7 @@
<Container class="javax.swing.JPanel" name="pnlToolbarInfo">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[300, 200]"/>
+ <Dimension value="null"/>
</Property>
</Properties>
<Constraints>
@@ -1249,7 +1232,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="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0050" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.005" 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 6d3e4bc..ddc9155 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
@@ -291,7 +291,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
((LocalFileSystemModel) idropGui.getFileTree().getModel()).notifyCompletionOfOperation(idropGui.getFileTree(), ts);
} catch (IdropException ex) {
log.error("error on tree notify after operation", ex);
- throw new IdropRuntimeException("error processing overall status callback", ex);
+ throw new IdropRuntimeException("error processing overall status callback", ex);
}
} else if (ts.getTransferType() == TransferStatus.TransferType.COPY || ts.getTransferType() == TransferStatus.TransferType.PUT) {
if (ts.getTransferZone().equals(
@@ -300,11 +300,11 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
// should leave PUT, and COPY
irodsTreeModel.notifyCompletionOfOperation(irodsTree, ts);
} catch (IdropException ex) {
- log.error("error on tree notify after operation", ex);
- throw new IdropRuntimeException("error processing overall status callback", ex);
+ log.error("error on tree notify after operation", ex);
+ throw new IdropRuntimeException("error processing overall status callback", ex);
}
}
-
+
}
/*
@@ -930,7 +930,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
IRODSOutlineModel mdl = new IRODSOutlineModel(gui,
irodsFileSystemModel, new IRODSRowModel(), true,
"File System");
-
+
irodsTree.setModel(mdl);
/*
@@ -1018,7 +1018,8 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
/**
* Initialize the info panel with data from iRODS. In this case, the data is
- * an iRODS data object (file)
+ * an iRODS data object (file). Called from a runnable that will
+ * handle the irods collection and busy cursor.
*
* @param dataObject
* <code>DataObject</code> iRODS domain object for a file.
@@ -1039,50 +1040,42 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
this.lastCachedInfoItem = dataObject;
final iDrop idropGui = this;
- java.awt.EventQueue.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- idropGui.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
- lblFileOrCollectionName.setText(dataObject.getDataName());
- txtParentPath.setText(dataObject.getCollectionName());
- txtComment.setText(dataObject.getComments());
+ lblFileOrCollectionName.setText(IDropUtils.abbreviateFileName(dataObject.getDataName()));
+ lblFileOrCollectionName.setToolTipText(dataObject.getDataName());
+ lblFileParent.setText(IDropUtils.abbreviateFileName(dataObject.getCollectionName()));
+ lblFileParent.setToolTipText(dataObject.getCollectionName());
+ txtComment.setText(dataObject.getComments());
- log.debug("getting available tags for data object");
+ log.debug("getting available tags for data object");
- try {
- FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory(),
- getiDropCore().getIrodsAccount());
- IRODSTagGrouping irodsTagGrouping = freeTaggingService.getTagsForDataObjectInFreeTagForm(dataObject.getCollectionName()
- + "/"
- + dataObject.getDataName());
- txtTags.setText(irodsTagGrouping.getSpaceDelimitedTagsForDomain());
- pnlInfoIcon.removeAll();
- pnlInfoIcon.add(IconHelper.getFileIcon());
- pnlInfoIcon.validate();
- lblInfoCreatedAtValue.setText(df.format(dataObject.getCreatedAt()));
- lblInfoUpdatedAtValue.setText(df.format(dataObject.getUpdatedAt()));
- lblInfoLengthValue.setText(String.valueOf(dataObject.getDataSize()));
- lblInfoLengthValue.setVisible(true);
- lblInfoLength.setVisible(true);
- } catch (JargonException ex) {
- Logger.getLogger(iDrop.class.getName()).log(Level.SEVERE,
- null, ex);
- throw new IdropRuntimeException(ex);
- } finally {
- getiDropCore().getIrodsFileSystem().closeAndEatExceptions(
- getIrodsAccount());
- idropGui.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
- }
- }
- });
+ try {
+ FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory(),
+ getiDropCore().getIrodsAccount());
+ IRODSTagGrouping irodsTagGrouping = freeTaggingService.getTagsForDataObjectInFreeTagForm(dataObject.getCollectionName()
+ + "/"
+ + dataObject.getDataName());
+ txtTags.setText(irodsTagGrouping.getSpaceDelimitedTagsForDomain());
+ pnlInfoIcon.removeAll();
+ pnlInfoIcon.add(IconHelper.getFileIcon());
+ pnlInfoIcon.validate();
+ lblInfoCreatedAtValue.setText(df.format(dataObject.getCreatedAt()));
+ lblInfoUpdatedAtValue.setText(df.format(dataObject.getUpdatedAt()));
+ lblInfoLengthValue.setText(String.valueOf(dataObject.getDataSize()));
+ lblInfoLengthValue.setVisible(true);
+ lblInfoLength.setVisible(true);
+ } catch (JargonException ex) {
+ Logger.getLogger(iDrop.class.getName()).log(Level.SEVERE,
+ null, ex);
+ throw new IdropRuntimeException(ex);
+ }
}
/**
* Initialize the info panel with data from iRODS. In this case, the data is
- * an iRODS collection (directory).
+ * an iRODS collection (directory). Called from a runnable that will
+ * handle the irods collection and busy cursor.
*
* @param collection
* @throws IdropException
@@ -1103,42 +1096,32 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
this.lastCachedInfoItem = collection;
final iDrop idropGui = this;
- java.awt.EventQueue.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- idropGui.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ lblFileOrCollectionName.setText(IDropUtils.abbreviateFileName(collection.getCollectionLastPathComponent()));
+ lblFileOrCollectionName.setToolTipText(collection.getCollectionLastPathComponent());
+ lblFileParent.setText(IDropUtils.abbreviateFileName(collection.getCollectionParentName()));
+ lblFileParent.setToolTipText(collection.getCollectionParentName());
+ txtComment.setText(collection.getComments());
- lblFileOrCollectionName.setText(collection.getCollectionLastPathComponent());
- txtParentPath.setText(collection.getCollectionParentName());
- txtComment.setText(collection.getComments());
+ log.debug("getting available tags for data object");
- log.debug("getting available tags for data object");
-
- try {
- FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory(),
- getIrodsAccount());
- IRODSTagGrouping irodsTagGrouping = freeTaggingService.getTagsForCollectionInFreeTagForm(collection.getCollectionName());
- txtTags.setText(irodsTagGrouping.getSpaceDelimitedTagsForDomain());
- pnlInfoIcon.removeAll();
- pnlInfoIcon.add(IconHelper.getFolderIcon());
- pnlInfoIcon.validate();
- lblInfoCreatedAtValue.setText(df.format(collection.getCreatedAt()));
- lblInfoUpdatedAtValue.setText(df.format(collection.getModifiedAt()));
- lblInfoLengthValue.setVisible(false);
- lblInfoLength.setVisible(false);
- } catch (JargonException ex) {
- Logger.getLogger(iDrop.class.getName()).log(Level.SEVERE,
- null, ex);
- throw new IdropRuntimeException(ex);
- } finally {
- getiDropCore().getIrodsFileSystem().closeAndEatExceptions(
- getIrodsAccount());
- idropGui.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
- }
- }
- });
+ try {
+ FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory(),
+ getIrodsAccount());
+ IRODSTagGrouping irodsTagGrouping = freeTaggingService.getTagsForCollectionInFreeTagForm(collection.getCollectionName());
+ txtTags.setText(irodsTagGrouping.getSpaceDelimitedTagsForDomain());
+ pnlInfoIcon.removeAll();
+ pnlInfoIcon.add(IconHelper.getFolderIcon());
+ pnlInfoIcon.validate();
+ lblInfoCreatedAtValue.setText(df.format(collection.getCreatedAt()));
+ lblInfoUpdatedAtValue.setText(df.format(collection.getModifiedAt()));
+ lblInfoLengthValue.setVisible(false);
+ lblInfoLength.setVisible(false);
+ } catch (JargonException ex) {
+ Logger.getLogger(iDrop.class.getName()).log(Level.SEVERE,
+ null, ex);
+ throw new IdropRuntimeException(ex);
+ }
}
/**
@@ -1212,9 +1195,8 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
pnlFileNameAndIcon = new javax.swing.JPanel();
lblFileOrCollectionName = new javax.swing.JLabel();
pnlInfoCollectionParent = new javax.swing.JPanel();
+ lblFileParentLabel = new javax.swing.JLabel();
lblFileParent = new javax.swing.JLabel();
- scrollParentPath = new javax.swing.JScrollPane();
- txtParentPath = new javax.swing.JTextArea();
pnlInfoComment = new javax.swing.JPanel();
lblComment = new javax.swing.JLabel();
scrollComment = new javax.swing.JScrollPane();
@@ -1542,7 +1524,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
pnlIrodsInfoInner.add(pnlFileIconSizer, gridBagConstraints);
pnlFileNameAndIcon.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
- pnlFileNameAndIcon.setMinimumSize(new java.awt.Dimension(100, 100));
+ pnlFileNameAndIcon.setMinimumSize(new java.awt.Dimension(100, 50));
pnlFileNameAndIcon.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT, 0, 5));
lblFileOrCollectionName.setText(" ");
@@ -1554,24 +1536,19 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
- gridBagConstraints.weightx = 0.8;
+ gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(10, 0, 0, 0);
pnlIrodsInfoInner.add(pnlFileNameAndIcon, gridBagConstraints);
pnlInfoCollectionParent.setLayout(new java.awt.BorderLayout());
- lblFileParent.setText("Parent path of file:");
- pnlInfoCollectionParent.add(lblFileParent, java.awt.BorderLayout.NORTH);
- lblFileParent.getAccessibleContext().setAccessibleDescription("The path of the parent of the file or collection");
-
- scrollParentPath.setMinimumSize(new java.awt.Dimension(100, 100));
-
- txtParentPath.setEditable(false);
- txtParentPath.setMaximumSize(null);
- txtParentPath.setMinimumSize(new java.awt.Dimension(600, 100));
- scrollParentPath.setViewportView(txtParentPath);
+ lblFileParentLabel.setText("Parent path of file:");
+ pnlInfoCollectionParent.add(lblFileParentLabel, java.awt.BorderLayout.NORTH);
+ lblFileParentLabel.getAccessibleContext().setAccessibleDescription("The path of the parent of the file or collection");
- pnlInfoCollectionParent.add(scrollParentPath, java.awt.BorderLayout.CENTER);
+ lblFileParent.setText(" ");
+ lblFileParent.setMinimumSize(new java.awt.Dimension(80, 30));
+ pnlInfoCollectionParent.add(lblFileParent, java.awt.BorderLayout.CENTER);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
@@ -1716,7 +1693,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
gridBagConstraints.insets = new java.awt.Insets(10, 0, 10, 0);
pnlIrodsInfoInner.add(pnlInfoDetails, gridBagConstraints);
- pnlToolbarInfo.setMinimumSize(new java.awt.Dimension(300, 200));
+ pnlToolbarInfo.setMinimumSize(null);
pnlToolbarInfo.setLayout(new java.awt.BorderLayout());
toolBarInfo.setRollover(true);
@@ -1784,7 +1761,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
- gridBagConstraints.weightx = 0.0050;
+ gridBagConstraints.weightx = 0.005;
pnlIdropBottom.add(userNameLabel, gridBagConstraints);
pnlTransferOverview.setLayout(new java.awt.BorderLayout());
@@ -2539,6 +2516,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
private javax.swing.JLabel lblCurrentFileLabel;
private javax.swing.JLabel lblFileOrCollectionName;
private javax.swing.JLabel lblFileParent;
+ private javax.swing.JLabel lblFileParentLabel;
private javax.swing.JLabel lblInfoCreatedAt;
private javax.swing.JLabel lblInfoCreatedAtValue;
private javax.swing.JLabel lblInfoLength;
@@ -2596,7 +2574,6 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
private javax.swing.JScrollPane scrollLocalDrives;
private javax.swing.JScrollPane scrollLocalFileTree;
private javax.swing.JScrollPane scrollPaneSearchResults;
- private javax.swing.JScrollPane scrollParentPath;
protected javax.swing.JPopupMenu searchTablePopupMenu;
private javax.swing.JToolBar.Separator separator1;
private javax.swing.JToolBar.Separator separator2;
@@ -2611,7 +2588,6 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
private javax.swing.JProgressBar transferStatusProgressBar;
private javax.swing.JTextArea txtComment;
private javax.swing.JTextField txtMainSearch;
- private javax.swing.JTextArea txtParentPath;
private javax.swing.JTextField txtTags;
private javax.swing.JLabel userNameLabel;
// End of variables declaration//GEN-END:variables
@@ -2850,11 +2826,14 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
public void triggerInfoPanelUpdate() throws IdropRuntimeException {
+ final iDrop idropGui = this;
java.awt.EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
+ idropGui.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
IRODSOutlineModel irodsFileSystemModel = (IRODSOutlineModel) getIrodsTree().getModel();
ListSelectionModel selectionModel = getIrodsTree().getSelectionModel();
@@ -2870,6 +2849,9 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
throw new IdropRuntimeException(
"error initializing info panel for selected irods node");
+ } finally {
+ iDropCore.closeIRODSConnectionForLoggedInAccount();
+ idropGui.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
}
});
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTreeTransferHandler.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTreeTransferHandler.java
index 7ae49be..df66751 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTreeTransferHandler.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTreeTransferHandler.java
@@ -318,12 +318,14 @@ public class IRODSTreeTransferHandler extends TransferHandler {
final IRODSNode targetNode) {
log.info("process as drop of file list");
+ IRODSNode computedTarget = null;
+
List<IRODSFile> sourceFiles;
CollectionAndDataObjectListingEntry targetEntry = (CollectionAndDataObjectListingEntry) targetNode.getUserObject();
if (targetEntry.getObjectType() == CollectionAndDataObjectListingEntry.ObjectType.DATA_OBJECT) {
- log.warn("attempt to move a file to a data object, must be a collection");
- idropGui.showMessageFromOperation("unable to move file, the target of the move is not a collection");
- return;
+ computedTarget = (IRODSNode) targetNode.getParent();
+ } else {
+ computedTarget = targetNode;
}
try {
@@ -350,11 +352,11 @@ public class IRODSTreeTransferHandler extends TransferHandler {
MoveOrCopyiRODSDialog moveIRODSFileOrDirectoryDialog;
if (sourceFiles.size() == 1) {
moveIRODSFileOrDirectoryDialog = new MoveOrCopyiRODSDialog(
- idropGui, true, targetNode, idropGui.getIrodsTree(),
+ idropGui, true, computedTarget, idropGui.getIrodsTree(),
sourceFiles.get(0), targetFileAbsolutePath, false);
} else {
moveIRODSFileOrDirectoryDialog = new MoveOrCopyiRODSDialog(
- idropGui, true, targetNode, idropGui.getIrodsTree(),
+ idropGui, true, computedTarget, idropGui.getIrodsTree(),
sourceFiles, targetFileAbsolutePath, false);
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/InfoPanelTransferHandler.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/InfoPanelTransferHandler.java
index ed26d9f..ed0a214 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/InfoPanelTransferHandler.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/InfoPanelTransferHandler.java
@@ -58,14 +58,14 @@ public class InfoPanelTransferHandler extends TransferHandler {
@Override
public boolean canImport(final TransferHandler.TransferSupport info) {
- log.info("info for transfer:{}", info);
- log.info("tree data for comparison:{}", treeDataFlavor);
+ log.debug("info for transfer:{}", info);
+ log.debug("tree data for comparison:{}", treeDataFlavor);
log.debug("compared to file list flavor:{}",
DataFlavor.javaFileListFlavor);
DataFlavor[] dataFlavors = info.getDataFlavors();
for (DataFlavor dataFlavor : dataFlavors) {
- log.info("data flavor:{}", dataFlavor);
+ log.debug("data flavor:{}", dataFlavor);
log.debug("rep class:{}",
dataFlavor.getDefaultRepresentationClassAsString());
log.debug("mime type:{}", dataFlavor.getMimeType());
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 44ebb89..1af75d4 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,6 +1,6 @@
policy.aware=false
-login.preset=true
-force.mode=true
+login.preset=false
+force.mode=false
force.no.synch=false
advanced.view=true
show.startup=true