summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org>2011-08-25 16:55:09 (GMT)
committer LISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org>2011-08-25 16:55:09 (GMT)
commit13f773a2cf8d8ee7144925b265b7f6a929d7dd3f (patch)
tree76cc774bd5273a645f82cbca5642d7a2cd88bf78
parent063f259d43185f9949c89f3df0a840eb4f2c97e8 (diff)
parente3caa6d39638d1ed3ea8ac7f81697fb66519b729 (diff)
downloadQCG-Data-13f773a2cf8d8ee7144925b265b7f6a929d7dd3f.zip
QCG-Data-13f773a2cf8d8ee7144925b265b7f6a929d7dd3f.tar.gz
QCG-Data-13f773a2cf8d8ee7144925b265b7f6a929d7dd3f.tar.bz2
Merge branch 'master' of ssh://code.renci.org/gitroot/irodsidrop
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java2
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
2 files changed, 4 insertions, 2 deletions
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 abc37cf..0b6366a 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
@@ -89,6 +89,8 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
root.setPathOrName("/");
}
+ root.setObjectType(CollectionAndDataObjectListingEntry.ObjectType.COLLECTION);
+
log.info("building new iRODS tree");
try {
if (irodsTree == null) {
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 32d7f19..8a17631 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,6 +1,6 @@
policy.aware=false
-login.preset=false
-force.mode=false
+login.preset=true
+force.mode=true
force.no.synch=false
advanced.view=true
show.startup=true