diff options
Diffstat (limited to 'idrop-swing')
8 files changed, 592 insertions, 452 deletions
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml index aa5dadd..7c8728f 100644 --- a/idrop-swing/pom.xml +++ b/idrop-swing/pom.xml @@ -26,7 +26,7 @@ <!-- <dependency> <groupId>com.jgoodies</groupId> <artifactId>validation</artifactId> - </dependency> --> + </dependency> <dependency> <groupId>cookxml</groupId> <artifactId>cookswing</artifactId> @@ -39,6 +39,7 @@ <groupId>cookxml</groupId> <artifactId>cookswing</artifactId> </dependency> + --> <dependency> <groupId>org.irods.jargon</groupId> <artifactId>jargon-data-utils</artifactId> @@ -61,7 +62,13 @@ </dependency> <dependency> <groupId>org.irods.jargon.transfer</groupId> + <artifactId>jargon-transfer-dao-spring</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.irods.jargon.transfer</groupId> <artifactId>jargon-transfer-engine</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -77,12 +84,6 @@ <groupId>org.swinglabs</groupId> <artifactId>swing-layout</artifactId> </dependency> - <dependency> - <groupId>org.irods.jargon.transfer</groupId> - <artifactId>jargon-transfer-dao-api</artifactId> - <version>2.4.1-SNAPSHOT</version> - <type>jar</type> - </dependency> </dependencies> <build> <plugins> 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 d75b26e..0d73539 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 @@ -30,7 +30,7 @@ import org.openide.util.Exceptions; import org.slf4j.LoggerFactory; /** - * + * Tools/Preferences dialog to set preferences * @author mikeconway */ public class IDROPConfigurationPanel extends javax.swing.JDialog { @@ -388,7 +388,6 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog { final IDROPConfigurationPanel thisPanel = this; - java.awt.EventQueue.invokeLater(new Runnable() { @Override 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 3c2e4d7..08c8faf 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 @@ -75,6 +75,7 @@ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[900, 800]"/> </Property> + <Property name="resizable" type="boolean" value="false"/> </Properties> <SyntheticProperties> <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/> @@ -442,7 +443,7 @@ <Group type="102" alignment="0" attributes="0"> <EmptySpace min="-2" pref="9" max="-2" attributes="0"/> <Component id="pnlProgress" min="-2" pref="1016" max="-2" attributes="1"/> - <EmptySpace max="32767" attributes="0"/> + <EmptySpace pref="111" max="32767" attributes="0"/> </Group> </Group> </DimensionLayout> 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 4d51927..cbaf3cc 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 @@ -24,8 +24,6 @@ import org.irods.jargon.idrop.desktop.systraygui.viscomponents.QueueManagerMaste import org.irods.jargon.idrop.exceptions.IdropException; import org.irods.jargon.idrop.exceptions.IdropRuntimeException; import org.irods.jargon.transfer.dao.domain.LocalIRODSTransfer; -import org.irods.jargon.transfer.dao.domain.TransferType; - import org.irods.jargon.transfer.engine.TransferManager; import org.slf4j.LoggerFactory; @@ -33,8 +31,7 @@ import org.slf4j.LoggerFactory; * * @author mikeconway */ -public class QueueManagerDialog extends javax.swing.JDialog implements - ListSelectionListener { +public class QueueManagerDialog extends javax.swing.JDialog implements ListSelectionListener { private static final long serialVersionUID = 1L; @@ -42,34 +39,39 @@ public class QueueManagerDialog extends javax.swing.JDialog implements RECENT, ERROR, WARNING, CURRENT } + private final TransferManager transferManager; + private ViewType viewType = null; + private iDrop iDropParent = null; + private RefreshQueueManagerTimerTask refreshQueueManagerTimerTask = null; + private Timer refreshQueueTimer = null; + private LocalIRODSTransfer selectedMasterTableObject = null; + public static org.slf4j.Logger log = LoggerFactory.getLogger(QueueManagerDialog.class); - private int showResubmitConfirm(final LocalIRODSTransfer selectedTransfer) { + private int showResubmitConfirm(LocalIRODSTransfer selectedTransfer) { StringBuilder sb = new StringBuilder(); sb.append("Would you like to resubmit this transfer? \n "); sb.append(selectedTransfer.toString()); // default icon, custom title - int n = JOptionPane.showConfirmDialog(this, sb.toString(), - "Resubmit Confirmaiton", JOptionPane.YES_NO_OPTION); + int n = JOptionPane.showConfirmDialog(this, sb.toString(), "Resubmit Confirmaiton", JOptionPane.YES_NO_OPTION); return n; } - private int showCancelConfirm(final LocalIRODSTransfer selectedTransfer) { + private int showCancelConfirm(LocalIRODSTransfer selectedTransfer) { StringBuilder sb = new StringBuilder(); sb.append("Would you like to cancel this transfer? \n "); sb.append(selectedTransfer.toString()); // default icon, custom title - int n = JOptionPane.showConfirmDialog(this, sb.toString(), - "Cancel Confirmaiton", JOptionPane.YES_NO_OPTION); + int n = JOptionPane.showConfirmDialog(this, sb.toString(), "Cancel Confirmaiton", JOptionPane.YES_NO_OPTION); return n; } @@ -78,7 +80,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements return viewType; } - public synchronized void setViewType(final ViewType viewType) { + public synchronized void setViewType(ViewType viewType) { if (viewType != this.getViewType()) { selectedMasterTableObject = null; } @@ -86,8 +88,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements } /** Creates new form QueueManagerDialog */ - public QueueManagerDialog(final iDrop iDropParent, - final TransferManager transferManager, final ViewType viewType) + public QueueManagerDialog(final iDrop iDropParent, final TransferManager transferManager, final ViewType viewType) throws IdropException { super((JFrame) null, true); @@ -108,8 +109,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements btnCancelSelected.setEnabled(false); btnResubmitSelected.setEnabled(false); btnRestartSelected.setEnabled(false); - jTableMaster.setModel(new QueueManagerMasterTableModel( - new ArrayList<LocalIRODSTransfer>())); + jTableMaster.setModel(new QueueManagerMasterTableModel(new ArrayList<LocalIRODSTransfer>())); jTableMaster.getSelectionModel().addListSelectionListener(this); jTableDetails.setVisible(false); pnlTransferInfo.setVisible(false); @@ -119,12 +119,10 @@ public class QueueManagerDialog extends javax.swing.JDialog implements } /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. + * This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The + * content of this method is always regenerated by the Form Editor. */ @SuppressWarnings("unchecked") - // <editor-fold defaultstate="collapsed" // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents private void initComponents() { @@ -198,6 +196,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements setTitle("iDrop Transfer Client"); setBounds(new java.awt.Rectangle(0, 22, 900, 1000)); setMinimumSize(new java.awt.Dimension(900, 800)); + setResizable(false); lblHeader.setText("Most Recent iDrop Transfers"); @@ -210,6 +209,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements btnPurgeAll.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnPurgeAll.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnPurgeAll.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { btnPurgeAllActionPerformed(evt); } @@ -302,17 +302,19 @@ public class QueueManagerDialog extends javax.swing.JDialog implements org.jdesktop.layout.GroupLayout pnlTopLayout = new org.jdesktop.layout.GroupLayout(pnlTop); pnlTop.setLayout(pnlTopLayout); - pnlTopLayout.setHorizontalGroup( - pnlTopLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(lblHeader, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1115, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(toolbarQueueManagement, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1115, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - ); - pnlTopLayout.setVerticalGroup( - pnlTopLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTopLayout.createSequentialGroup() - .add(lblHeader) - .add(toolbarQueueManagement, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) - ); + pnlTopLayout.setHorizontalGroup(pnlTopLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(lblHeader, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1115, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(toolbarQueueManagement, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1115, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)); + pnlTopLayout.setVerticalGroup(pnlTopLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING).add( + pnlTopLayout + .createSequentialGroup() + .add(lblHeader) + .add(toolbarQueueManagement, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))); pnlCenter.setMinimumSize(new java.awt.Dimension(800, 200)); @@ -324,17 +326,9 @@ public class QueueManagerDialog extends javax.swing.JDialog implements jScrollPaneMaster.setPreferredSize(new java.awt.Dimension(454, 300)); jScrollPaneMaster.setRequestFocusEnabled(false); - jTableMaster.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - {null, null, null, null}, - {null, null, null, null}, - {null, null, null, null}, - {null, null, null, null} - }, - new String [] { - "Title 1", "Title 2", "Title 3", "Title 4" - } - )); + jTableMaster.setModel(new javax.swing.table.DefaultTableModel(new Object[][] { { null, null, null, null }, + { null, null, null, null }, { null, null, null, null }, { null, null, null, null } }, new String[] { + "Title 1", "Title 2", "Title 3", "Title 4" })); jTableMaster.setAutoCreateRowSorter(true); jTableMaster.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); jScrollPaneMaster.setViewportView(jTableMaster); @@ -410,27 +404,31 @@ public class QueueManagerDialog extends javax.swing.JDialog implements org.jdesktop.layout.GroupLayout pnlErrorMessageLayout = new org.jdesktop.layout.GroupLayout(pnlErrorMessage); pnlErrorMessage.setLayout(pnlErrorMessageLayout); - pnlErrorMessageLayout.setHorizontalGroup( - pnlErrorMessageLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlErrorMessageLayout.createSequentialGroup() - .add(69, 69, 69) - .add(jLabel1) - .add(42, 42, 42) - .add(scrollErrorMessage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 667, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(126, Short.MAX_VALUE)) - ); - pnlErrorMessageLayout.setVerticalGroup( - pnlErrorMessageLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlErrorMessageLayout.createSequentialGroup() - .addContainerGap(24, Short.MAX_VALUE) - .add(pnlErrorMessageLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(org.jdesktop.layout.GroupLayout.TRAILING, pnlErrorMessageLayout.createSequentialGroup() - .add(scrollErrorMessage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 72, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) - .add(org.jdesktop.layout.GroupLayout.TRAILING, pnlErrorMessageLayout.createSequentialGroup() + pnlErrorMessageLayout.setHorizontalGroup(pnlErrorMessageLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlErrorMessageLayout + .createSequentialGroup() + .add(69, 69, 69) .add(jLabel1) - .add(29, 29, 29)))) - ); + .add(42, 42, 42) + .add(scrollErrorMessage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 667, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).addContainerGap(126, Short.MAX_VALUE))); + pnlErrorMessageLayout.setVerticalGroup(pnlErrorMessageLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlErrorMessageLayout + .createSequentialGroup() + .addContainerGap(24, Short.MAX_VALUE) + .add(pnlErrorMessageLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(org.jdesktop.layout.GroupLayout.TRAILING, + pnlErrorMessageLayout + .createSequentialGroup() + .add(scrollErrorMessage, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 72, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap()) + .add(org.jdesktop.layout.GroupLayout.TRAILING, + pnlErrorMessageLayout.createSequentialGroup().add(jLabel1).add(29, 29, 29))))); pnlProgress.setBackground(javax.swing.UIManager.getDefaults().getColor("TabbedPane.shadow")); @@ -444,36 +442,37 @@ public class QueueManagerDialog extends javax.swing.JDialog implements org.jdesktop.layout.GroupLayout pnlProgressLayout = new org.jdesktop.layout.GroupLayout(pnlProgress); pnlProgress.setLayout(pnlProgressLayout); - pnlProgressLayout.setHorizontalGroup( - pnlProgressLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlProgressLayout.createSequentialGroup() - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .add(lblTransferred) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(lblCountSoFar, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 96, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(27, 27, 27) - .add(lblTransferredOutOf) - .add(18, 18, 18) - .add(lblCountOutOf, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 96, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(648, 648, 648)) - .add(pnlProgressLayout.createSequentialGroup() - .addContainerGap() - .add(progressBarQueueDetails, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 901, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) - ); - pnlProgressLayout.setVerticalGroup( - pnlProgressLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlProgressLayout.createSequentialGroup() - .addContainerGap() - .add(pnlProgressLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) - .add(lblTransferred) - .add(lblTransferredOutOf) - .add(lblCountOutOf) - .add(lblCountSoFar)) - .add(18, 18, 18) - .add(progressBarQueueDetails, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); + pnlProgressLayout.setHorizontalGroup(pnlProgressLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlProgressLayout + .createSequentialGroup() + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(lblTransferred) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(lblCountSoFar, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 96, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(27, 27, 27) + .add(lblTransferredOutOf) + .add(18, 18, 18) + .add(lblCountOutOf, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 96, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(648, 648, 648)) + .add(pnlProgressLayout + .createSequentialGroup() + .addContainerGap() + .add(progressBarQueueDetails, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 901, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).addContainerGap())); + pnlProgressLayout.setVerticalGroup(pnlProgressLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlProgressLayout + .createSequentialGroup() + .addContainerGap() + .add(pnlProgressLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(lblTransferred).add(lblTransferredOutOf).add(lblCountOutOf).add(lblCountSoFar)) + .add(18, 18, 18) + .add(progressBarQueueDetails, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); lblResourceLabel.setText("Resource:"); @@ -481,127 +480,182 @@ public class QueueManagerDialog extends javax.swing.JDialog implements org.jdesktop.layout.GroupLayout pnlTransferInfoLayout = new org.jdesktop.layout.GroupLayout(pnlTransferInfo); pnlTransferInfo.setLayout(pnlTransferInfoLayout); - pnlTransferInfoLayout.setHorizontalGroup( - pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTransferInfoLayout.createSequentialGroup() - .add(pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTransferInfoLayout.createSequentialGroup() - .add(pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false) - .add(org.jdesktop.layout.GroupLayout.TRAILING, pnlTransferInfoLayout.createSequentialGroup() - .add(88, 88, 88) - .add(lblTransferStatusLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 112, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(lblTransferStatus, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 177, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(88, 88, 88) - .add(lblErrorStatusLabel)) - .add(pnlTransferInfoLayout.createSequentialGroup() - .add(99, 99, 99) - .add(lblTransferTypeLabel) - .add(18, 18, 18) - .add(lblTransferType, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 119, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .add(lblResourceLabel))) - .add(18, 18, 18) - .add(pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTransferInfoLayout.createSequentialGroup() - .add(lblErrorStatus, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 181, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(31, 31, 31) - .add(lblTransferDateLabel) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(lblTransferDate, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 163, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) - .add(lblResource, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 181, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))) - .add(pnlTransferInfoLayout.createSequentialGroup() - .add(58, 58, 58) - .add(pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) - .add(lblLastGoodPathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 164, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblTargetPathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 142, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblSourcePathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 99, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false) - .add(jScrollPane1) - .add(jScrollPaneTargetPath, 0, 0, Short.MAX_VALUE) - .add(jScrollPaneSourcePath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 669, Short.MAX_VALUE)))) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .add(org.jdesktop.layout.GroupLayout.TRAILING, pnlTransferInfoLayout.createSequentialGroup() - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .add(pnlErrorMessage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(112, 112, 112)) - .add(pnlTransferInfoLayout.createSequentialGroup() - .add(9, 9, 9) - .add(pnlProgress, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1016, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - pnlTransferInfoLayout.setVerticalGroup( - pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTransferInfoLayout.createSequentialGroup() - .addContainerGap() - .add(pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) - .add(lblTransferStatusLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblTransferStatus, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblErrorStatusLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblErrorStatus) - .add(lblTransferDateLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblTransferDate, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) - .add(lblTransferTypeLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblTransferType, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblResourceLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(lblResource)) - .add(pnlTransferInfoLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) - .add(org.jdesktop.layout.GroupLayout.LEADING, pnlTransferInfoLayout.createSequentialGroup() - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(jScrollPaneSourcePath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 48, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(jScrollPaneTargetPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 46, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 46, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) - .add(pnlTransferInfoLayout.createSequentialGroup() + pnlTransferInfoLayout.setHorizontalGroup(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlTransferInfoLayout + .createSequentialGroup() + .add(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlTransferInfoLayout + .createSequentialGroup() + .add(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false) + .add(org.jdesktop.layout.GroupLayout.TRAILING, + pnlTransferInfoLayout + .createSequentialGroup() + .add(88, 88, 88) + .add(lblTransferStatusLabel, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + 112, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap( + org.jdesktop.layout.LayoutStyle.RELATED) + .add(lblTransferStatus, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + 177, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(88, 88, 88).add(lblErrorStatusLabel)) + .add(pnlTransferInfoLayout + .createSequentialGroup() + .add(99, 99, 99) + .add(lblTransferTypeLabel) + .add(18, 18, 18) + .add(lblTransferType, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 119, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + Short.MAX_VALUE).add(lblResourceLabel))) + .add(18, 18, 18) + .add(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlTransferInfoLayout + .createSequentialGroup() + .add(lblErrorStatus, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 181, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(31, 31, 31) + .add(lblTransferDateLabel) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(lblTransferDate, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 163, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) + .add(lblResource, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 181, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))) + .add(pnlTransferInfoLayout + .createSequentialGroup() + .add(58, 58, 58) + .add(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) + .add(lblLastGoodPathLabel, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 164, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(lblTargetPathLabel, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 142, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(lblSourcePathLabel, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 99, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false) + .add(jScrollPane1) + .add(jScrollPaneTargetPath, 0, 0, Short.MAX_VALUE) + .add(jScrollPaneSourcePath, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 669, + Short.MAX_VALUE)))) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .add(org.jdesktop.layout.GroupLayout.TRAILING, + pnlTransferInfoLayout + .createSequentialGroup() + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(pnlErrorMessage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(112, 112, 112)) + .add(pnlTransferInfoLayout + .createSequentialGroup() + .add(9, 9, 9) + .add(pnlProgress, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1016, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); + pnlTransferInfoLayout.setVerticalGroup(pnlTransferInfoLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlTransferInfoLayout + .createSequentialGroup() + .addContainerGap() + .add(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(lblTransferStatusLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(lblTransferStatus, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(lblErrorStatusLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(lblErrorStatus) + .add(lblTransferDateLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(lblTransferDate, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(lblSourcePathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 42, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(lblTargetPathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(lblTransferTypeLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(lblTransferType, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(lblResourceLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(lblResource)) + .add(pnlTransferInfoLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) + .add(org.jdesktop.layout.GroupLayout.LEADING, + pnlTransferInfoLayout + .createSequentialGroup() + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jScrollPaneSourcePath, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 48, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jScrollPaneTargetPath, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 46, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 46, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) + .add(pnlTransferInfoLayout + .createSequentialGroup() + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(lblSourcePathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 42, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(lblTargetPathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(lblLastGoodPathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 35, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))) + .add(32, 32, 32) + .add(pnlProgress, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 85, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) - .add(lblLastGoodPathLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 35, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))) - .add(32, 32, 32) - .add(pnlProgress, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 85, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) - .add(pnlErrorMessage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - - org.jdesktop.layout.GroupLayout pnlTransferDetailsSummaryLayout = new org.jdesktop.layout.GroupLayout(pnlTransferDetailsSummary); + .add(pnlErrorMessage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); + + org.jdesktop.layout.GroupLayout pnlTransferDetailsSummaryLayout = new org.jdesktop.layout.GroupLayout( + pnlTransferDetailsSummary); pnlTransferDetailsSummary.setLayout(pnlTransferDetailsSummaryLayout); - pnlTransferDetailsSummaryLayout.setHorizontalGroup( - pnlTransferDetailsSummaryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTransferDetailsSummaryLayout.createSequentialGroup() - .add(36, 36, 36) - .add(pnlTransferInfo, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1034, Short.MAX_VALUE) - .addContainerGap()) - ); - pnlTransferDetailsSummaryLayout.setVerticalGroup( - pnlTransferDetailsSummaryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTransferDetailsSummaryLayout.createSequentialGroup() - .addContainerGap() - .add(pnlTransferInfo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 481, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - - tabDetails.addTab("TransferSummary", null, pnlTransferDetailsSummary, "Summary information about the selected transfer"); + pnlTransferDetailsSummaryLayout.setHorizontalGroup(pnlTransferDetailsSummaryLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlTransferDetailsSummaryLayout.createSequentialGroup().add(36, 36, 36) + .add(pnlTransferInfo, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1034, Short.MAX_VALUE) + .addContainerGap())); + pnlTransferDetailsSummaryLayout.setVerticalGroup(pnlTransferDetailsSummaryLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlTransferDetailsSummaryLayout + .createSequentialGroup() + .addContainerGap() + .add(pnlTransferInfo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 481, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); + + tabDetails.addTab("TransferSummary", null, pnlTransferDetailsSummary, + "Summary information about the selected transfer"); jScrollPaneDetails.setPreferredSize(new java.awt.Dimension(454, 200)); - jTableDetails.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - {null, null, null, null}, - {null, null, null, null}, - {null, null, null, null}, - {null, null, null, null} - }, - new String [] { - "Title 1", "Title 2", "Title 3", "Title 4" - } - )); + jTableDetails.setModel(new javax.swing.table.DefaultTableModel(new Object[][] { { null, null, null, null }, + { null, null, null, null }, { null, null, null, null }, { null, null, null, null } }, new String[] { + "Title 1", "Title 2", "Title 3", "Title 4" })); jTableDetails.setAutoCreateRowSorter(true); jTableDetails.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); jScrollPaneDetails.setViewportView(jTableDetails); @@ -627,45 +681,44 @@ public class QueueManagerDialog extends javax.swing.JDialog implements org.jdesktop.layout.GroupLayout pnlViewRadioLayout = new org.jdesktop.layout.GroupLayout(pnlViewRadio); pnlViewRadio.setLayout(pnlViewRadioLayout); - pnlViewRadioLayout.setHorizontalGroup( - pnlViewRadioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlViewRadioLayout.createSequentialGroup() - .add(9, 9, 9) - .add(radioShowAll) - .add(5, 5, 5) - .add(radioShowError) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - pnlViewRadioLayout.setVerticalGroup( - pnlViewRadioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlViewRadioLayout.createSequentialGroup() - .add(5, 5, 5) - .add(pnlViewRadioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(radioShowAll) - .add(radioShowError))) - ); - - org.jdesktop.layout.GroupLayout pnlTrnasferDetailsTableLayout = new org.jdesktop.layout.GroupLayout(pnlTrnasferDetailsTable); + pnlViewRadioLayout.setHorizontalGroup(pnlViewRadioLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlViewRadioLayout.createSequentialGroup().add(9, 9, 9).add(radioShowAll).add(5, 5, 5) + .add(radioShowError) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); + pnlViewRadioLayout.setVerticalGroup(pnlViewRadioLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlViewRadioLayout + .createSequentialGroup() + .add(5, 5, 5) + .add(pnlViewRadioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(radioShowAll).add(radioShowError)))); + + org.jdesktop.layout.GroupLayout pnlTrnasferDetailsTableLayout = new org.jdesktop.layout.GroupLayout( + pnlTrnasferDetailsTable); pnlTrnasferDetailsTable.setLayout(pnlTrnasferDetailsTableLayout); - pnlTrnasferDetailsTableLayout.setHorizontalGroup( - pnlTrnasferDetailsTableLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(org.jdesktop.layout.GroupLayout.TRAILING, pnlTrnasferDetailsTableLayout.createSequentialGroup() - .addContainerGap(401, Short.MAX_VALUE) - .add(pnlViewRadio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(367, 367, 367)) - .add(pnlTrnasferDetailsTableLayout.createSequentialGroup() - .add(20, 20, 20) - .add(jScrollPaneDetails, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1070, Short.MAX_VALUE)) - ); - pnlTrnasferDetailsTableLayout.setVerticalGroup( - pnlTrnasferDetailsTableLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTrnasferDetailsTableLayout.createSequentialGroup() - .add(22, 22, 22) - .add(pnlViewRadio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 43, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(18, 18, 18) - .add(jScrollPaneDetails, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 451, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); + pnlTrnasferDetailsTableLayout.setHorizontalGroup(pnlTrnasferDetailsTableLayout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(org.jdesktop.layout.GroupLayout.TRAILING, + pnlTrnasferDetailsTableLayout + .createSequentialGroup() + .addContainerGap(401, Short.MAX_VALUE) + .add(pnlViewRadio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(367, 367, 367)) + .add(pnlTrnasferDetailsTableLayout.createSequentialGroup().add(20, 20, 20) + .add(jScrollPaneDetails, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1070, Short.MAX_VALUE))); + pnlTrnasferDetailsTableLayout.setVerticalGroup(pnlTrnasferDetailsTableLayout.createParallelGroup( + org.jdesktop.layout.GroupLayout.LEADING).add( + pnlTrnasferDetailsTableLayout + .createSequentialGroup() + .add(22, 22, 22) + .add(pnlViewRadio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 43, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(18, 18, 18) + .add(jScrollPaneDetails, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 451, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); tabDetails.addTab("Transfer Details", pnlTrnasferDetailsTable); @@ -673,20 +726,19 @@ public class QueueManagerDialog extends javax.swing.JDialog implements org.jdesktop.layout.GroupLayout pnlCenterLayout = new org.jdesktop.layout.GroupLayout(pnlCenter); pnlCenter.setLayout(pnlCenterLayout); - pnlCenterLayout.setHorizontalGroup( - pnlCenterLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlCenterLayout.createSequentialGroup() - .addContainerGap() - .add(splitQueueTableMasterAndDetail, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1115, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(33, Short.MAX_VALUE)) - ); - pnlCenterLayout.setVerticalGroup( - pnlCenterLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlCenterLayout.createSequentialGroup() - .addContainerGap() - .add(splitQueueTableMasterAndDetail, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 766, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); + pnlCenterLayout.setHorizontalGroup(pnlCenterLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlCenterLayout + .createSequentialGroup() + .addContainerGap() + .add(splitQueueTableMasterAndDetail, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 1115, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).addContainerGap(33, Short.MAX_VALUE))); + pnlCenterLayout.setVerticalGroup(pnlCenterLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlCenterLayout + .createSequentialGroup() + .addContainerGap() + .add(splitQueueTableMasterAndDetail, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 766, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); jMenu1.setText("File"); jMenuBar1.add(jMenu1); @@ -742,88 +794,84 @@ public class QueueManagerDialog extends javax.swing.JDialog implements org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane()); getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(pnlTop, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(layout.createSequentialGroup() - .add(20, 20, 20) - .add(pnlCenter, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) - ); - layout.setVerticalGroup( - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(layout.createSequentialGroup() - .add(pnlTop, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(pnlCenter, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) - ); + layout.setHorizontalGroup(layout + .createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlTop, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(layout + .createSequentialGroup() + .add(20, 20, 20) + .add(pnlCenter, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))); + layout.setVerticalGroup(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING).add( + layout.createSequentialGroup() + .add(pnlTop, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(pnlCenter, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, + org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, + org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).addContainerGap())); pack(); }// </editor-fold>//GEN-END:initComponents - private void radioShowAllActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_radioShowAllActionPerformed + private void radioShowAllActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_radioShowAllActionPerformed if (radioShowAll.isSelected()) { adjustDetails(); } }// GEN-LAST:event_radioShowAllActionPerformed - private void radioShowErrorActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_radioShowErrorActionPerformed + private void radioShowErrorActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_radioShowErrorActionPerformed if (radioShowError.isSelected()) { adjustDetails(); } }// GEN-LAST:event_radioShowErrorActionPerformed - private void jMenuCurrentActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuCurrentActionPerformed + private void jMenuCurrentActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuCurrentActionPerformed refreshTableView(QueueManagerDialog.ViewType.CURRENT); }// GEN-LAST:event_jMenuCurrentActionPerformed - private void jMenuRecentActionPerformed(final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuRecentActionPerformed + private void jMenuRecentActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuRecentActionPerformed refreshTableView(QueueManagerDialog.ViewType.RECENT); }// GEN-LAST:event_jMenuRecentActionPerformed - private void jMenuErrorActionPerformed(final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuErrorActionPerformed + private void jMenuErrorActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuErrorActionPerformed refreshTableView(QueueManagerDialog.ViewType.ERROR); }// GEN-LAST:event_jMenuErrorActionPerformed - private void jMenuWarningActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuWarningActionPerformed + private void jMenuWarningActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jMenuWarningActionPerformed refreshTableView(QueueManagerDialog.ViewType.WARNING); }// GEN-LAST:event_jMenuWarningActionPerformed - private void btnPurgeAllActionPerformed(final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnPurgeAllActionPerformed + private void btnPurgeAllActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnPurgeAllActionPerformed try { iDropParent.getiDropCore().getTransferManager().purgeAllTransfers(); refreshTableView(viewType); resetDisplayFieldsAndStatus(); } catch (Exception ex) { - Logger.getLogger(QueueManagerDialog.class.getName()).log( - Level.SEVERE, null, ex); + Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); iDropParent.showIdropException(ex); } }// GEN-LAST:event_btnPurgeAllActionPerformed - private void btnPurgeSuccessfulActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnPurgeSuccessfulActionPerformed + private void btnPurgeSuccessfulActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnPurgeSuccessfulActionPerformed try { iDropParent.getiDropCore().getTransferManager().purgeSuccessfulTransfers(); refreshTableView(viewType); resetDisplayFieldsAndStatus(); } catch (Exception ex) { - Logger.getLogger(QueueManagerDialog.class.getName()).log( - Level.SEVERE, null, ex); + Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); iDropParent.showIdropException(ex); } }// GEN-LAST:event_btnPurgeSuccessfulActionPerformed - private void btnDeleteSelectedActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnDeleteSelectedActionPerformed + private void btnDeleteSelectedActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnDeleteSelectedActionPerformed // TODO add your handling code here: if (jTableMaster.getSelectedRow() > -1) { log.info("no row selected"); @@ -841,8 +889,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements }// GEN-LAST:event_btnDeleteSelectedActionPerformed - private void btnRestartSelectedActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnRestartSelectedActionPerformed + private void btnRestartSelectedActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnRestartSelectedActionPerformed if (jTableMaster.getSelectedRow() == -1) { log.info("restart, no transfer selected"); @@ -859,8 +906,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements try { transferManager.restartTransfer(selectedTransfer); } catch (Exception ex) { - Logger.getLogger(QueueManagerDialog.class.getName()).log( - Level.SEVERE, null, ex); + Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); iDropParent.showIdropException(ex); } @@ -869,8 +915,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements }// GEN-LAST:event_btnRestartSelectedActionPerformed - private void btnResubmitSelectedActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnResubmitSelectedActionPerformed + private void btnResubmitSelectedActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnResubmitSelectedActionPerformed if (jTableMaster.getSelectedRow() == -1) { log.info("resubmit, no transfer selected"); @@ -887,8 +932,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements try { transferManager.resubmitTransfer(selectedTransfer); } catch (Exception ex) { - Logger.getLogger(QueueManagerDialog.class.getName()).log( - Level.SEVERE, null, ex); + Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); iDropParent.showIdropException(ex); } @@ -898,8 +942,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements }// GEN-LAST:event_btnResubmitSelectedActionPerformed - private void btnCancelSelectedActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnCancelSelectedActionPerformed + private void btnCancelSelectedActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnCancelSelectedActionPerformed if (jTableMaster.getSelectedRow() == -1) { log.info("cancel, no transfer selected"); @@ -917,8 +960,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements transferManager.cancelTransfer(selectedTransfer); refreshTableView(this.getViewType()); } catch (Exception ex) { - Logger.getLogger(QueueManagerDialog.class.getName()).log( - Level.SEVERE, null, ex); + Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); iDropParent.showIdropException(ex); } @@ -928,13 +970,11 @@ public class QueueManagerDialog extends javax.swing.JDialog implements }// GEN-LAST:event_btnCancelSelectedActionPerformed - private void btnRefreshViewActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnRefreshViewActionPerformed + private void btnRefreshViewActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnRefreshViewActionPerformed refreshTableView(this.getViewType()); }// GEN-LAST:event_btnRefreshViewActionPerformed - private void toggleAutoRefreshActionPerformed( - final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_toggleAutoRefreshActionPerformed + private void toggleAutoRefreshActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_toggleAutoRefreshActionPerformed if (toggleAutoRefresh.isSelected()) { // launch auto refresh thread @@ -943,11 +983,9 @@ public class QueueManagerDialog extends javax.swing.JDialog implements refreshQueueTimer = new Timer(); try { refreshQueueManagerTimerTask = RefreshQueueManagerTimerTask.instance(this); - refreshQueueTimer.scheduleAtFixedRate( - refreshQueueManagerTimerTask, 0, 10000); + refreshQueueTimer.scheduleAtFixedRate(refreshQueueManagerTimerTask, 0, 10000); } catch (IdropException ex) { - Logger.getLogger(iDrop.class.getName()).log(Level.SEVERE, null, - ex); + Logger.getLogger(iDrop.class.getName()).log(Level.SEVERE, null, ex); iDropParent.showIdropException(ex); return; } @@ -963,10 +1001,9 @@ public class QueueManagerDialog extends javax.swing.JDialog implements }// GEN-LAST:event_toggleAutoRefreshActionPerformed /** - * Refresh the data in the queue table from the database. This method will - * automatically maintain the view on whatever the currently selected - * transfer is. If that transfer is not in the view, it will select the - * first transfer depicted. + * Refresh the data in the queue table from the database. This method will automatically maintain the view on + * whatever the currently selected transfer is. If that transfer is not in the view, it will select the first + * transfer depicted. * * @param viewType */ @@ -1005,8 +1042,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements if (viewType == ViewType.CURRENT) { try { transferQueue = transferManager.getCurrentQueue(); - queueManagerDialog.getLblHeader().setText( - "Current transfer queue"); + queueManagerDialog.getLblHeader().setText("Current transfer queue"); } catch (Exception ex) { Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); @@ -1015,8 +1051,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements } else if (viewType == ViewType.RECENT) { try { transferQueue = transferManager.getRecentQueue(); - queueManagerDialog.getLblHeader().setText( - "Recent transfer activity"); + queueManagerDialog.getLblHeader().setText("Recent transfer activity"); } catch (Exception ex) { Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); @@ -1025,8 +1060,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements } else if (viewType == ViewType.ERROR) { try { transferQueue = transferManager.getErrorQueue(); - queueManagerDialog.getLblHeader().setText( - "Transfer activities with errors"); + queueManagerDialog.getLblHeader().setText("Transfer activities with errors"); } catch (Exception ex) { Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); @@ -1035,8 +1069,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements } else if (viewType == ViewType.WARNING) { try { transferQueue = transferManager.getWarningQueue(); - queueManagerDialog.getLblHeader().setText( - "Transfer activities with warnings"); + queueManagerDialog.getLblHeader().setText("Transfer activities with warnings"); } catch (Exception ex) { Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); @@ -1047,13 +1080,11 @@ public class QueueManagerDialog extends javax.swing.JDialog implements queueManagerDialog.setViewType(viewType); if (transferQueue != null) { - jTableMaster.setModel(new QueueManagerMasterTableModel( - transferQueue)); + jTableMaster.setModel(new QueueManagerMasterTableModel(transferQueue)); int matchingRowForSelected = -1; if (selectedMasterTableObject != null) { - // previously selected table, refresh display, first, - // selecting same row + // previously selected table, refresh display, first, selecting same row LocalIRODSTransfer transfer; for (int i = 0; i < jTableMaster.getModel().getRowCount(); i++) { @@ -1068,8 +1099,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements if (matchingRowForSelected != -1) { int selectedRowIndex = jTableMaster.convertRowIndexToView(matchingRowForSelected); if (selectedRowIndex != -1) { - jTableMaster.setRowSelectionInterval( - selectedRowIndex, selectedRowIndex); + jTableMaster.setRowSelectionInterval(selectedRowIndex, selectedRowIndex); } } @@ -1085,90 +1115,156 @@ public class QueueManagerDialog extends javax.swing.JDialog implements }); } + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnCancelSelected; + private javax.swing.JButton btnDeleteSelected; + private javax.swing.ButtonGroup btnGroupDetailsDisplay; + private javax.swing.JButton btnPurgeAll; + private javax.swing.JButton btnPurgeSuccessful; + private javax.swing.JButton btnRefreshView; + private javax.swing.JButton btnRestartSelected; + private javax.swing.JButton btnResubmitSelected; + private javax.swing.JLabel jLabel1; + private javax.swing.JMenu jMenu1; + private javax.swing.JMenu jMenu2; + private javax.swing.JMenuBar jMenuBar1; + private javax.swing.JMenuItem jMenuCurrent; + private javax.swing.JMenuItem jMenuError; + private javax.swing.JMenuItem jMenuRecent; + private javax.swing.JMenu jMenuView; + private javax.swing.JMenuItem jMenuWarning; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JScrollPane jScrollPaneDetails; + private javax.swing.JScrollPane jScrollPaneMaster; + private javax.swing.JScrollPane jScrollPaneSourcePath; + private javax.swing.JScrollPane jScrollPaneTargetPath; + private javax.swing.JToolBar.Separator jSeparator1; + private javax.swing.JToolBar.Separator jSeparator2; + private javax.swing.JToolBar.Separator jSeparator3; + private javax.swing.JTable jTableDetails; + private javax.swing.JTable jTableMaster; + private javax.swing.JLabel lblCountOutOf; + private javax.swing.JLabel lblCountSoFar; + private javax.swing.JLabel lblErrorStatus; + private javax.swing.JLabel lblErrorStatusLabel; + private javax.swing.JLabel lblHeader; + private javax.swing.JLabel lblLastGoodPathLabel; + private javax.swing.JLabel lblResource; + private javax.swing.JLabel lblResourceLabel; + private javax.swing.JLabel lblSourcePathLabel; + private javax.swing.JLabel lblTargetPathLabel; + private javax.swing.JLabel lblTransferDate; + private javax.swing.JLabel lblTransferDateLabel; + private javax.swing.JLabel lblTransferStatus; + private javax.swing.JLabel lblTransferStatusLabel; + private javax.swing.JLabel lblTransferType; + private javax.swing.JLabel lblTransferTypeLabel; + private javax.swing.JLabel lblTransferred; + private javax.swing.JLabel lblTransferredOutOf; + private javax.swing.JPanel pnlCenter; + private javax.swing.JPanel pnlErrorMessage; + private javax.swing.JPanel pnlProgress; + private javax.swing.JPanel pnlTop; + private javax.swing.JPanel pnlTransferDetailsSummary; + private javax.swing.JPanel pnlTransferInfo; + private javax.swing.JPanel pnlTrnasferDetailsTable; + private javax.swing.JPanel pnlViewRadio; + private javax.swing.JProgressBar progressBarQueueDetails; + private javax.swing.JRadioButton radioShowAll; + private javax.swing.JRadioButton radioShowError; + private javax.swing.JScrollPane scrollErrorMessage; + private javax.swing.JSplitPane splitQueueTableMasterAndDetail; + private javax.swing.JTabbedPane tabDetails; + private javax.swing.JToggleButton toggleAutoRefresh; + private javax.swing.JToolBar toolbarQueueManagement; + private javax.swing.JTextArea txtAreaErrorMessage; + private javax.swing.JTextArea txtLastGoodPath; + private javax.swing.JTextArea txtSourcePath; + private javax.swing.JTextArea txtTargetPath; + // End of variables declaration//GEN-END:variables + public JLabel getLblHeader() { return lblHeader; } - public void setLblHeader(final JLabel lblHeader) { + public void setLblHeader(JLabel lblHeader) { this.lblHeader = lblHeader; } @Override - public void valueChanged(final ListSelectionEvent e) { + public void valueChanged(ListSelectionEvent e) { if (e.getValueIsAdjusting()) { return; } - if (e.getFirstIndex() == -1 || e.getLastIndex() == -1 - || jTableMaster.getSelectedRow() == -1) { + if (e.getFirstIndex() == -1 || e.getLastIndex() == -1 || jTableMaster.getSelectedRow() == -1) { return; } @@ -1178,7 +1274,8 @@ public class QueueManagerDialog extends javax.swing.JDialog implements } private void adjustDetails() { - final LocalIRODSTransfer localIRODSTransfer = ((QueueManagerMasterTableModel) jTableMaster.getModel()).getTransferAtRow(jTableMaster.getSelectedRow()); + final LocalIRODSTransfer localIRODSTransfer = ((QueueManagerMasterTableModel) jTableMaster.getModel()) + .getTransferAtRow(jTableMaster.getSelectedRow()); log.info("selected transfer:{}", localIRODSTransfer); final boolean showAll = radioShowAll.isSelected(); @@ -1193,8 +1290,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements lblErrorStatus.setText(localIRODSTransfer.getTransferStatus().toString()); lblResource.setText(localIRODSTransfer.getTransferResource()); - // set source and target properly based on activity (put, get, - // etc) + // set source and target properly based on activity (put, get, etc) switch (localIRODSTransfer.getTransferType()) { case GET: txtSourcePath.setText(localIRODSTransfer.getIrodsAbsolutePath()); @@ -1213,8 +1309,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements txtTargetPath.setText(localIRODSTransfer.getIrodsAbsolutePath()); break; default: - log.error( - "unable to build details for transfer with transfer type of:{}", + log.error("unable to build details for transfer with transfer type of:{}", localIRODSTransfer.getTransferType()); iDropParent.showIdropException(new IdropException( "unable to build details for this transfer type")); @@ -1222,8 +1317,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements } txtLastGoodPath.setText(localIRODSTransfer.getLastSuccessfulPath()); - log.debug("total files transferred:{}", - localIRODSTransfer.getTotalFilesTransferredSoFar()); + log.debug("total files transferred:{}", localIRODSTransfer.getTotalFilesTransferredSoFar()); log.debug("out of: {}", localIRODSTransfer.getTotalFilesCount()); lblCountSoFar.setText(String.valueOf(localIRODSTransfer.getTotalFilesTransferredSoFar())); lblCountOutOf.setText(String.valueOf(localIRODSTransfer.getTotalFilesCount())); @@ -1238,24 +1332,22 @@ public class QueueManagerDialog extends javax.swing.JDialog implements pnlErrorMessage.setVisible(false); } - // initialize the detail values via hibernate (they are lazily - // loaded) + // 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()))); + jTableDetails.setModel(new QueueManagerDetailTableModel(transferManager + .getAllTransferItemsForTransfer(localIRODSTransfer.getId()))); } else { - jTableDetails.setModel(new QueueManagerDetailTableModel( - transferManager.getErrorTransferItemsForTransfer(localIRODSTransfer.getId()))); + jTableDetails.setModel(new QueueManagerDetailTableModel(transferManager + .getErrorTransferItemsForTransfer(localIRODSTransfer.getId()))); } } catch (Exception ex) { - Logger.getLogger(QueueManagerDialog.class.getName()).log( - Level.SEVERE, null, ex); + Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); iDropParent.showIdropException(ex); return; } @@ -1305,8 +1397,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements sb.append(localIRODSTransfer.toString()); // default icon, custom title - int n = JOptionPane.showConfirmDialog(this, sb.toString(), - "Delete Confirmation", JOptionPane.YES_NO_OPTION); + int n = JOptionPane.showConfirmDialog(this, sb.toString(), "Delete Confirmation", JOptionPane.YES_NO_OPTION); return n; } @@ -1318,8 +1409,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements sb.append(localIRODSTransfer.toString()); // default icon, custom title - int n = JOptionPane.showConfirmDialog(this, sb.toString(), - "Restart Confirmation", JOptionPane.YES_NO_OPTION); + int n = JOptionPane.showConfirmDialog(this, sb.toString(), "Restart Confirmation", JOptionPane.YES_NO_OPTION); return n; } @@ -1328,8 +1418,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements try { iDropParent.getiDropCore().getTransferManager().resetStatus(); } catch (Exception ex) { - Logger.getLogger(QueueManagerDialog.class.getName()).log( - Level.SEVERE, null, ex); + Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex); // log and continue...not useful to user } 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 bdf7ba2..c85ffe6 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 @@ -53,6 +53,7 @@ import org.irods.jargon.core.pub.DataObjectAO; import org.irods.jargon.core.pub.domain.Collection; import org.irods.jargon.core.pub.domain.DataObject; import org.irods.jargon.core.query.CollectionAndDataObjectListingEntry; +import org.irods.jargon.core.query.MetaDataAndDomainData; import org.irods.jargon.core.query.MetaDataAndDomainData.MetadataDomain; import org.irods.jargon.core.transfer.TransferStatus; import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService; @@ -2340,7 +2341,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, log.info("processing tags for collection"); Collection collection = (Collection) lastCachedItemToProcessTagsFor; IRODSTagGrouping irodsTagGrouping = new IRODSTagGrouping( - MetadataDomain.COLLECTION, collection.getCollectionName(), + MetaDataAndDomainData.MetadataDomain.COLLECTION, collection.getCollectionName(), txtTags.getText(), getIrodsAccount().getUserName()); log.debug("new tag set is:{}", txtTags.getText()); freeTaggingService.updateTags(irodsTagGrouping); diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java index daae8df..1a449b9 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java @@ -16,7 +16,6 @@ import org.irods.jargon.idrop.exceptions.IdropException; import org.irods.jargon.transfer.TransferEngineException; import org.irods.jargon.transfer.TransferServiceFactoryImpl; import org.irods.jargon.transfer.dao.domain.ConfigurationProperty; -import org.irods.jargon.transfer.dao.domain.SynchConfiguration; import org.irods.jargon.transfer.dao.domain.Synchronization; import org.irods.jargon.transfer.engine.ConfigurationService; import org.irods.jargon.transfer.engine.synch.ConflictingSynchException; diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form index fe61f4c..75b83e9 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form @@ -253,12 +253,19 @@ </Constraint> </Constraints> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> <SubComponents> <Container class="javax.swing.JPanel" name="pnlSynchData"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo"> + <LineBorder/> + </Border> + </Property> + </Properties> <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="Center"/> + <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"/> </Constraint> </Constraints> @@ -271,11 +278,11 @@ </Constraint> </Constraints> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> <SubComponents> <Component class="javax.swing.JTextField" name="txtLocalPath"> <Properties> - <Property name="columns" type="int" value="80"/> + <Property name="columns" type="int" value="60"/> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtLocalPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> </Property> @@ -286,6 +293,11 @@ <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtLocalPathActionPerformed"/> </Events> + <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"/> + </Constraint> + </Constraints> </Component> <Component class="javax.swing.JButton" name="btnChooseLocalSynch"> <Properties> @@ -300,6 +312,60 @@ <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseLocalSynchActionPerformed"/> </Events> + <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"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="pnlIrodsSynch"> + <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="9" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="10" anchor="17" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JTextField" name="txtIrodsPath"> + <Properties> + <Property name="columns" type="int" value="60"/> + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtIrodsPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtIrodsPath.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtIrodsPathActionPerformed"/> + </Events> + <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"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="btnChooseIrodsSynch"> + <Properties> + <Property name="mnemonic" type="int" value="105"/> + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseIrodsSynch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseIrodsSynch.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseIrodsSynchActionPerformed"/> + </Events> + <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"/> + </Constraint> + </Constraints> </Component> </SubComponents> </Container> @@ -407,45 +473,6 @@ </Component> </SubComponents> </Container> - <Container class="javax.swing.JPanel" name="pnlIrodsSynch"> - <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="9" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="10" anchor="17" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/> - <SubComponents> - <Component class="javax.swing.JTextField" name="txtIrodsPath"> - <Properties> - <Property name="columns" type="int" value="80"/> - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtIrodsPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtIrodsPath.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtIrodsPathActionPerformed"/> - </Events> - </Component> - <Component class="javax.swing.JButton" name="btnChooseIrodsSynch"> - <Properties> - <Property name="mnemonic" type="int" value="105"/> - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseIrodsSynch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseIrodsSynch.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseIrodsSynchActionPerformed"/> - </Events> - </Component> - </SubComponents> - </Container> </SubComponents> </Container> </SubComponents> diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java index 7274d6c..96644bc 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java @@ -24,6 +24,7 @@ import org.irods.jargon.transfer.dao.domain.FrequencyType; import org.irods.jargon.transfer.dao.domain.Synchronization; import org.irods.jargon.transfer.dao.domain.SynchronizationType; import org.irods.jargon.transfer.engine.synch.ConflictingSynchException; +import org.irods.jargon.transfer.engine.synch.SynchException; import org.openide.util.Exceptions; import org.slf4j.LoggerFactory; @@ -100,6 +101,9 @@ public class SetupWizard extends javax.swing.JDialog { pnlLocalSynch = new javax.swing.JPanel(); txtLocalPath = new javax.swing.JTextField(); btnChooseLocalSynch = new javax.swing.JButton(); + pnlIrodsSynch = new javax.swing.JPanel(); + txtIrodsPath = new javax.swing.JTextField(); + btnChooseIrodsSynch = new javax.swing.JButton(); pnlSynchMode = new javax.swing.JPanel(); jLabel1 = new javax.swing.JLabel(); radioBackup = new javax.swing.JRadioButton(); @@ -108,9 +112,6 @@ public class SetupWizard extends javax.swing.JDialog { pnlSynchFrequency = new javax.swing.JPanel(); jLabel5 = new javax.swing.JLabel(); jcomboSynchFrequency = new javax.swing.JComboBox(); - pnlIrodsSynch = new javax.swing.JPanel(); - txtIrodsPath = new javax.swing.JTextField(); - btnChooseIrodsSynch = new javax.swing.JButton(); pnlWizardToolbar = new javax.swing.JPanel(); btnBack = new javax.swing.JButton(); btnForward = new javax.swing.JButton(); @@ -194,11 +195,14 @@ public class SetupWizard extends javax.swing.JDialog { pnlInitialSynchSetup.add(pnlInitialSynchSetupQuestion, java.awt.BorderLayout.CENTER); - pnlInitialSynchSetupAnswer.setLayout(new java.awt.BorderLayout()); + pnlInitialSynchSetupAnswer.setLayout(new java.awt.GridBagLayout()); + pnlSynchData.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); pnlSynchData.setLayout(new java.awt.GridBagLayout()); - txtLocalPath.setColumns(80); + pnlLocalSynch.setLayout(new java.awt.GridBagLayout()); + + txtLocalPath.setColumns(60); txtLocalPath.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtLocalPath.text")); // NOI18N txtLocalPath.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtLocalPath.toolTipText")); // NOI18N txtLocalPath.addActionListener(new java.awt.event.ActionListener() { @@ -206,7 +210,7 @@ public class SetupWizard extends javax.swing.JDialog { txtLocalPathActionPerformed(evt); } }); - pnlLocalSynch.add(txtLocalPath); + pnlLocalSynch.add(txtLocalPath, new java.awt.GridBagConstraints()); btnChooseLocalSynch.setMnemonic('c'); btnChooseLocalSynch.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnChooseLocalSynch.text")); // NOI18N @@ -216,7 +220,7 @@ public class SetupWizard extends javax.swing.JDialog { btnChooseLocalSynchActionPerformed(evt); } }); - pnlLocalSynch.add(btnChooseLocalSynch); + pnlLocalSynch.add(btnChooseLocalSynch, new java.awt.GridBagConstraints()); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; @@ -227,6 +231,37 @@ public class SetupWizard extends javax.swing.JDialog { gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 10); pnlSynchData.add(pnlLocalSynch, gridBagConstraints); + pnlIrodsSynch.setLayout(new java.awt.GridBagLayout()); + + txtIrodsPath.setColumns(60); + txtIrodsPath.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtIrodsPath.text")); // NOI18N + txtIrodsPath.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtIrodsPath.toolTipText")); // NOI18N + txtIrodsPath.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + txtIrodsPathActionPerformed(evt); + } + }); + pnlIrodsSynch.add(txtIrodsPath, new java.awt.GridBagConstraints()); + + btnChooseIrodsSynch.setMnemonic('i'); + btnChooseIrodsSynch.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnChooseIrodsSynch.text")); // NOI18N + btnChooseIrodsSynch.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnChooseIrodsSynch.toolTipText")); // NOI18N + btnChooseIrodsSynch.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnChooseIrodsSynchActionPerformed(evt); + } + }); + pnlIrodsSynch.add(btnChooseIrodsSynch, new java.awt.GridBagConstraints()); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.gridwidth = 9; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 10); + pnlSynchData.add(pnlIrodsSynch, gridBagConstraints); + pnlSynchMode.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); pnlSynchMode.setLayout(new java.awt.GridLayout(0, 1)); @@ -275,36 +310,7 @@ public class SetupWizard extends javax.swing.JDialog { gridBagConstraints.insets = new java.awt.Insets(20, 20, 20, 20); pnlSynchData.add(pnlSynchFrequency, gridBagConstraints); - txtIrodsPath.setColumns(80); - txtIrodsPath.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtIrodsPath.text")); // NOI18N - txtIrodsPath.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtIrodsPath.toolTipText")); // NOI18N - txtIrodsPath.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - txtIrodsPathActionPerformed(evt); - } - }); - pnlIrodsSynch.add(txtIrodsPath); - - btnChooseIrodsSynch.setMnemonic('i'); - btnChooseIrodsSynch.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnChooseIrodsSynch.text")); // NOI18N - btnChooseIrodsSynch.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnChooseIrodsSynch.toolTipText")); // NOI18N - btnChooseIrodsSynch.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - btnChooseIrodsSynchActionPerformed(evt); - } - }); - pnlIrodsSynch.add(btnChooseIrodsSynch); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 5; - gridBagConstraints.gridwidth = 9; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 10); - pnlSynchData.add(pnlIrodsSynch, gridBagConstraints); - - pnlInitialSynchSetupAnswer.add(pnlSynchData, java.awt.BorderLayout.CENTER); + pnlInitialSynchSetupAnswer.add(pnlSynchData, new java.awt.GridBagConstraints()); pnlInitialSynchSetup.add(pnlInitialSynchSetupAnswer, java.awt.BorderLayout.SOUTH); @@ -355,10 +361,10 @@ public class SetupWizard extends javax.swing.JDialog { * @param evt */ private void btnSeeSystemTrayYesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSeeSystemTrayYesActionPerformed - saveSeeSystemTrayYas(); + saveSeeSystemTrayYes(); } - private void saveSeeSystemTrayYas() throws IdropRuntimeException { + private void saveSeeSystemTrayYes () throws IdropRuntimeException { log.info("indicates system try shown, set to not load gui"); try { idropConfigurationService.updateConfig(IdropConfigurationService.SHOW_GUI, "false"); @@ -454,7 +460,7 @@ public class SetupWizard extends javax.swing.JDialog { // forward acts differently according to the current tab if (tabWizardTabs.getSelectedIndex() == 0) { // advance from 'can you see icon' - saveSeeSystemTrayYas(); + saveSeeSystemTrayYes(); } else if (tabWizardTabs.getSelectedIndex() == 1) { // advance tabs from 'name device; saveDeviceName(); @@ -499,9 +505,26 @@ public class SetupWizard extends javax.swing.JDialog { finishWizard(); return; } - + tabAdvancing = true; tabWizardTabs.setSelectedIndex(currentTab); + + // for synch setup, if a synch exists, do not allow setup + if (currentTab == 2) { + try { + if (idropCore.getTransferManager().getTransferServiceFactory().instanceSynchManagerService().listAllSynchronizations().size() > 0) { + log.info("synch already present, skip"); + finishWizard(); + return; + } else { + log.info("will proceed to synch setup wizard"); + } + } catch (SynchException ex) { + log.error("error looking for existing synchs", ex); + throw new IdropRuntimeException(ex); + } + } + tabStep = currentTab; } |