summaryrefslogtreecommitdiffstats
path: root/idrop-swing
diff options
context:
space:
mode:
authorMike Conway <michael.c.conway@gmail.com>2011-10-11 18:19:21 (GMT)
committer Mike Conway <michael.c.conway@gmail.com>2011-10-11 18:19:21 (GMT)
commit9e16951807bd7f69f026e4b6c655db0462eff6a1 (patch)
tree047d1e24a7c4c095600071c11dac8ff97b52c107 /idrop-swing
parent6ee75892f2fff8475fed8ae9a18847daf3e7a031 (diff)
downloadQCG-Data-9e16951807bd7f69f026e4b6c655db0462eff6a1.zip
QCG-Data-9e16951807bd7f69f026e4b6c655db0462eff6a1.tar.gz
QCG-Data-9e16951807bd7f69f026e4b6c655db0462eff6a1.tar.bz2
[#395] progress bar on put/get in queue mgr dialog
Diffstat (limited to 'idrop-swing')
-rw-r--r--idrop-swing/release_notes.txt2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form7
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.form31
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java244
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form1
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java1
-rw-r--r--idrop-swing/src/main/resources/log4j.properties2
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties2
9 files changed, 173 insertions, 119 deletions
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index 162cb10..032fbd9 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -161,6 +161,8 @@ iRODS iDrop > drag and drop, desktop to irods file should use irods parent as ta
[#318] drag/select feedback missing on some platforms
+ [#362] change Grids in preferences to Accounts
+
==Outstanding Issues==
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
index f7944f3..5cbcd7f 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
@@ -62,6 +62,11 @@
</Layout>
<SubComponents>
<Container class="javax.swing.JTabbedPane" name="tabConfig">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="null"/>
+ </Property>
+ </Properties>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
<SubComponents>
@@ -123,7 +128,7 @@
<Container class="javax.swing.JPanel" name="pnlConfigGrids">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="Grids">
+ <JTabbedPaneConstraints tabName="Accounts&#xa;">
<Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="IDROPConfigurationPanel.pnlConfigGrids.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
index 018b657..bf3cfa3 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
@@ -232,6 +232,8 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
pnlCenter.setLayout(new java.awt.GridLayout(1, 0));
+ tabConfig.setMinimumSize(null);
+
pnlConfigIdrop.setLayout(new java.awt.GridBagLayout());
checkShowGUI.setMnemonic('s');
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.form
index ad6fd8d..58eeb13 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.form
@@ -743,6 +743,7 @@
<SubComponents>
<Component class="javax.swing.JLabel" name="lblTransferTypeLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Transfer Type:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -757,7 +758,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="3" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -770,6 +771,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblTransferStatusLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Status:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -783,7 +785,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="3" gridY="1" gridWidth="1" gridHeight="1" fill="3" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="3" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -796,6 +798,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblProcessingStateLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Processing State:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -809,7 +812,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="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"/>
+ <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -842,6 +845,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblHostLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Host:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -856,7 +860,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="10" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -869,6 +873,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblZoneLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Zone:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -882,7 +887,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="3" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="3" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -895,6 +900,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblTransferStartLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Start:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -908,7 +914,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="10" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -921,6 +927,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblTransferEndLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="End:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -934,7 +941,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="3" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="3" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -947,6 +954,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblSourceLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Source Path:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -960,7 +968,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="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="20" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="20" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -989,6 +997,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblTargetLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Target Path:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -1002,7 +1011,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="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -1029,6 +1038,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblLastPathLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Last Path:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
@@ -1042,7 +1052,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="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="20" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="20" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -1065,6 +1075,7 @@
</Component>
<Component class="javax.swing.JLabel" name="lblErrorMessageLabel">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="Error Message:"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java
index 63cdf70..2c69f7d 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java
@@ -39,11 +39,11 @@ import org.slf4j.LoggerFactory;
* @author mikeconway
*/
public class QueueManagerDialog extends javax.swing.JDialog implements ListSelectionListener {
-
+
private static final long serialVersionUID = 1L;
-
+
public enum ViewType {
-
+
RECENT, ERROR, WARNING, CURRENT
}
private final TransferManager transferManager;
@@ -54,7 +54,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
private LocalIRODSTransfer selectedMasterTableObject = null;
public static org.slf4j.Logger log = LoggerFactory.getLogger(QueueManagerDialog.class);
private DateFormat dateFormat = DateFormat.getDateTimeInstance();
-
+
private int showResubmitConfirm(LocalIRODSTransfer selectedTransfer) {
StringBuilder sb = new StringBuilder();
sb.append("Would you like to resubmit this transfer? \n ");
@@ -62,10 +62,10 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
// default icon, custom title
int n = JOptionPane.showConfirmDialog(this, sb.toString(), "Resubmit Confirmaiton", JOptionPane.YES_NO_OPTION);
-
+
return n;
}
-
+
private int showCancelConfirm(LocalIRODSTransfer selectedTransfer) {
StringBuilder sb = new StringBuilder();
sb.append("Would you like to cancel this transfer? \n ");
@@ -73,14 +73,14 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
// default icon, custom title
int n = JOptionPane.showConfirmDialog(this, sb.toString(), "Cancel Confirmaiton", JOptionPane.YES_NO_OPTION);
-
+
return n;
}
-
+
public synchronized ViewType getViewType() {
return viewType;
}
-
+
public synchronized void setViewType(ViewType viewType) {
if (viewType != this.getViewType()) {
selectedMasterTableObject = null;
@@ -92,19 +92,19 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
public QueueManagerDialog(final iDrop iDropParent, final TransferManager transferManager, final ViewType viewType)
throws IdropException {
super((JFrame) null, true);
-
+
if (transferManager == null) {
throw new IdropException("null transferManager");
}
-
+
if (viewType == null) {
throw new IdropException("null viewType");
}
-
+
this.transferManager = transferManager;
this.viewType = viewType;
this.iDropParent = iDropParent;
-
+
initComponents();
btnDeleteSelected.setEnabled(false);
btnCancelSelected.setEnabled(false);
@@ -113,13 +113,13 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
jTableMaster.setModel(new QueueManagerMasterTableModel(new ArrayList<LocalIRODSTransfer>()));
jTableMaster.getSelectionModel().addListSelectionListener(this);
tabDetails.setVisible(false);
-
+
refreshTableView(viewType);
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-
+
int height = screenSize.height;
int width = screenSize.width;
- screenSize.setSize(width * (0.90), height * (0.80));
+ screenSize.setSize(width * (0.70), height * (0.60));
int newheight = screenSize.height;
int newwidth = screenSize.width;
this.setSize(newwidth, newheight);
@@ -532,6 +532,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
pnlTransferInfoBasicStats.setPreferredSize(null);
pnlTransferInfoBasicStats.setLayout(new java.awt.GridBagLayout());
+ lblTransferTypeLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblTransferTypeLabel.setText("Transfer Type:");
lblTransferTypeLabel.setMaximumSize(null);
lblTransferTypeLabel.setMinimumSize(null);
@@ -540,7 +541,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
- gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlTransferInfoBasicStats.add(lblTransferTypeLabel, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -550,6 +551,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
pnlTransferInfoBasicStats.add(lblTransferType, gridBagConstraints);
+ lblTransferStatusLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblTransferStatusLabel.setText("Status:");
lblTransferStatusLabel.setMaximumSize(null);
lblTransferStatusLabel.setMinimumSize(null);
@@ -557,7 +559,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 1;
- gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 0);
pnlTransferInfoBasicStats.add(lblTransferStatusLabel, gridBagConstraints);
@@ -568,6 +570,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
pnlTransferInfoBasicStats.add(lblTransferStatus, gridBagConstraints);
+ lblProcessingStateLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblProcessingStateLabel.setText("Processing State:");
lblProcessingStateLabel.setMaximumSize(null);
lblProcessingStateLabel.setMinimumSize(null);
@@ -575,6 +578,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlTransferInfoBasicStats.add(lblProcessingStateLabel, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -593,6 +597,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.gridy = 0;
pnlTransferInfoBasicStats.add(btnSynchronization, gridBagConstraints);
+ lblHostLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblHostLabel.setText("Host:");
lblHostLabel.setMaximumSize(null);
lblHostLabel.setMinimumSize(null);
@@ -601,7 +606,8 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
gridBagConstraints.insets = new java.awt.Insets(10, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblHostLabel, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -611,6 +617,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.insets = new java.awt.Insets(10, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblHost, gridBagConstraints);
+ lblZoneLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblZoneLabel.setText("Zone:");
lblZoneLabel.setMaximumSize(null);
lblZoneLabel.setMinimumSize(null);
@@ -618,6 +625,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 3;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.insets = new java.awt.Insets(10, 10, 0, 0);
pnlTransferInfoBasicStats.add(lblZoneLabel, gridBagConstraints);
@@ -628,6 +636,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.insets = new java.awt.Insets(10, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblZone, gridBagConstraints);
+ lblTransferStartLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblTransferStartLabel.setText("Start:");
lblTransferStartLabel.setMaximumSize(null);
lblTransferStartLabel.setMinimumSize(null);
@@ -635,7 +644,8 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
gridBagConstraints.insets = new java.awt.Insets(10, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblTransferStartLabel, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -645,6 +655,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.insets = new java.awt.Insets(10, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblTransferStart, gridBagConstraints);
+ lblTransferEndLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblTransferEndLabel.setText("End:");
lblTransferEndLabel.setMaximumSize(null);
lblTransferEndLabel.setMinimumSize(null);
@@ -652,7 +663,8 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 2;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
gridBagConstraints.insets = new java.awt.Insets(10, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblTransferEndLabel, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -662,6 +674,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.insets = new java.awt.Insets(10, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblTransferEnd, gridBagConstraints);
+ lblSourceLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblSourceLabel.setText("Source Path:");
lblSourceLabel.setMaximumSize(null);
lblSourceLabel.setMinimumSize(null);
@@ -669,6 +682,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 5;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.insets = new java.awt.Insets(20, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblSourceLabel, gridBagConstraints);
@@ -686,6 +700,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.insets = new java.awt.Insets(20, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblSource, gridBagConstraints);
+ lblTargetLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblTargetLabel.setText("Target Path:");
lblTargetLabel.setMaximumSize(null);
lblTargetLabel.setMinimumSize(null);
@@ -693,6 +708,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 6;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblTargetLabel, gridBagConstraints);
@@ -710,6 +726,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblTarget, gridBagConstraints);
+ lblLastPathLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblLastPathLabel.setText("Last Path:");
lblLastPathLabel.setMaximumSize(null);
lblLastPathLabel.setMinimumSize(null);
@@ -717,6 +734,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 7;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.insets = new java.awt.Insets(20, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblLastPathLabel, gridBagConstraints);
@@ -732,6 +750,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
gridBagConstraints.insets = new java.awt.Insets(20, 0, 0, 0);
pnlTransferInfoBasicStats.add(lblLastPath, gridBagConstraints);
+ lblErrorMessageLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblErrorMessageLabel.setText("Error Message:");
lblErrorMessageLabel.setMaximumSize(null);
lblErrorMessageLabel.setMinimumSize(null);
@@ -896,17 +915,17 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
private void jMenuCurrentActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuCurrentActionPerformed
refreshTableView(QueueManagerDialog.ViewType.CURRENT);
-
+
}// GEN-LAST:event_jMenuCurrentActionPerformed
private void jMenuRecentActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuRecentActionPerformed
refreshTableView(QueueManagerDialog.ViewType.RECENT);
-
+
}// GEN-LAST:event_jMenuRecentActionPerformed
private void jMenuErrorActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuErrorActionPerformed
refreshTableView(QueueManagerDialog.ViewType.ERROR);
-
+
}// GEN-LAST:event_jMenuErrorActionPerformed
private void jMenuWarningActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuWarningActionPerformed
@@ -917,7 +936,6 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
try {
iDropParent.getiDropCore().getTransferManager().purgeAllTransfers();
refreshTableView(viewType);
- resetDisplayFieldsAndStatus();
} catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
@@ -929,7 +947,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
iDropParent.getiDropCore().getTransferManager().purgeSuccessfulTransfers();
refreshTableView(viewType);
resetDisplayFieldsAndStatus();
-
+
} catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
@@ -946,12 +964,12 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
// get the transfer at the selected row
QueueManagerMasterTableModel tableModel = (QueueManagerMasterTableModel) jTableMaster.getModel();
LocalIRODSTransfer selectedTransfer = tableModel.getTransferAtRow(jTableMaster.getSelectedRow());
-
+
int dialogReturn = showDeleteConfirm(selectedTransfer);
-
+
if (dialogReturn == JOptionPane.YES_OPTION) {
}
-
+
}// GEN-LAST:event_btnDeleteSelectedActionPerformed
private void btnRestartSelectedActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnRestartSelectedActionPerformed
@@ -964,9 +982,9 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
// get the transfer at the selected row
QueueManagerMasterTableModel tableModel = (QueueManagerMasterTableModel) jTableMaster.getModel();
LocalIRODSTransfer selectedTransfer = tableModel.getTransferAtRow(jTableMaster.getSelectedRow());
-
+
int dialogReturn = showRestartConfirm(selectedTransfer);
-
+
if (dialogReturn == JOptionPane.YES_OPTION) {
try {
transferManager.restartTransfer(selectedTransfer);
@@ -974,10 +992,10 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
}
-
+
refreshTableView(this.getViewType());
}
-
+
}// GEN-LAST:event_btnRestartSelectedActionPerformed
private void btnResubmitSelectedActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnResubmitSelectedActionPerformed
@@ -990,9 +1008,9 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
// get the transfer at the selected row
QueueManagerMasterTableModel tableModel = (QueueManagerMasterTableModel) jTableMaster.getModel();
LocalIRODSTransfer selectedTransfer = tableModel.getTransferAtRow(jTableMaster.getSelectedRow());
-
+
int dialogReturn = showResubmitConfirm(selectedTransfer);
-
+
if (dialogReturn == JOptionPane.YES_OPTION) {
try {
transferManager.resubmitTransfer(selectedTransfer);
@@ -1000,11 +1018,11 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
}
-
+
refreshTableView(this.getViewType());
-
+
}
-
+
}// GEN-LAST:event_btnResubmitSelectedActionPerformed
private void btnCancelSelectedActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnCancelSelectedActionPerformed
@@ -1017,9 +1035,9 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
// get the transfer at the selected row
QueueManagerMasterTableModel tableModel = (QueueManagerMasterTableModel) jTableMaster.getModel();
LocalIRODSTransfer selectedTransfer = tableModel.getTransferAtRow(jTableMaster.getSelectedRow());
-
+
int dialogReturn = showCancelConfirm(selectedTransfer);
-
+
if (dialogReturn == JOptionPane.YES_OPTION) {
try {
transferManager.cancelTransfer(selectedTransfer);
@@ -1028,11 +1046,11 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
}
-
+
refreshTableView(this.getViewType());
-
+
}
-
+
}// GEN-LAST:event_btnCancelSelectedActionPerformed
private void btnRefreshViewActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnRefreshViewActionPerformed
@@ -1073,48 +1091,52 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
* @param viewType
*/
public final void refreshTableView(final ViewType viewType) {
-
+
final QueueManagerDialog queueManagerDialog = this;
-
+
final QueueManagerMasterTableModel masterTableModel = (QueueManagerMasterTableModel) jTableMaster.getModel();
int selectedRow = jTableMaster.getSelectedRow();
-
+
if (masterTableModel.getRowCount() > 0) {
-
jTableMaster.setRowSelectionInterval(0, 0);
}
- //selectedMasterTableObject = (LocalIRODSTransfer) masterTableModel.getTransferAtRow(jTableMaster.convertRowIndexToModel(selectedRow));
-
-
-
+ if (selectedRow > -1) {
+ selectedMasterTableObject = (LocalIRODSTransfer) masterTableModel.getTransferAtRow(jTableMaster.convertRowIndexToModel(selectedRow));
+ }
+
+
java.awt.EventQueue.invokeLater(new Runnable() {
-
+
@Override
public void run() {
-
+
queueManagerDialog.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try {
- tabDetails.setVisible(true);
- updateDetailsWIthSelectedTable();
+
+ tabDetails.setVisible(true);
+ resetDisplayFieldsAndStatus();
+ updateDetailsWIthSelectedTable();
+
+
} catch (Exception e) {
log.error("exceptoin updating table", e);
MessageManager.showError(queueManagerDialog, e.getMessage(), MessageManager.TITLE_MESSAGE);
} finally {
queueManagerDialog.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
-
+
}
-
+
private void updateDetailsWIthSelectedTable() throws Exception {
log.info("refreshing master table for view type:{}", viewType);
-
+
if (viewType == null) {
throw new IdropRuntimeException("null viewType");
}
-
+
List<LocalIRODSTransfer> transferQueue = null;
-
+
if (viewType == ViewType.CURRENT) {
transferQueue = transferManager.getCurrentQueue();
queueManagerDialog.getLblHeader().setText("Current transfer queue");
@@ -1128,13 +1150,13 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
transferQueue = transferManager.getWarningQueue();
queueManagerDialog.getLblHeader().setText("Transfer activities with warnings");
}
-
+
queueManagerDialog.setViewType(viewType);
-
+
if (transferQueue != null) {
jTableMaster.setModel(new QueueManagerMasterTableModel(transferQueue));
int matchingRowForSelected = -1;
-
+
if (selectedMasterTableObject != null) {
// previously selected table, refresh display, first, selecting same row
@@ -1146,7 +1168,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
break;
}
}
-
+
if (matchingRowForSelected != -1) {
int selectedRowIndex = jTableMaster.convertRowIndexToView(matchingRowForSelected);
if (selectedRowIndex != -1) {
@@ -1159,7 +1181,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
}
}
});
-
+
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnCancelSelected;
@@ -1247,34 +1269,34 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
public JLabel getLblHeader() {
return lblHeader;
}
-
+
public void setLblHeader(JLabel lblHeader) {
this.lblHeader = lblHeader;
}
-
+
@Override
public void valueChanged(ListSelectionEvent e) {
-
+
if (e.getValueIsAdjusting()) {
return;
}
-
+
if (e.getFirstIndex() == -1 || e.getLastIndex() == -1 || jTableMaster.getSelectedRow() == -1) {
return;
}
-
+
adjustDetails();
tabDetails.setVisible(true);
-
+
}
-
+
private void adjustDetails() {
final LocalIRODSTransfer localIRODSTransfer = ((QueueManagerMasterTableModel) jTableMaster.getModel()).getTransferAtRow(jTableMaster.convertRowIndexToModel(jTableMaster.getSelectedRow()));
log.info("selected transfer:{}", localIRODSTransfer);
final boolean showAll = radioShowAll.isSelected();
-
+
java.awt.EventQueue.invokeLater(new Runnable() {
-
+
@Override
public void run() {
// initialize panel info
@@ -1290,7 +1312,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
} else {
lblTransferStatus.setForeground(Color.GREEN);
}
-
+
lblProcessingState.setText(localIRODSTransfer.getTransferState().toString());
if (localIRODSTransfer.getTransferState() == TransferState.PROCESSING) {
lblProcessingState.setForeground(Color.GREEN);
@@ -1303,27 +1325,27 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
} else {
lblProcessingState.setForeground(Color.BLACK);
}
-
+
if (localIRODSTransfer.getSynchronization() != null) {
btnSynchronization.setEnabled(true);
} else {
btnSynchronization.setEnabled(false);
}
-
+
lblHost.setText(localIRODSTransfer.getTransferHost());
lblZone.setText(localIRODSTransfer.getTransferZone());
-
+
if (localIRODSTransfer.getTransferStart() != null) {
lblTransferStart.setText(dateFormat.format(localIRODSTransfer.getTransferStart()));
}
-
+
if (localIRODSTransfer.getTransferEnd() != null) {
lblTransferEnd.setText(dateFormat.format(localIRODSTransfer.getTransferEnd()));
}
-
+
lblLastPath.setText(IDropUtils.abbreviateFileName(localIRODSTransfer.getLastSuccessfulPath()));
lblErrorMessage.setText(localIRODSTransfer.getGlobalException());
-
+
String source = null;
String target = null;
@@ -1356,13 +1378,14 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
iDropParent.showIdropException(new IdropException("unable to build details for this transfer type"));
break;
}
-
+
lblSource.setText(IDropUtils.abbreviateFileName(source));
lblTarget.setText(IDropUtils.abbreviateFileName(target));
-
+ lblLastPath.setText(IDropUtils.abbreviateFileName(localIRODSTransfer.getLastSuccessfulPath()));
+
lblTransferType1.setText(localIRODSTransfer.getTransferType().toString());
-
-
+
+
lblCountSoFar.setText(String.valueOf(localIRODSTransfer.getTotalFilesTransferredSoFar()));
lblCountOutOf.setText(String.valueOf(localIRODSTransfer.getTotalFilesCount()));
lblTransferFilesCounts.setText("Files: " + localIRODSTransfer.getTotalFilesTransferredSoFar() + " / " + localIRODSTransfer.getTotalFilesCount());
@@ -1371,22 +1394,22 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
transferStatusProgressBar.setValue(localIRODSTransfer.getTotalFilesTransferredSoFar());
// initialize the detail values via hibernate (they are lazily loaded)
log.info("get the details based on the selected option");
-
+
try {
if (showAll) {
log.info("showing all transfers based on radio selection");
-
+
jTableDetails.setModel(new QueueManagerDetailTableModel(transferManager.getAllTransferItemsForTransfer(localIRODSTransfer.getId())));
} else {
jTableDetails.setModel(new QueueManagerDetailTableModel(transferManager.getErrorTransferItemsForTransfer(localIRODSTransfer.getId())));
}
-
+
} catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
return;
}
-
+
switch (localIRODSTransfer.getTransferState()) {
case PROCESSING:
btnDeleteSelected.setEnabled(false);
@@ -1416,36 +1439,36 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
btnRestartSelected.setEnabled(false);
break;
}
-
+
jTableDetails.setVisible(true);
}
});
}
-
+
public int showDeleteConfirm(final LocalIRODSTransfer localIRODSTransfer) {
-
+
StringBuilder sb = new StringBuilder();
sb.append("Would you like to delete this transfer? \n ");
sb.append(localIRODSTransfer.toString());
// default icon, custom title
int n = JOptionPane.showConfirmDialog(this, sb.toString(), "Delete Confirmation", JOptionPane.YES_NO_OPTION);
-
+
return n;
}
-
+
public int showRestartConfirm(final LocalIRODSTransfer localIRODSTransfer) {
-
+
StringBuilder sb = new StringBuilder();
sb.append("Would you like to retart this transfer? \n ");
sb.append(localIRODSTransfer.toString());
// default icon, custom title
int n = JOptionPane.showConfirmDialog(this, sb.toString(), "Restart Confirmation", JOptionPane.YES_NO_OPTION);
-
+
return n;
}
-
+
private void resetDisplayFieldsAndStatus() {
try {
iDropParent.getiDropCore().getTransferManager().resetStatus();
@@ -1453,20 +1476,29 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
// log and continue...not useful to user
}
-
+
java.awt.EventQueue.invokeLater(new Runnable() {
-
+
@Override
public void run() {
- /*
+
+ lblTransferType1.setText("");
+ lblTransferFilesCounts.setText("");
+ lblCurrentFile.setText("");
+ lblTransferStatus.setText("");
+ transferStatusProgressBar.setValue(0);
lblTransferType.setText("");
- lblTransferDate.setText("");
lblTransferStatus.setText("");
- txtSourcePath.setText("");
- txtTargetPath.setText("");
- txtAreaErrorMessage.setText("");
- txtLastGoodPath.setText("");
- * */
+ lblProcessingState.setText("");
+ lblHost.setText("");
+ lblZone.setText("");
+ lblTransferStart.setText("");
+ lblTransferEnd.setText("");
+ lblSource.setText("");
+ lblTarget.setText("");
+ lblLastPath.setText("");
+ lblErrorMessage.setText("");
+
}
});
}
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 6ef84e2..5dd828d 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
@@ -1426,6 +1426,7 @@
<SubComponents>
<Container class="javax.swing.JToolBar" name="idropProgressPanelToolbar">
<Properties>
+ <Property name="floatable" type="boolean" value="false"/>
<Property name="rollover" type="boolean" value="true"/>
</Properties>
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 a8dd05b..eb39fad 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
@@ -1956,6 +1956,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
transferQueueToolbarPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+ idropProgressPanelToolbar.setFloatable(false);
idropProgressPanelToolbar.setRollover(true);
btnShowTransferManager.setText("Manage");
diff --git a/idrop-swing/src/main/resources/log4j.properties b/idrop-swing/src/main/resources/log4j.properties
index 260b46d..565d9c9 100644
--- a/idrop-swing/src/main/resources/log4j.properties
+++ b/idrop-swing/src/main/resources/log4j.properties
@@ -3,7 +3,7 @@
log4j.category.org.irods.jargon.idrop=INFO, A1
log4j.category.org.irods.jargon.core= DEBUG, A1
log4j.categor.org.irods.jargon.usertagging=ERROR,A1
-log4j.category.org.irods.jargon.transfer=WARN, A1
+log4j.category.org.irods.jargon.transfer=DEBUG, A1
log4j.category.org.irods.jargon.datautils=WARN, A1
log4j.category.org.hibernate=ERROR, A1
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 e97f7bf..897c1ec 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
@@ -4,7 +4,7 @@ IDROPConfigurationPanel.btnOK.toolTipText=Close configuration panel
IDROPConfigurationPanel.pnlConfigIdrop.TabConstraints.tabTitle=iDrop
IDROPConfigurationPanel.pnlConfigTransfers.TabConstraints.tabTitle=Transfers
IDROPConfigurationPanel.pnlConfigSynch.TabConstraints.tabTitle=Synchronization
-IDROPConfigurationPanel.pnlConfigGrids.TabConstraints.tabTitle=Grids
+IDROPConfigurationPanel.pnlConfigGrids.TabConstraints.tabTitle=Accounts\n
IDROPConfigurationPanel.checkShowGUI.text=Show iDrop GUI at Startup
IDROPConfigurationPanel.checkShowGUI.toolTipText=Show the gui at startup or just start in system tray
IDROPConfigurationPanel.checkLogSuccessfulTransfer.text=Log successful transfers file by file