[#983] Upload dialog - if dataobject is selected for upload target, its parent is used instead, also Info dialog - sort users combo box for add permissions

2 files changed, 15 insertions, 2 deletions

diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AddPermissionsDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AddPermissionsDialog.java
index c40d397..306da4a 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AddPermissionsDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AddPermissionsDialog.java
@@ -6,6 +6,8 @@ package org.irods.jargon.idrop.desktop.systraygui;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import org.irods.jargon.core.connection.IRODSAccount;
 import org.irods.jargon.core.exception.JargonException;
@@ -49,6 +51,13 @@ public class AddPermissionsDialog extends javax.swing.JDialog implements ActionL
         try {
             UserAO userAO = irodsFileSystem.getIRODSAccessObjectFactory().getUserAO(irodsAccount);
             users = userAO.findAll();
+            Collections.sort(users, new Comparator<User>() {
+                @Override
+                public int compare(final User object1, final User object2) {
+                    return object1.getName().compareTo(object2.getName());
+                }
+            } );
+ 
             for (User user: users) {
                 cbPermissionsUserName.addItem(user.getNameWithZone());
             }
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java
index 2762455..8c08ba5 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/UploadDialog.java
@@ -99,9 +99,13 @@ public class UploadDialog extends javax.swing.JDialog implements ListSelectionLi
             try {
                 IRODSNode selectedNode = (IRODSNode) irodsFileSystemModel.getValueAt(idx, 0);
                 ifile = irodsFS.getIRODSFileForPath(selectedNode.getFullPath());
-                // rule out "/"
+                
+                // rule out "/" and choose parent if file is not a directory
                 String path = ifile.getAbsolutePath();
-                if ((ifile.isDirectory()) && (path != null) && (!path.equals("/"))) {
+                if (ifile.isFile()) {
+                    path = ifile.getParent();
+                }
+                if ((path != null) && (!path.equals("/"))) {
                     target = path;
                 }
             } catch (IdropException ex) {