summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-07-06 12:24:42 (GMT)
committer Mike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-07-06 12:24:42 (GMT)
commit0c8b4b286f8be3100105bc80ed63578d5ce296f7 (patch)
tree7d952fe7fa7ec249a6a9c63f06a4cb10b716e212
parent55c7ce6758708b4a3362eff62ada9fdb4ae56355 (diff)
downloadQCG-Data-0c8b4b286f8be3100105bc80ed63578d5ce296f7.zip
QCG-Data-0c8b4b286f8be3100105bc80ed63578d5ce296f7.tar.gz
QCG-Data-0c8b4b286f8be3100105bc80ed63578d5ce296f7.tar.bz2
[#321] progress bar not clearing at begin of txfr
-rw-r--r--idrop-swing/release_notes.txt1
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java301
2 files changed, 85 insertions, 217 deletions
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index b9db52f..b23a782 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -11,4 +11,5 @@ work in progress -- Milestone 0.9.8
* [#316] feedback on tree node expansion
*[#313] info not synchronizing on tree select
*[#315] delete nodes in ll, refresh issue?
+*[#321] progress bar not clearing at begin of txfr
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java
index 77803c0..8948ab5 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java
@@ -117,6 +117,7 @@ import org.netbeans.swing.outline.Outline;
import org.slf4j.LoggerFactory;
import cookxml.cookswing.CookSwing;
+import javax.swing.JProgressBar;
/**
* Main system tray and GUI. Create system tray menu, start timer process for queue.
@@ -126,46 +127,28 @@ import cookxml.cookswing.CookSwing;
public class IDROPDesktop implements ActionListener, ItemListener, TransferManagerCallbackListener {
public JFrame mainFrame;
-
private LocalFileSystemModel localFileModel = null;
-
private static final org.slf4j.Logger log = LoggerFactory.getLogger(IDROPDesktop.class);
-
private boolean formShown = false;
-
private CookSwing cookSwing = null;
-
private LocalFileTree fileTree = null;
-
private IRODSTree irodsTree = null;
-
private QueueManagerDialog queueManagerDialog = null;
-
private IDROPCore iDropCore;
-
public CheckboxMenuItem pausedItem = null;
-
private TrayIcon trayIcon = null;
-
private Object lastCachedInfoItem = null;
-
public JList editSynchronizationsDialogList, remoteFileChooserDialogList;
-
public JPasswordField changePasswordDialogPasswordPasswordField, changePasswordDialogPasswordConfirmPasswordField;
-
public JTextField editSynchronizationDialogLocalPathTextField, editSynchronizationDialogNameTextField,
editSynchronizationDialogRemotePathTextField, remoteFileChooserDialogFileNameTextField,
preferencesDialogDefaultLocalDirectoryTextField, editSynchronizationDialogDeviceNameTextField,
preferencesDialogDeviceNameTextField, changePasswordDialogCurrentAccountTextField;
-
public JDialog editSynchronizationsDialog, editSynchronizationDialog, remoteFileChooserDialog, preferencesDialog,
changePasswordDialog;
-
public JCheckBox preferencesDialogShowUICheckBox, preferencesDialogShowHiddenFilesCheckBox,
preferencesDialogShowPreferencesCheckBox, preferencesDialogShowSplashScreenCheckBox;
-
public DefaultListModel editSynchronizationsDialogListModel, remoteFileChooserDialogListModel;
-
public JButton preferencesDialogOKButton, editSynchronizationsDialogNewButton,
editSynchronizationsDialogEditButton, editSynchronizationsDialogDeleteButton,
editSynchronizationsDialogRunNowButton, editSynchronizationDialogSaveButton,
@@ -175,10 +158,8 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
remoteFileChooserDialogListViewButton, remoteFileChooserDialogDetailsViewButton,
remoteFileChooserDialogOpenButton, remoteFileChooserDialogCancelButton, changePasswordDialogSaveButton,
changePasswordDialogCancelButton;
-
public JFileChooser editSynchronizationDialogLocalPathFileChooser, editSynchronizationDialogRemotePathFileChooser,
preferencesDialogDefaultLocalDirectoryFileChooser;
-
public JComboBox editSynchronizationDialogFrequencyComboBox, remoteFileChooserDialogFileTypeComboBox,
remoteFileChooserDialogLookInComboBox;
@@ -194,76 +175,50 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
/** Creates new form IDrop */
public IDROPDesktop() {
}
-
public final ActionListener editSynchronizationsDialogNewActionListener = new EditSynchronizationsDialogNewActionListener(
this);
-
public final ActionListener editSynchronizationsDialogEditActionListener = new EditSynchronizationsDialogEditActionListener(
this);
-
public final ActionListener editSynchronizationsDialogDeleteActionListener = new EditSynchronizationsDialogDeleteActionListener(
this);
-
public final ActionListener editSynchronizationsDialogRunNowActionListener = new EditSynchronizationsDialogRunNowActionListener(
this);
-
public final ActionListener editSynchronizationDialogLocalPathBrowseActionListener = new EditSynchronizationDialogLocalPathBrowseActionListener(
this);
-
public final ActionListener editSynchronizationDialogRemotePathBrowseActionListener = new EditSynchronizationDialogRemotePathBrowseActionListener(
this);
-
public final ActionListener editSynchronizationDialogSaveActionListener = new EditSynchronizationDialogSaveActionListener(
this);
-
public final ActionListener editSynchronizationDialogCancelActionListener = new EditSynchronizationDialogCancelActionListener(
this);
-
public final ActionListener editSynchronizationsMenuActionListener = new EditSynchronizationsMenuActionListener(
this);
-
public final ActionListener remoteFileChooserDialogUpFolderActionListener = new RemoteFileChooserDialogUpFolderActionListener(
this);
-
public final ActionListener remoteFileChooserDialogHomeFolderActionListener = new RemoteFileChooserDialogHomeFolderActionListener(
this);
-
public final ActionListener remoteFileChooserDialogNewFolderActionListener = new RemoteFileChooserDialogNewFolderActionListener(
this);
-
public final ActionListener remoteFileChooserDialogListViewActionListener = new RemoteFileChooserDialogListViewActionListener(
this);
-
public final ActionListener remoteFileChooserDialogDetailsViewActionListener = new RemoteFileChooserDialogDetailsViewActionListener(
this);
-
public final ActionListener remoteFileChooserDialogLookInActionListener = new RemoteFileChooserDialogLookInActionListener(
this);
-
public final ActionListener remoteFileChooserDialogFileTypeActionListener = new RemoteFileChooserDialogFileTypeActionListener(
this);
-
public final ActionListener remoteFileChooserDialogOpenActionListener = new RemoteFileChooserDialogOpenActionListener(
this);
-
public final ActionListener remoteFileChooserDialogCancelActionListener = new RemoteFileChooserDialogCancelActionListener(
this);
-
public final MouseListener remoteFileChooserDialogListMouseListener = new RemoteFileChooserDialogListMouseListener(
this);
-
public final ActionListener preferencesMenuActionListener = new PreferencesMenuActionListener(this);
-
public final ActionListener preferencesDialogCancelActionListener = new PreferencesDialogCancelActionListener(this);
-
public final ActionListener preferencesDialogSaveActionListener = new PreferencesDialogSaveActionListener(this);
-
public final ActionListener changePasswordDialogSaveActionListener = new ChangePasswordSaveActionListener(this);
-
public final ActionListener changePasswordDialogCancelActionListener = new ChangePasswordCancelActionListener(this);
-
public final ActionListener changePasswordMenuActionListener = new ChangePasswordMenuActionListener(this);
-
public final KeyListener changePasswordDialogEnterKeyListener = new ChangePasswordDialogEnterKeyListener(this);
protected void buildIdropGuiComponents() throws IdropRuntimeException, HeadlessException {
@@ -324,10 +279,8 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
if (cookSwing == null) {
cookSwing = new CookSwing(this);
changePasswordDialog = (JDialog) cookSwing.render("org/irods/jargon/idrop/changePasswordDialog.xml");
- editSynchronizationDialog = (JDialog) cookSwing
- .render("org/irods/jargon/idrop/editSynchronizationDialog.xml");
- editSynchronizationsDialog = (JDialog) cookSwing
- .render("org/irods/jargon/idrop/editSynchronizationsDialog.xml");
+ editSynchronizationDialog = (JDialog) cookSwing.render("org/irods/jargon/idrop/editSynchronizationDialog.xml");
+ editSynchronizationsDialog = (JDialog) cookSwing.render("org/irods/jargon/idrop/editSynchronizationsDialog.xml");
preferencesDialog = (JDialog) cookSwing.render("org/irods/jargon/idrop/preferencesDialog.xml");
remoteFileChooserDialog = (JDialog) cookSwing.render("org/irods/jargon/idrop/remoteFileChooserDialog.xml");
}
@@ -391,32 +344,44 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
@Override
public void overallStatusCallback(final TransferStatus ts) {
- IRODSOutlineModel irodsTreeModel = (IRODSOutlineModel) irodsTree.getModel();
- try {
- irodsTreeModel.notifyCompletionOfOperation(irodsTree, ts);
- // if a get callback on completion, notify the local tree model
- if (ts.getTransferType() == TransferStatus.TransferType.GET
- && ts.getTransferState() == TransferStatus.TransferState.OVERALL_COMPLETION) {
- ((LocalFileSystemModel) getFileTree().getModel()).notifyCompletionOfOperation(getFileTree(), ts);
+ final JProgressBar thisProgressBar = transferStatusProgressBar;
+ if (ts.getTransferState() == TransferStatus.TransferState.OVERALL_INITIATION) {
+
+
+ java.awt.EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ // on initiation, clear and reset the status bar info
+ lblTransferType.setText(ts.getTransferType().name());
+ lblTransferFilesCounts.setText("Files: " + ts.getTotalFilesTransferredSoFar() + " / "
+ + ts.getTotalFilesToTransfer());
+ lblTransferByteCounts.setText("Bytes (kb):" + (ts.getBytesTransfered() / 1024) + " / "
+ + (ts.getTotalSize() / 1024));
+ lblCurrentFile.setText(IDropUtils.abbreviateFileName(ts.getSourceFileAbsolutePath()));
+ thisProgressBar.setMaximum(ts.getTotalFilesToTransfer());
+ thisProgressBar.setValue(ts.getTotalFilesTransferredSoFar());
+
+ }
+ });
+ } else {
+ try {
+ IRODSOutlineModel irodsTreeModel = (IRODSOutlineModel) irodsTree.getModel();
+
+ irodsTreeModel.notifyCompletionOfOperation(irodsTree, ts);
+ // if a get callback on completion, notify the local tree model
+ if (ts.getTransferType() == TransferStatus.TransferType.GET) {
+ ((LocalFileSystemModel) getFileTree().getModel()).notifyCompletionOfOperation(getFileTree(), ts);
+ }
+ } catch (IdropException ex) {
+ Logger.getLogger(IDROPDesktop.class.getName()).log(Level.SEVERE, null, ex);
+ this.showIdropException(ex);
}
- } catch (IdropException ex) {
- Logger.getLogger(IDROPDesktop.class.getName()).log(Level.SEVERE, null, ex);
- this.showIdropException(ex);
}
- java.awt.EventQueue.invokeLater(new Runnable() {
- @Override
- public void run() {
- // on initiation, clear and reset the status bar info
- lblTransferType.setText(ts.getTransferType().name());
- lblTransferFilesCounts.setText("Files: " + ts.getTotalFilesTransferredSoFar() + " / "
- + ts.getTotalFilesToTransfer());
- lblTransferByteCounts.setText("Bytes (kb):" + (ts.getBytesTransfered() / 1024) + " / "
- + (ts.getTotalSize() / 1024));
- lblCurrentFile.setText(IDropUtils.abbreviateFileName(ts.getSourceFileAbsolutePath()));
- }
- });
+
+
}
@@ -706,11 +671,10 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
public int showTransferStartupConfirm() {
// default icon, custom title
- int n = JOptionPane
- .showConfirmDialog(
- mainFrame,
- "There are transfers ready to process, should the transfer queue be started? Click NO to pause the transfersf",
- "Begin Transfer Confirmation", JOptionPane.YES_NO_OPTION);
+ int n = JOptionPane.showConfirmDialog(
+ mainFrame,
+ "There are transfers ready to process, should the transfer queue be started? Click NO to pause the transfersf",
+ "Begin Transfer Confirmation", JOptionPane.YES_NO_OPTION);
return n;
}
@@ -991,17 +955,13 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
mainFrame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
if (collectionAndDataObjectListingEntry.getObjectType() == CollectionAndDataObjectListingEntry.ObjectType.COLLECTION) {
log.info("looking up collection to build info panel");
- CollectionAO collectionAO = getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory()
- .getCollectionAO(getIrodsAccount());
- Collection collection = collectionAO.findByAbsolutePath(collectionAndDataObjectListingEntry
- .getPathOrName());
+ CollectionAO collectionAO = getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory().getCollectionAO(getIrodsAccount());
+ Collection collection = collectionAO.findByAbsolutePath(collectionAndDataObjectListingEntry.getPathOrName());
initializeInfoPanel(collection);
} else {
log.info("looking up data object to build info panel");
- DataObjectAO dataObjectAO = getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory()
- .getDataObjectAO(getIrodsAccount());
- DataObject dataObject = dataObjectAO.findByAbsolutePath(collectionAndDataObjectListingEntry
- .getParentPath() + "/" + collectionAndDataObjectListingEntry.getPathOrName());
+ DataObjectAO dataObjectAO = getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory().getDataObjectAO(getIrodsAccount());
+ DataObject dataObject = dataObjectAO.findByAbsolutePath(collectionAndDataObjectListingEntry.getParentPath() + "/" + collectionAndDataObjectListingEntry.getPathOrName());
initializeInfoPanel(dataObject);
}
@@ -1051,10 +1011,8 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
log.debug("getting available tags for data object");
try {
- FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore()
- .getIrodsFileSystem().getIRODSAccessObjectFactory(), getiDropCore().getIrodsAccount());
- IRODSTagGrouping irodsTagGrouping = freeTaggingService.getTagsForDataObjectInFreeTagForm(dataObject
- .getCollectionName() + "/" + dataObject.getDataName());
+ FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory(), getiDropCore().getIrodsAccount());
+ IRODSTagGrouping irodsTagGrouping = freeTaggingService.getTagsForDataObjectInFreeTagForm(dataObject.getCollectionName() + "/" + dataObject.getDataName());
txtTags.setText(irodsTagGrouping.getSpaceDelimitedTagsForDomain());
pnlInfoIcon.removeAll();
pnlInfoIcon.add(IconHelper.getFileIcon());
@@ -1110,10 +1068,8 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
log.debug("getting available tags for data object");
try {
- FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore()
- .getIrodsFileSystem().getIRODSAccessObjectFactory(), getIrodsAccount());
- IRODSTagGrouping irodsTagGrouping = freeTaggingService.getTagsForCollectionInFreeTagForm(collection
- .getCollectionName());
+ FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory(), getIrodsAccount());
+ IRODSTagGrouping irodsTagGrouping = freeTaggingService.getTagsForCollectionInFreeTagForm(collection.getCollectionName());
txtTags.setText(irodsTagGrouping.getSpaceDelimitedTagsForDomain());
pnlInfoIcon.removeAll();
pnlInfoIcon.add(IconHelper.getFolderIcon());
@@ -1270,6 +1226,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
menuItemShowInHierarchy.setText("Show in iRODS");
menuItemShowInHierarchy.setToolTipText("Show this file or collection in the iRODS hierarchy");
menuItemShowInHierarchy.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
menuItemShowInHierarchyActionPerformed(evt);
}
@@ -1282,6 +1239,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
mainFrame.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
mainFrame.setTitle("iDrop - iRODS Cloud Browser");
mainFrame.addWindowListener(new java.awt.event.WindowAdapter() {
+
public void windowClosed(java.awt.event.WindowEvent evt) {
formWindowClosed(evt);
}
@@ -1306,8 +1264,8 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
lblMainSearch.setPreferredSize(new java.awt.Dimension(45, 40));
pnlSearchSizer.add(lblMainSearch);
- comboSearchType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "by name", "by tag",
- "by name and tag" }));
+ comboSearchType.setModel(new javax.swing.DefaultComboBoxModel(new String[]{"by name", "by tag",
+ "by name and tag"}));
comboSearchType.setToolTipText("Select the type of search to be carried out using the supplied search string");
pnlSearchSizer.add(comboSearchType);
@@ -1316,6 +1274,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
txtMainSearch.setMinimumSize(null);
txtMainSearch.setPreferredSize(new java.awt.Dimension(100, 30));
txtMainSearch.addKeyListener(new java.awt.event.KeyAdapter() {
+
public void keyPressed(java.awt.event.KeyEvent evt) {
txtMainSearchKeyPressed(evt);
}
@@ -1326,6 +1285,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
btnearch.setText("Search");
btnearch.setToolTipText("Search iRODS based on the current view selected");
btnearch.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnearchActionPerformed(evt);
}
@@ -1344,11 +1304,13 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
toggleLocalFiles.setMinimumSize(new java.awt.Dimension(144, 10));
toggleLocalFiles.setPreferredSize(new java.awt.Dimension(144, 30));
toggleLocalFiles.addChangeListener(new javax.swing.event.ChangeListener() {
+
public void stateChanged(javax.swing.event.ChangeEvent evt) {
toggleLocalFilesStateChanged(evt);
}
});
toggleLocalFiles.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
toggleLocalFilesActionPerformed(evt);
}
@@ -1366,11 +1328,13 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
toggleIrodsDetails.setMinimumSize(new java.awt.Dimension(144, 10));
toggleIrodsDetails.setPreferredSize(new java.awt.Dimension(144, 30));
toggleIrodsDetails.addChangeListener(new javax.swing.event.ChangeListener() {
+
public void stateChanged(javax.swing.event.ChangeEvent evt) {
toggleIrodsDetailsStateChanged(evt);
}
});
toggleIrodsDetails.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
toggleIrodsDetailsActionPerformed(evt);
}
@@ -1424,6 +1388,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
btnRefreshLocalDrives.setMaximumSize(new java.awt.Dimension(200, 50));
btnRefreshLocalDrives.setMinimumSize(new java.awt.Dimension(0, 0));
btnRefreshLocalDrives.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnRefreshLocalDrivesActionPerformed(evt);
}
@@ -1456,6 +1421,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
tabIrodsViews.setMinimumSize(new java.awt.Dimension(200, 129));
tabIrodsViews.setPreferredSize(new java.awt.Dimension(350, 300));
tabIrodsViews.addChangeListener(new javax.swing.event.ChangeListener() {
+
public void stateChanged(javax.swing.event.ChangeEvent evt) {
tabIrodsViewsStateChanged(evt);
}
@@ -1470,6 +1436,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
btnRefreshTargetTree.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnRefreshTargetTree.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
btnRefreshTargetTree.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnRefreshTargetTreeActionPerformed(evt);
}
@@ -1491,9 +1458,9 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
pnlTabSearchResults.setLayout(new java.awt.GridLayout(1, 0));
- tableSearchResults.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" }));
+ tableSearchResults.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"}));
scrollPaneSearchResults.setViewportView(tableSearchResults);
pnlTabSearchResults.add(scrollPaneSearchResults);
@@ -1605,11 +1572,13 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
txtTags.setMinimumSize(null);
txtTags.setPreferredSize(null);
txtTags.addFocusListener(new java.awt.event.FocusAdapter() {
+
public void focusLost(java.awt.event.FocusEvent evt) {
txtTagsFocusLost(evt);
}
});
txtTags.addKeyListener(new java.awt.event.KeyAdapter() {
+
public void keyPressed(java.awt.event.KeyEvent evt) {
txtTagsKeyPressed(evt);
}
@@ -1630,6 +1599,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
btnUpdateInfo.setText("Update Info");
btnUpdateInfo.setToolTipText("Update information on the info panel such as tags and comment");
btnUpdateInfo.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnUpdateInfoActionPerformed(evt);
}
@@ -1712,6 +1682,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
btnViewMetadata.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnViewMetadata.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
btnViewMetadata.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnViewMetadataActionPerformed(evt);
}
@@ -1723,6 +1694,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
btnReplication.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnReplication.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
btnReplication.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnReplicationActionPerformed(evt);
}
@@ -1811,8 +1783,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
pnlIdropBottom.add(pnlTransferOverview, gridBagConstraints);
- transferStatusProgressBar.setBorder(javax.swing.BorderFactory
- .createBevelBorder(javax.swing.border.BevelBorder.LOWERED));
+ transferStatusProgressBar.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED));
transferStatusProgressBar.setStringPainted(true);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
@@ -1832,6 +1803,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
btnShowTransferManager.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnShowTransferManager.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
btnShowTransferManager.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnShowTransferManagerActionPerformed(evt);
}
@@ -1844,6 +1816,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
togglePauseTransfer.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
togglePauseTransfer.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
togglePauseTransfer.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
togglePauseTransferActionPerformed(evt);
}
@@ -1870,6 +1843,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
jMenuItemExit.setText("Exit");
jMenuItemExit.setToolTipText("Close the iDROP console window");
jMenuItemExit.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
jMenuItemExitActionPerformed(evt);
}
@@ -1895,6 +1869,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
jCheckBoxMenuItemShowSourceTree.setMnemonic('L');
jCheckBoxMenuItemShowSourceTree.setText("Show Local");
jCheckBoxMenuItemShowSourceTree.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
jCheckBoxMenuItemShowSourceTreeActionPerformed(evt);
}
@@ -1906,6 +1881,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
jCheckBoxMenuItemShowIrodsInfo.setMnemonic('I');
jCheckBoxMenuItemShowIrodsInfo.setText("Show iRODS Info");
jCheckBoxMenuItemShowIrodsInfo.addActionListener(new java.awt.event.ActionListener() {
+
public void actionPerformed(java.awt.event.ActionEvent evt) {
jCheckBoxMenuItemShowIrodsInfoActionPerformed(evt);
}
@@ -2220,21 +2196,18 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
FreeTaggingService freeTaggingService;
try {
- freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore().getIrodsFileSystem()
- .getIRODSAccessObjectFactory(), getIrodsAccount());
+ freeTaggingService = FreeTaggingServiceImpl.instance(getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory(), getIrodsAccount());
if (lastCachedInfoItem instanceof Collection) {
log.info("processing tags for collection");
Collection collection = (Collection) lastCachedItemToProcessTagsFor;
- IRODSTagGrouping irodsTagGrouping = new IRODSTagGrouping(MetadataDomain.COLLECTION, collection
- .getCollectionName(), txtTags.getText(), getIrodsAccount().getUserName());
+ IRODSTagGrouping irodsTagGrouping = new IRODSTagGrouping(MetadataDomain.COLLECTION, collection.getCollectionName(), txtTags.getText(), getIrodsAccount().getUserName());
log.debug("new tag set is:{}", txtTags.getText());
freeTaggingService.updateTags(irodsTagGrouping);
} else if (lastCachedInfoItem instanceof DataObject) {
log.info("processing tags for data object");
DataObject dataObject = (DataObject) lastCachedItemToProcessTagsFor;
- IRODSTagGrouping irodsTagGrouping = new IRODSTagGrouping(MetadataDomain.DATA, dataObject
- .getCollectionName() + "/" + dataObject.getDataName(), txtTags.getText(),
+ IRODSTagGrouping irodsTagGrouping = new IRODSTagGrouping(MetadataDomain.DATA, dataObject.getCollectionName() + "/" + dataObject.getDataName(), txtTags.getText(),
getIrodsAccount().getUserName());
log.debug("new tag set is:{}", txtTags.getText());
freeTaggingService.updateTags(irodsTagGrouping);
@@ -2300,212 +2273,110 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
// irodsTree.scrollPathToVisible(selPath);
tabIrodsViews.setSelectedComponent(pnlTabHierarchicalView);
}// GEN-LAST:event_menuItemShowInHierarchyActionPerformed
- // Variables declaration - do not modify//GEN-BEGIN:variables
-
+ // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnMoveToTrash;
-
private javax.swing.JButton btnRefreshLocalDrives;
-
private javax.swing.JButton btnRefreshTargetTree;
-
private javax.swing.JButton btnReplication;
-
private javax.swing.JButton btnShowTransferManager;
-
private javax.swing.JButton btnUpdateInfo;
-
private javax.swing.JButton btnViewMetadata;
-
private javax.swing.JButton btnearch;
-
private javax.swing.JComboBox comboSearchType;
-
private javax.swing.JPanel iDropToolbar;
-
private javax.swing.JToolBar idropProgressPanelToolbar;
-
private javax.swing.JCheckBoxMenuItem jCheckBoxMenuItemShowIrodsInfo;
-
private javax.swing.JCheckBoxMenuItem jCheckBoxMenuItemShowSourceTree;
-
private javax.swing.JMenuBar jMenuBar1;
-
private javax.swing.JMenu jMenuEdit;
-
private javax.swing.JMenuItem jMenuItemEditSynchronizations;
-
private javax.swing.JMenuItem jMenuItemPreferences;
-
private javax.swing.JMenuItem jMenuItemChangePassword;
-
private javax.swing.JMenu jMenuFile;
-
private javax.swing.JMenuItem jMenuItemExit;
-
private javax.swing.JMenu jMenuView;
-
private javax.swing.JSplitPane jSplitPanelLocalRemote;
-
private javax.swing.JLabel lblComment;
-
private javax.swing.JLabel lblCurrentFile;
-
private javax.swing.JLabel lblCurrentFileLabel;
-
private javax.swing.JLabel lblFileOrCollectionName;
-
private javax.swing.JLabel lblFileParent;
-
private javax.swing.JLabel lblInfoCreatedAt;
-
private javax.swing.JLabel lblInfoCreatedAtValue;
-
private javax.swing.JLabel lblInfoLength;
-
private javax.swing.JLabel lblInfoLengthValue;
-
private javax.swing.JLabel lblInfoUpdatedAt;
-
private javax.swing.JLabel lblInfoUpdatedAtValue;
-
private javax.swing.JLabel lblMainSearch;
-
private javax.swing.JLabel lblTags;
-
private javax.swing.JLabel lblTransferByteCounts;
-
private javax.swing.JLabel lblTransferFilesCounts;
-
private javax.swing.JLabel lblTransferType;
-
private javax.swing.JLabel lblTransferTypeLabel;
-
private javax.swing.JList listLocalDrives;
-
private javax.swing.JMenuItem menuItemShowInHierarchy;
-
private javax.swing.JPanel pnlDrivesFiller;
-
private javax.swing.JPanel pnlFileIconSizer;
-
private javax.swing.JPanel pnlFileNameAndIcon;
-
private javax.swing.JPanel pnlIdropBottom;
-
private javax.swing.JPanel pnlIdropMain;
-
private javax.swing.JPanel pnlIdropProgressIcon;
-
private javax.swing.JPanel pnlInfoButton;
-
private javax.swing.JPanel pnlInfoCollectionParent;
-
private javax.swing.JPanel pnlInfoComment;
-
private javax.swing.JPanel pnlInfoDetails;
-
private javax.swing.JPanel pnlInfoIcon;
-
private javax.swing.JPanel pnlInfoTags;
-
private javax.swing.JPanel pnlIrodsArea;
-
private javax.swing.JPanel pnlIrodsDetailsToggleSizer;
-
private javax.swing.JPanel pnlIrodsInfo;
-
private javax.swing.JPanel pnlIrodsInfoInner;
-
private javax.swing.JPanel pnlIrodsTreeMaster;
-
private javax.swing.JPanel pnlIrodsTreeToolbar;
-
private javax.swing.JPanel pnlLocalRoots;
-
private javax.swing.JPanel pnlLocalToggleSizer;
-
private javax.swing.JPanel pnlLocalTreeArea;
-
private javax.swing.JPanel pnlRefreshButton;
-
private javax.swing.JPanel pnlSearchSizer;
-
private javax.swing.JPanel pnlTabHierarchicalView;
-
private javax.swing.JPanel pnlTabSearch;
-
private javax.swing.JPanel pnlTabSearchResults;
-
private javax.swing.JPanel pnlTabSearchTop;
-
private javax.swing.JPanel pnlToolbarInfo;
-
private javax.swing.JPanel pnlToolbarSizer;
-
private javax.swing.JPanel pnlTopToolbarSearchArea;
-
private javax.swing.JPanel pnlTransferByteCounts;
-
private javax.swing.JPanel pnlTransferFileCounts;
-
private javax.swing.JPanel pnlTransferFileInfo;
-
private javax.swing.JPanel pnlTransferOverview;
-
private javax.swing.JPanel pnlTransferStatus;
-
private javax.swing.JPanel pnlTransferType;
-
private javax.swing.JLabel progressIconImageLabel;
-
private javax.swing.JScrollPane scrollComment;
-
private javax.swing.JScrollPane scrollIrodsTree;
-
private javax.swing.JScrollPane scrollLocalDrives;
-
private javax.swing.JScrollPane scrollLocalFileTree;
-
private javax.swing.JScrollPane scrollPaneSearchResults;
-
private javax.swing.JScrollPane scrollParentPath;
-
protected javax.swing.JPopupMenu searchTablePopupMenu;
-
private javax.swing.JToolBar.Separator separator1;
-
private javax.swing.JToolBar.Separator separator2;
-
private javax.swing.JSplitPane splitTargetCollections;
-
private javax.swing.JTabbedPane tabIrodsViews;
-
private javax.swing.JTable tableSearchResults;
-
private javax.swing.JToggleButton toggleIrodsDetails;
-
private javax.swing.JToggleButton toggleLocalFiles;
-
public javax.swing.JToggleButton togglePauseTransfer;
-
private javax.swing.JToolBar toolBarInfo;
-
private javax.swing.JPanel transferQueueToolbarPanel;
-
private javax.swing.JProgressBar transferStatusProgressBar;
-
private javax.swing.JTextArea txtComment;
-
private javax.swing.JTextField txtMainSearch;
-
private javax.swing.JTextArea txtParentPath;
-
private javax.swing.JTextField txtTags;
-
private javax.swing.JLabel userNameLabel;
// End of variables declaration//GEN-END:variables
-
public Object getLastCachedInfoItem() {
return lastCachedInfoItem;
}
@@ -2525,12 +2396,10 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
try {
mainFrame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
- CollectionAndDataObjectListAndSearchAO collectionAndDataObjectListAndSearchAO = iDropCore
- .getIRODSAccessObjectFactory().getCollectionAndDataObjectListAndSearchAO(
- iDropCore.getIrodsAccount());
+ CollectionAndDataObjectListAndSearchAO collectionAndDataObjectListAndSearchAO = iDropCore.getIRODSAccessObjectFactory().getCollectionAndDataObjectListAndSearchAO(
+ iDropCore.getIrodsAccount());
IRODSSearchTableModel irodsSearchTableModel = new IRODSSearchTableModel(
- collectionAndDataObjectListAndSearchAO
- .searchCollectionsAndDataObjectsBasedOnName(searchTerms));
+ collectionAndDataObjectListAndSearchAO.searchCollectionsAndDataObjectsBasedOnName(searchTerms));
tableSearchResults.setModel(irodsSearchTableModel);
tabIrodsViews.setSelectedComponent(pnlTabSearch);
} catch (Exception e) {
@@ -2562,8 +2431,7 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(
iDropCore.getIRODSAccessObjectFactory(), getIrodsAccount());
TagQuerySearchResult result = freeTaggingService.searchUsingFreeTagString(searchTerms);
- IRODSSearchTableModel irodsSearchTableModel = new IRODSSearchTableModel(result
- .getQueryResultEntries());
+ IRODSSearchTableModel irodsSearchTableModel = new IRODSSearchTableModel(result.getQueryResultEntries());
tableSearchResults.setModel(irodsSearchTableModel);
tabIrodsViews.setSelectedComponent(pnlTabSearch);
} catch (Exception e) {
@@ -2634,5 +2502,4 @@ public class IDROPDesktop implements ActionListener, ItemListener, TransferManag
}
}
-
}