summaryrefslogtreecommitdiffstats
path: root/idrop-swing
diff options
context:
space:
mode:
authorLisa Stillwell <lisa@renci.org>2012-11-13 20:43:04 (GMT)
committer Lisa Stillwell <lisa@renci.org>2012-11-13 20:43:04 (GMT)
commite4ff3a5ba67a43a3e635f6fa55b7e84338d639d4 (patch)
tree07c9ce1d32ac8d6eedce2035cdd148fcd18d6754 /idrop-swing
parent1719a7eae0c0f2cc9b59940580b52ae7056ed965 (diff)
downloadQCG-Data-e4ff3a5ba67a43a3e635f6fa55b7e84338d639d4.zip
QCG-Data-e4ff3a5ba67a43a3e635f6fa55b7e84338d639d4.tar.gz
QCG-Data-e4ff3a5ba67a43a3e635f6fa55b7e84338d639d4.tar.bz2
[#983] added new functionality based on discussion in weekly design questions dated 103012
Diffstat (limited to 'idrop-swing')
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTree.java25
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java15
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties58
4 files changed, 96 insertions, 4 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index 58f8015..0b40cd4 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.desktop.systraygui.utils;
public final class Version {
public static String VERSION="1.0.2-SNAPSHOT";
- public static String BUILD_TIME="20121108-1101";
+ public static String BUILD_TIME="20121109-1506";
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTree.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTree.java
index eda32d0..6b9d140 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTree.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSTree.java
@@ -26,7 +26,6 @@ import org.irods.jargon.idrop.desktop.systraygui.IRODSTreeContainingComponent;
import org.irods.jargon.idrop.desktop.systraygui.NewIRODSDirectoryDialog;
import org.irods.jargon.idrop.desktop.systraygui.RenameIRODSDirectoryDialog;
import org.irods.jargon.idrop.desktop.systraygui.iDrop;
-import org.irods.jargon.idrop.desktop.systraygui.iDrop;
import org.irods.jargon.idrop.exceptions.IdropException;
import org.irods.jargon.idrop.exceptions.IdropRuntimeException;
import org.netbeans.swing.outline.DefaultOutlineModel;
@@ -282,6 +281,28 @@ public class IRODSTree extends Outline implements TreeWillExpandListener,
m_clickedPath = path;
}
}
+ else if (e.getClickCount() == 2) {
+ int x = e.getX();
+ int y = e.getY();
+ TreePath path = thisTree.getClosestPathForLocation(x, y);
+
+ IRODSNode inode = null;
+ String fullPath = null;
+ if (path != null) {
+ Object node = path.getLastPathComponent();
+ if (node instanceof IRODSNode) {
+ inode = (IRODSNode) node;
+ CollectionAndDataObjectListingEntry entry =
+ (CollectionAndDataObjectListingEntry) inode.getUserObject();
+ fullPath = entry.getPathOrName();
+ }
+
+ if (fullPath != null) {
+ idropParentGui.getiDropCore().setBasePath(fullPath);
+ idropParentGui.buildTargetTree(false);
+ }
+ }
+ }
}
@Override
@@ -310,6 +331,8 @@ public class IRODSTree extends Outline implements TreeWillExpandListener,
@Override
public void treeWillExpand(final TreeExpansionEvent event)
+
+ //TODO: Need to make this a swing worker??
throws ExpandVetoException {
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
log.debug("tree expansion event:{}", event);
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java
index acb950a..158b7ee 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java
@@ -25,6 +25,14 @@ import org.slf4j.LoggerFactory;
* @author mikeconway
*/
public class IRODSFinderDialog extends javax.swing.JDialog {
+
+ public static enum SelectionType {
+ OBJS_ONLY_SELECTION_MODE,
+ COLLS_ONLY_SELECTION_MODE,
+ OBJS_AND_COLLS_SELECTION_MODE
+ }
+
+ private SelectionType selectionTypeSetting = SelectionType.COLLS_ONLY_SELECTION_MODE;
private final IDROPCore idropCore;
private String selectedAbsolutePath = null;
@@ -59,7 +67,10 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
public void enableButtonSelectFolder(boolean state) {
this.btnSelectFolder.setEnabled(state);
}
-
+
+ public void setSelectionType(SelectionType selType) {
+ this.selectionTypeSetting = selType;
+ }
/**
* build the JTree that will depict the iRODS resource
@@ -242,10 +253,12 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
idx, 0);
log.info("selected node:{}", selectedNode);
CollectionAndDataObjectListingEntry entry = (CollectionAndDataObjectListingEntry) selectedNode.getUserObject();
+ if ( this.selectionTypeSetting == SelectionType.COLLS_ONLY_SELECTION_MODE) {
if (entry.getObjectType() == CollectionAndDataObjectListingEntry.ObjectType.DATA_OBJECT) {
MessageManager.showWarning(this, "Please select a directory", MessageManager.TITLE_MESSAGE);
return;
}
+ }
this.selectedAbsolutePath = entry.getFormattedAbsolutePath();
this.setVisible(false);
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
index 0c2a112..2c6b5cb 100644
--- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
@@ -139,4 +139,60 @@ iDrop.lblBreadCrumb.text=
iDrop.scrollLocalFileTree.toolTipText=scroll panel tooltip
iDrop.btnMainToolbarCopy.actionCommand=Copy/Move
iDrop.btnMainToolbarCopy.text=Copy/Move
-iDrop.btnMainToolbarAddEditMetaData.label=Info
+DownloadDialog.title=Download Files and Collections fom iRODS
+DownloadDialog.jLabel1.text=Download Target Location:
+DownloadDialog.jLabel2.text=Files/Collectsions to Download:
+DownloadDialog.txtDownloadTarget.text=
+DownloadDialog.btnBrowseDownloadTarget.text=Browse Local Folders
+DownloadDialog.btnBrowseDownloadSource.text=Browse iRODS Collections
+DownloadDialog.btnCancel.text=Cancel
+DownloadDialog.btnDownloadNow.text=Download Now
+DownloadDialog.AccessibleContext.accessibleName=Download Files and Collections from iRODS
+iDrop.btnMainToolbarInfo.label=Info
+UploadDialog.jLabel1.text=Upload Target Location:
+UploadDialog.jLabel2.text=Files/Folders to Upload:
+UploadDialog.btnCancel.text=Cancel
+UploadDialog.title=Upload Files and Folders to iRODS
+UploadDialog.btnBrowseUploadSource.text=Browse Local Files
+UploadDialog.btnBrowseUploadTarget.text=Browse iRODS Collections
+UploadDialog.btnUploadNow.text=Upload Now
+UploadDialog.txtUploadTarget.text=
+IRODSInfoDialog.tabInfo.toolTipText=View basic demographics for a file or collection
+IRODSInfoDialog.lblDataStatus.toolTipText=Status of selected file
+IRODSInfoDialog.lblDataStatusLabel.text=Data Status:
+IRODSInfoDialog.lblDataType.toolTipText=Data type for selected file
+IRODSInfoDialog.lblDataTypeLabel.text=Data Type:
+IRODSInfoDialog.lblDataVersion.toolTipText=Data version
+IRODSInfoDialog.lblDataVersion.text=
+IRODSInfoDialog.lblDataVersionLabel.text=Data Version:
+IRODSInfoDialog.lblDataReplicationStatus.toolTipText=Data replication status
+IRODSInfoDialog.lblDataReplicationStatusLabel.text=Replication Status:
+IRODSInfoDialog.lblDataPath.toolTipText=Physical path of file
+IRODSInfoDialog.lblDataPathLabel.text=Data Path:
+IRODSInfoDialog.lblCollectionType.toolTipText=Collection type
+IRODSInfoDialog.lblCollectionTypeLabel.text=Collection Type:
+IRODSInfoDialog.lblOwnerZone.toolTipText=Zone of file owner
+IRODSInfoDialog.lblOwnerZoneLabel.text=Owner Zone:
+IRODSInfoDialog.lblOwnerNameLabel.text=Owner:
+IRODSInfoDialog.lblInfoChecksum.text=Checksum:
+IRODSInfoDialog.lblInfoLength.text=Length:
+IRODSInfoDialog.lblInfoUpdatedAtTimeValue.toolTipText=Time file was last updated
+IRODSInfoDialog.lblInfoUpdatedAt.text=Updated:
+IRODSInfoDialog.lblInfoCreatedAtTimeValue.toolTipText=Time file was created
+IRODSInfoDialog.lblInfoCreatedAt.text=Created:
+IRODSInfoDialog.btnUpdateInfo.toolTipText=Update information on the info panel such as tags and comment
+IRODSInfoDialog.btnUpdateInfo.text=Update Comment and Tags
+IRODSInfoDialog.txtTags.toolTipText=Name of file or collection. This field allows editing to rename
+IRODSInfoDialog.lblTags.toolTipText=
+IRODSInfoDialog.lblTags.text=Tags:
+IRODSInfoDialog.txtComment.toolTipText=Free form comment for a file or collection
+IRODSInfoDialog.lblComment.toolTipText=
+IRODSInfoDialog.lblComment.text=Comment:
+IRODSInfoDialog.lblFileOrCollectionName.text=file or collection name
+IRODSInfoDialog.lblFilePathLabel.text=Path:
+IRODSInfoDialog.lblSelectedFileInfo.text=Selected File Info
+IRODSInfoDialog.jScrollPane1.TabConstraints.tabTitle=Info
+IRODSInfoDialog.btnCancel.text=Cancel
+IRODSInfoDialog.btnSaveAll.text=Save
+IRODSInfoDialog.jTabbedPane1.TabConstraints.tabTitle=MetaData
+IRODSInfoDialog.jTabbedPane2.TabConstraints.tabTitle=Permissions